Changeset 1009
- Timestamp:
- 11/14/08 12:10:53 (2 months ago)
- Files:
-
- trunk/lib/src/Base/Func/MethodBoundNumericalMathEvaluationImplementation.hxx (modified) (2 diffs)
- trunk/lib/test/check_testsuite.at (modified) (1 diff)
- trunk/lib/test/t_MethodBoundNumericalMathEvaluationImplementation_std.at (modified) (2 diffs)
- trunk/lib/test/t_MethodBoundNumericalMathEvaluationImplementation_std.cxx (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/src/Base/Func/MethodBoundNumericalMathEvaluationImplementation.hxx
r995 r1009 20 20 21 21 #include "NumericalMathEvaluationImplementation.hxx" 22 #include "NumericalMathFunctionImplementation.hxx" 22 23 #include "NumericalPoint.hxx" 23 24 … … 186 187 187 188 template <typename EvaluableObject, typename ReturnType_, typename ArgumentType_> 188 MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_> *189 NumericalMathFunctionImplementation 189 190 bindMethod (const EvaluableObject & obj, 190 191 typename MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_>::EvaluationMethod method ) 191 192 { 192 return new MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_>( obj, method);193 return NumericalMathFunctionImplementation( new MethodBoundNumericalMathEvaluationImplementation<EvaluableObject, ReturnType_, ArgumentType_>( obj, method ) ); 193 194 } 194 195 trunk/lib/test/check_testsuite.at
r996 r1009 65 65 m4_include(t_LinearNumericalMathFunction_std.at) 66 66 m4_include(t_ConstantNumericalMathHessianImplementation_std.at) 67 #m4_include(t_MethodBoundNumericalMathEvaluationImplementation_std.at)67 m4_include(t_MethodBoundNumericalMathEvaluationImplementation_std.at) 68 68 m4_include(t_NumericalMathFunction_analytical.at) 69 69 trunk/lib/test/t_MethodBoundNumericalMathEvaluationImplementation_std.at
r995 r1009 1 AT_SETUP([MethodBoundNumericalMathEval uationImplementation])1 AT_SETUP([MethodBoundNumericalMathEval...Implementation]) 2 2 3 3 AT_KEYWORDS([std Uncertainty Normal MethodBoundNumericalMathEvaluationImplementation]) … … 5 5 AT_CHECK([t_MethodBoundNumericalMathEvaluationImplementation_std], 6 6 [0], 7 [[]], 7 [[Normal DDF=class=NumericalPoint name=Unnamed dimension=1 implementation=class=NumericalPointImplementation name=Unnamed dimension=1 values=[-0.241971] 8 bind DDF =-0.241971 9 ]], 8 10 [ignore]) 9 11 trunk/lib/test/t_MethodBoundNumericalMathEvaluationImplementation_std.cxx
r995 r1009 47 47 try { 48 48 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 ) ); 50 50 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; 53 53 } 54 54 catch (TestFailed & ex) {
