Changeset 1010

Show
Ignore:
Timestamp:
11/14/08 12:56:39 (2 months ago)
Author:
lebrun
Message:

MERGE: merging from trunk into lebrun/devel (rev. 1003:1009)
lebrun/devel> svn merge -r 1003:1009 https://.../trunk

Synchronization with trunk

Fixed a typo in Normal class. This closed ticket #164.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/lebrun/devel/lib/src/Base/Func/MethodBoundNumericalMathEvaluationImplementation.hxx

    r962 r1010  
    2020 
    2121#include "NumericalMathEvaluationImplementation.hxx" 
     22#include "NumericalMathFunctionImplementation.hxx" 
    2223#include "NumericalPoint.hxx" 
    2324 
    …… 
    186187  
    187188      template <typename EvaluableObject, typename ReturnType_, typename ArgumentType_> 
    188       MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_> * 
     189      NumericalMathFunctionImplementation 
    189190      bindMethod (const EvaluableObject & obj, 
    190191                  typename MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_>::EvaluationMethod method ) 
    191192      { 
    192         return new MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_>( obj, method ); 
     193        return NumericalMathFunctionImplementation( new MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_>( obj, method ) ); 
    193194      } 
    194195 

  • branches/lebrun/devel/lib/src/Base/Func/WrapperData.cxx

    r991 r1010  
    126126      { 
    127127        OSS oss; 
    128         oss << "state="  << WrapperConfigurationStateAsString[state_] 
    129             << " mode="  << WrapperConfigurationModeAsString[mode_] 
    130             << " in="    << WrapperDataTransferModeAsString[in_] 
    131             << " out="   << WrapperDataTransferModeAsString[out_]; 
     128        oss << "state="    << WrapperConfigurationStateAsString[state_] 
     129            << " mode="    << WrapperConfigurationModeAsString[mode_] 
     130            << " in="      << WrapperDataTransferModeAsString[in_] 
     131            << " out="     << WrapperDataTransferModeAsString[out_] 
     132            << " command=" << command_; 
    132133        return oss; 
    133134      } 

  • branches/lebrun/devel/lib/src/Base/Func/WrapperFile.cxx

    r1004 r1010  
    7171      CLASSNAMEINIT(WrapperFile); 
    7272 
    73       /* 
    74        * Default constructor 
    75        */ 
     73      /* Default constructor */ 
     74      WrapperFile::WrapperFile() 
     75        : PersistentObject(), 
     76          descriptionFilePath_(), 
     77          data_() 
     78      { 
     79        // Nothing to do 
     80      } 
     81 
     82      /* Constructor from file */ 
    7683      WrapperFile::WrapperFile(const FileName & pathToFile) 
    7784        throw(WrapperFileParsingException) 
    …… 
    97104        OSS oss; 
    98105        oss << "class=" << getClassName() 
    99             << " name=" << getName() 
     106            << " path=" << getDescriptionFilePath() 
    100107            << " data={" << data_ 
    101108            << "}"; 
    …… 
    542549        // Write out the document to a file 
    543550        doc.save( pathToFile ); 
    544       } 
     551 
     552        setDescriptionFilePath( pathToFile ); 
     553  } 
    545554 
    546555#else 

  • branches/lebrun/devel/lib/src/Base/Func/WrapperFile.hxx

    r1004 r1010  
    7878      public: 
    7979 
    80         /**  
    81          * Default constructor 
    82          */ 
     80        /** Default constructor */ 
     81        WrapperFile(); 
     82 
     83        /** Constructor from file */ 
    8384        explicit WrapperFile(const FileName & pathToFile) 
    8485          throw(WrapperFileParsingException); 

  • branches/lebrun/devel/lib/src/Base/Graph/Contour.cxx

    r934 r1010  
    2424 *  Id:      $Id$ 
    2525 */ 
     26#include <cstdio> 
    2627#include "Contour.hxx" 
    2728#include "PersistentObjectFactory.hxx" 

  • branches/lebrun/devel/lib/src/Base/Graph/DrawableImplementation.cxx

    r823 r1010  
    2626 
    2727#include <algorithm> 
     28#include <cstdio> 
    2829#include <cstdlib> 
    2930#include "DrawableImplementation.hxx" 

  • branches/lebrun/devel/lib/src/Uncertainty/Distribution/ExtraFunc/dcdflib.cxx

    r867 r1010  
    2828# include <cmath> 
    2929# include <ctime> 
     30# include <cstdio> 
    3031# include <cstdlib> 
    3132 

  • branches/lebrun/devel/lib/src/Uncertainty/Distribution/Normal.cxx

    r975 r1010  
    343343              { 
    344344                lowerCDF = 0.0; 
    345                 if (finiteLower[0]) lowerCDF = DistFunc::pNormal(lower[0]); 
     345                if (finiteLower[i]) lowerCDF = DistFunc::pNormal(lower[i]); 
    346346                upperCDF = 1.0; 
    347                 if (finiteUpper[0]) upperCDF = DistFunc::pNormal(upper[0]); 
     347                if (finiteUpper[i]) upperCDF = DistFunc::pNormal(upper[i]); 
    348348                value *= upperCDF - lowerCDF; 
    349349              } 

  • branches/lebrun/devel/lib/test/check_testsuite.at

    r999 r1010  
    6565m4_include(t_LinearNumericalMathFunction_std.at) 
    6666m4_include(t_ConstantNumericalMathHessianImplementation_std.at) 
    67 #m4_include(t_MethodBoundNumericalMathEvaluationImplementation_std.at) 
     67m4_include(t_MethodBoundNumericalMathEvaluationImplementation_std.at) 
    6868m4_include(t_NumericalMathFunction_analytical.at) 
    6969 

  • branches/lebrun/devel/lib/test/external_code_threads.cxx

    r867 r1010  
    2626#include <iostream> 
    2727#include <cmath> 
     28#include <cstdio> 
    2829#include <cstdlib> 
    2930#include "OT.hxx" 

  • branches/lebrun/devel/lib/test/t_ClaytonCopulaFactory_std.at

    r994 r1010  
    88         [0], 
    99[[Distribution          =class=ClaytonCopula name=ClaytonCopula dimension=2 theta=1.5 
    10 Estimated distribution=class=ClaytonCopula name=ClaytonCopula dimension=2 theta=1.33376 
     10Estimated distribution=class=ClaytonCopula name=ClaytonCopula dimension=2 theta=1.33821 
    1111]], 
    1212         [ignore]) 

  • branches/lebrun/devel/lib/test/t_FrankCopulaFactory_std.at

    r994 r1010  
    88         [0], 
    99[[Distribution          =class=FrankCopula name=FrankCopula dimension=2 theta=1.5 
    10 Estimated distribution=class=FrankCopula name=FrankCopula dimension=2 theta=1.31504 
     10Estimated distribution=class=FrankCopula name=FrankCopula dimension=2 theta=1.31776 
    1111]], 
    1212         [ignore]) 

  • branches/lebrun/devel/lib/test/t_GumbelCopulaFactory_std.at

    r994 r1010  
    88         [0], 
    99[[Distribution          =class=GumbelCopula name=GumbelCopula dimension=2 theta=1.5 
    10 Estimated distribution=class=GumbelCopula name=GumbelCopula dimension=2 theta=1.55745 
     10Estimated distribution=class=GumbelCopula name=GumbelCopula dimension=2 theta=1.55919 
    1111]], 
    1212         [ignore]) 

  • branches/lebrun/devel/lib/test/t_MethodBoundNumericalMathEvaluationImplementation_std.at

    r962 r1010  
    1 AT_SETUP([MethodBoundNumericalMathEvaluationImplementation]) 
     1AT_SETUP([MethodBoundNumericalMathEval...Implementation]) 
    22 
    33AT_KEYWORDS([std Uncertainty Normal MethodBoundNumericalMathEvaluationImplementation]) 
    …… 
    55AT_CHECK([t_MethodBoundNumericalMathEvaluationImplementation_std], 
    66         [0], 
    7 [[]], 
     7[[Normal DDF=class=NumericalPoint name=Unnamed dimension=1 implementation=class=NumericalPointImplementation name=Unnamed dimension=1 values=[-0.241971] 
     8bind DDF  =-0.241971 
     9]], 
    810         [ignore]) 
    911 

  • branches/lebrun/devel/lib/test/t_MethodBoundNumericalMathEvaluationImplementation_std.cxx

    r962 r1010  
    4747  try { 
    4848    Normal distribution(0, 1.0); 
    49     //    NumericalMathFunction function(bindMethod<Normal, NumericalScalar, NumericalPoint>(distribution, &Normal::computeCDF)); 
     49    NumericalMathFunction function( bindMethod <Normal, NumericalScalar, NumericalScalar> ( distribution, &Normal::computeDDF ) ); 
    5050    NumericalPoint p(1, 1.0); 
    51     std::cout << "Normal CDF=" << distribution.computeCDF(p) << std::endl; 
    52     //    std::cout << "bind CDF  =" << function(p)[0] << std::endl; 
     51    std::cout << "Normal DDF=" << distribution.computeDDF(p) << std::endl; 
     52    std::cout << "bind DDF  =" << function(p)[0] << std::endl; 
    5353  } 
    5454  catch (TestFailed & ex) { 

  • branches/lebrun/devel/lib/test/t_NumericalSample_computation.at

    r823 r1010  
    1616Pearson correlation=class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.65588,-0.57565,0.65588,1,-0.987458,-0.57565,-0.987458,1] 
    1717Spearman correlation=class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.8,-0.8,0.8,1,-1,-0.8,-1,1] 
    18 Kendall tau=class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.4,-0.4,0.4,1,-0.6,-0.4,-0.6,1] 
     18Kendall tau=class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.666667,-0.666667,0.666667,1,-1,-0.666667,-1,1] 
    1919range per component=class=NumericalPoint name=Unnamed dimension=3 implementation=class=NumericalPointImplementation name=Unnamed dimension=3 values=[5,7,7] 
    2020median per component=class=NumericalPoint name=Unnamed dimension=3 implementation=class=NumericalPointImplementation name=Unnamed dimension=3 values=[5,3,8] 

  • branches/lebrun/devel/python/test/t_ClaytonCopulaFactory_std.atpy

    r994 r1010  
    88         [0], 
    99[[distribution= class=ClaytonCopula name=ClaytonCopula dimension=2 theta=1.5 
    10 Estimated distribution= class=ClaytonCopula name=ClaytonCopula dimension=2 theta=1.33376 
     10Estimated distribution= class=ClaytonCopula name=ClaytonCopula dimension=2 theta=1.33821 
    1111]], 
    1212         [ignore]) 

  • branches/lebrun/devel/python/test/t_FrankCopulaFactory_std.atpy

    r994 r1010  
    66         [0], 
    77[[distribution= class=FrankCopula name=FrankCopula dimension=2 theta=1.5 
    8 Estimated distribution= class=FrankCopula name=FrankCopula dimension=2 theta=1.31504 
     8Estimated distribution= class=FrankCopula name=FrankCopula dimension=2 theta=1.31776 
    99]], 
    1010         [ignore]) 

  • branches/lebrun/devel/python/test/t_GumbelCopulaFactory_std.atpy

    r994 r1010  
    66         [0], 
    77[[distribution= class=GumbelCopula name=GumbelCopula dimension=2 theta=1.5 
    8 Estimated distribution= class=GumbelCopula name=GumbelCopula dimension=2 theta=1.55745 
     8Estimated distribution= class=GumbelCopula name=GumbelCopula dimension=2 theta=1.55919 
    99]], 
    1010         [ignore]) 

  • branches/lebrun/devel/python/test/t_NumericalSample_computation.atpy

    r867 r1010  
    1616Pearson correlation= class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.65588,-0.57565,0.65588,1,-0.987458,-0.57565,-0.987458,1] 
    1717Spearman correlation= class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.8,-0.8,0.8,1,-1,-0.8,-1,1] 
    18 Kendall tau= class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.4,-0.4,0.4,1,-0.6,-0.4,-0.6,1] 
     18Kendall tau= class=CorrelationMatrix dimension=3 implementation=class=MatrixImplementation name=Unnamed rows=3 columns=3 values=[1,0.666667,-0.666667,0.666667,1,-1,-0.666667,-1,1] 
    1919range per component= class=NumericalPoint name=Unnamed dimension=3 implementation=class=NumericalPointImplementation name=Unnamed dimension=3 values=[5,7,7] 
    2020median per component= class=NumericalPoint name=Unnamed dimension=3 implementation=class=NumericalPointImplementation name=Unnamed dimension=3 values=[5,3,8]