diff --git a/include/codi/expressions/real/binaryOperators.hpp b/include/codi/expressions/real/binaryOperators.hpp index aab24d17..d77d46e5 100644 --- a/include/codi/expressions/real/binaryOperators.hpp +++ b/include/codi/expressions/real/binaryOperators.hpp @@ -260,6 +260,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationAtan2 #define FUNCTION atan2 +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAtan2 +#define FUNCTION atan2f +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAtan2 +#define FUNCTION atan2l #include "binaryOverloads.tpp" /// BinaryOperation implementation for copysign @@ -313,6 +321,10 @@ namespace codi { #define OPERATION_LOGIC OperationCopysign #define FUNCTION copysignf +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationCopysign +#define FUNCTION copysignl #include "binaryOverloads.tpp" /// BinaryOperation implementation for fmod @@ -357,6 +369,10 @@ namespace codi { #define OPERATION_LOGIC OperationFmod #define FUNCTION fmodf +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationFmod +#define FUNCTION fmodl #include "binaryOverloads.tpp" /// BinaryOperation implementation for frexp @@ -411,6 +427,18 @@ namespace codi { #define FUNCTION frexp #define SECOND_ARG_TYPE int* #define SECOND_ARG_CONVERSION IntPointerConversion +#include "binaryFirstArgumentOverloads.tpp" + +#define OPERATION_LOGIC OperationFrexp +#define FUNCTION frexpf +#define SECOND_ARG_TYPE int* +#define SECOND_ARG_CONVERSION IntPointerConversion +#include "binaryFirstArgumentOverloads.tpp" + +#define OPERATION_LOGIC OperationFrexp +#define FUNCTION frexpl +#define SECOND_ARG_TYPE int* +#define SECOND_ARG_CONVERSION IntPointerConversion #include "binaryFirstArgumentOverloads.tpp" /// BinaryOperation implementation for hypot @@ -467,13 +495,14 @@ namespace codi { #include "binaryOverloads.tpp" #define OPERATION_LOGIC OperationHypot -#define FUNCTION hypotl +#define FUNCTION hypotf #include "binaryOverloads.tpp" #define OPERATION_LOGIC OperationHypot -#define FUNCTION hypotf +#define FUNCTION hypotl #include "binaryOverloads.tpp" + /// BinaryOperation implementation for ldexp template struct OperationLdexp : public BinaryOperation { @@ -507,6 +536,18 @@ namespace codi { #define FUNCTION ldexp #define SECOND_ARG_TYPE int #define SECOND_ARG_CONVERSION ConstantDataConversion +#include "binaryFirstArgumentOverloads.tpp" + +#define OPERATION_LOGIC OperationLdexp +#define FUNCTION ldexpl +#define SECOND_ARG_TYPE int +#define SECOND_ARG_CONVERSION ConstantDataConversion +#include "binaryFirstArgumentOverloads.tpp" + +#define OPERATION_LOGIC OperationLdexp +#define FUNCTION ldexpf +#define SECOND_ARG_TYPE int +#define SECOND_ARG_CONVERSION ConstantDataConversion #include "binaryFirstArgumentOverloads.tpp" /// BinaryOperation implementation for max @@ -555,6 +596,14 @@ namespace codi { #define OPERATION_LOGIC OperationMax #define FUNCTION fmax +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationMax +#define FUNCTION fmaxf +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationMax +#define FUNCTION fmaxl #include "binaryOverloads.tpp" /// BinaryOperation implementation for min @@ -602,6 +651,14 @@ namespace codi { #define OPERATION_LOGIC OperationMin #define FUNCTION fmin +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationMin +#define FUNCTION fminf +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationMin +#define FUNCTION fminl #include "binaryOverloads.tpp" /// BinaryOperation implementation for pow @@ -664,6 +721,10 @@ namespace codi { #define OPERATION_LOGIC OperationPow #define FUNCTION powf +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationPow +#define FUNCTION powl #include "binaryOverloads.tpp" /// BinaryOperation implementation for remainder @@ -712,6 +773,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationRemainder #define FUNCTION remainder +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationRemainder +#define FUNCTION remainderf +#include "binaryOverloads.tpp" + +#define OPERATION_LOGIC OperationRemainder +#define FUNCTION remainderl #include "binaryOverloads.tpp" /// @} @@ -734,21 +803,36 @@ namespace codi { namespace std { using codi::atan2; + using codi::atan2f; + using codi::atan2l; using codi::copysign; using codi::copysignf; + using codi::copysignl; using codi::fmax; + using codi::fmaxf; + using codi::fmaxl; using codi::fmin; + using codi::fminf; + using codi::fminl; using codi::fmod; using codi::fmodf; + using codi::fmodl; using codi::frexp; + using codi::frexpf; + using codi::frexpl; using codi::hypot; using codi::hypotf; using codi::hypotl; using codi::ldexp; + using codi::ldexpf; + using codi::ldexpl; using codi::max; using codi::min; using codi::pow; using codi::powf; + using codi::powl; using codi::remainder; + using codi::remainderf; + using codi::remainderl; using codi::swap; } diff --git a/include/codi/expressions/real/unaryOperators.hpp b/include/codi/expressions/real/unaryOperators.hpp index f349c605..e77fea87 100644 --- a/include/codi/expressions/real/unaryOperators.hpp +++ b/include/codi/expressions/real/unaryOperators.hpp @@ -145,6 +145,14 @@ namespace codi { #define OPERATION_LOGIC OperationAbs #define FUNCTION fabs +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAbs +#define FUNCTION fabsf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAbs +#define FUNCTION fabsl #include "unaryOverloads.tpp" /// UnaryOperation implementation for acos @@ -174,6 +182,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationAcos #define FUNCTION acos +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAcos +#define FUNCTION acosf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAcos +#define FUNCTION acosl #include "unaryOverloads.tpp" /// UnaryOperation implementation for asin @@ -203,6 +219,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationAsin #define FUNCTION asin +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAsin +#define FUNCTION asinf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAsin +#define FUNCTION asinl #include "unaryOverloads.tpp" /// UnaryOperation implementation for atan @@ -227,6 +251,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationAtan #define FUNCTION atan +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAtan +#define FUNCTION atanf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAtan +#define FUNCTION atanl #include "unaryOverloads.tpp" /// UnaryOperation implementation for atanh @@ -256,6 +288,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationAtanh #define FUNCTION atanh +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAtanh +#define FUNCTION atanhf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAtanh +#define FUNCTION atanhl #include "unaryOverloads.tpp" /// UnaryOperation implementation for cbrt @@ -288,6 +328,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationCbrt #define FUNCTION cbrt +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationCbrt +#define FUNCTION cbrtf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationCbrt +#define FUNCTION cbrtl #include "unaryOverloads.tpp" /// Function overload for ceil @@ -296,6 +344,18 @@ namespace codi { return ceil(RealTraits::getPassiveValue(arg.cast())); } + /// Function overload for ceilf + template + CODI_INLINE RealTraits::PassiveReal ceilf(ExpressionInterface const& arg) { + return ceil(RealTraits::getPassiveValue(arg.cast())); + } + + /// Function overload for ceill + template + CODI_INLINE RealTraits::PassiveReal ceill(ExpressionInterface const& arg) { + return ceil(RealTraits::getPassiveValue(arg.cast())); + } + /// UnaryOperation implementation for cos template struct OperationCos : public UnaryOperation { @@ -318,6 +378,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationCos #define FUNCTION cos +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationCos +#define FUNCTION cosf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationCos +#define FUNCTION cosl #include "unaryOverloads.tpp" /// UnaryOperation implementation for cosh @@ -342,6 +410,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationCosh #define FUNCTION cosh +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationCosh +#define FUNCTION coshf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationCosh +#define FUNCTION coshl #include "unaryOverloads.tpp" /// UnaryOperation implementation for erf @@ -366,6 +442,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationErf #define FUNCTION erf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationErf +#define FUNCTION erff +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationErf +#define FUNCTION erfl #include "unaryOverloads.tpp" /// UnaryOperation implementation for erfc @@ -390,6 +474,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationErfc #define FUNCTION erfc +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationErfc +#define FUNCTION erfcf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationErfc +#define FUNCTION erfcl #include "unaryOverloads.tpp" /// UnaryOperation implementation for exp @@ -414,6 +506,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationExp #define FUNCTION exp +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationExp +#define FUNCTION expf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationExp +#define FUNCTION expl #include "unaryOverloads.tpp" /// Function overload for floor @@ -422,6 +522,18 @@ namespace codi { return floor(RealTraits::getPassiveValue(arg.cast())); } + /// Function overload for floorf + template + CODI_INLINE RealTraits::PassiveReal floorf(ExpressionInterface const& arg) { + return floor(RealTraits::getPassiveValue(arg.cast())); + } + + /// Function overload for floorl + template + CODI_INLINE RealTraits::PassiveReal floorl(ExpressionInterface const& arg) { + return floor(RealTraits::getPassiveValue(arg.cast())); + } + /// Function overload for isfinite template CODI_INLINE bool isfinite(ExpressionInterface const& arg) { @@ -473,6 +585,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationLog #define FUNCTION log +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog +#define FUNCTION logf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog +#define FUNCTION logl #include "unaryOverloads.tpp" /// UnaryOperation implementation for log10 @@ -502,6 +622,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationLog10 #define FUNCTION log10 +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog10 +#define FUNCTION log10f +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog10 +#define FUNCTION log10l #include "unaryOverloads.tpp" /// Function overload for round @@ -510,6 +638,18 @@ namespace codi { return round(arg.cast().getValue()); } + /// Function overload for roundf + template + CODI_INLINE RealTraits::PassiveReal roundf(ExpressionInterface const& arg) { + return round(arg.cast().getValue()); + } + + /// Function overload for roundl + template + CODI_INLINE RealTraits::PassiveReal roundl(ExpressionInterface const& arg) { + return round(arg.cast().getValue()); + } + /// UnaryOperation implementation for sin template struct OperationSin : public UnaryOperation { @@ -532,6 +672,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationSin #define FUNCTION sin +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationSin +#define FUNCTION sinf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationSin +#define FUNCTION sinl #include "unaryOverloads.tpp" /// UnaryOperation implementation for sinh @@ -556,6 +704,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationSinh #define FUNCTION sinh +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationSinh +#define FUNCTION sinhf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationSinh +#define FUNCTION sinhl #include "unaryOverloads.tpp" /// UnaryOperation implementation for sqrt @@ -588,6 +744,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationSqrt #define FUNCTION sqrt +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationSqrt +#define FUNCTION sqrtf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationSqrt +#define FUNCTION sqrtl #include "unaryOverloads.tpp" /// UnaryOperation implementation for tan @@ -618,6 +782,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationTan #define FUNCTION tan +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationTan +#define FUNCTION tanf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationTan +#define FUNCTION tanl #include "unaryOverloads.tpp" /// UnaryOperation implementation for tanh @@ -642,6 +814,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationTanh #define FUNCTION tanh +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationTanh +#define FUNCTION tanhf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationTanh +#define FUNCTION tanhl #include "unaryOverloads.tpp" /// UnaryOperation implementation for tgamma @@ -701,6 +881,14 @@ namespace codi { }; #define OPERATION_LOGIC OperationTgamma #define FUNCTION tgamma +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationTgamma +#define FUNCTION tgammaf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationTgamma +#define FUNCTION tgammal #include "unaryOverloads.tpp" /// @} @@ -723,31 +911,75 @@ namespace std { using codi::abs; using codi::acos; + using codi::acosf; + using codi::acosl; using codi::asin; + using codi::asinf; + using codi::asinl; using codi::atan; + using codi::atanf; + using codi::atanl; using codi::atanh; + using codi::atanhf; + using codi::atanhl; using codi::cbrt; + using codi::cbrtf; + using codi::cbrtl; using codi::ceil; + using codi::ceilf; + using codi::ceill; using codi::cos; + using codi::cosf; + using codi::cosl; using codi::cosh; + using codi::coshf; + using codi::coshl; using codi::erf; + using codi::erff; + using codi::erfl; using codi::erfc; + using codi::erfcf; + using codi::erfcl; using codi::exp; + using codi::expf; + using codi::expl; using codi::fabs; + using codi::fabsf; + using codi::fabsl; using codi::floor; + using codi::floorf; + using codi::floorl; using codi::isfinite; using codi::isinf; using codi::isnan; using codi::isnormal; using codi::log; + using codi::logf; + using codi::logl; using codi::log10; + using codi::log10f; + using codi::log10l; using codi::round; + using codi::roundf; + using codi::roundl; using codi::sin; + using codi::sinf; + using codi::sinl; using codi::sinh; + using codi::sinhf; + using codi::sinhl; using codi::sqrt; + using codi::sqrtf; + using codi::sqrtl; using codi::tan; + using codi::tanf; + using codi::tanl; using codi::tanh; + using codi::tanhf; + using codi::tanhl; using codi::tgamma; + using codi::tgammaf; + using codi::tgammal; using codi::to_string; } diff --git a/tests/general/include/tests/expressions/testTwoArgumentExpr1.hpp b/tests/general/include/tests/expressions/testTwoArgumentExpr1.hpp index de7b904e..6e0dee67 100644 --- a/tests/general/include/tests/expressions/testTwoArgumentExpr1.hpp +++ b/tests/general/include/tests/expressions/testTwoArgumentExpr1.hpp @@ -38,7 +38,7 @@ struct TestTwoArgumentExpr1 : public TestInterface { public: NAME("TwoArgumentExpr1") IN(2) - OUT(32) + OUT(29) POINTS(25) = // clang-format off { {-10.0, -10}, @@ -99,12 +99,9 @@ struct TestTwoArgumentExpr1 : public TestInterface { y[24] = copysign(x[0], x[1]); // R x R y[25] = copysign(5.00, x[1]); // R x R y[26] = copysign(x[0], 5.00); // R x R - y[27] = copysignf(x[0], x[1]); // R x R - y[28] = copysignf(5.00, x[1]); // R x R - y[29] = copysignf(x[0], 5.00); // R x R - y[30] = x[0]; - y[31] = x[1]; - swap(y[30], y[31]); // R x R + y[27] = x[0]; + y[28] = x[1]; + swap(y[27], y[28]); // R x R } }; diff --git a/tests/general/include/tests/expressions/testTwoArgumentExpr2.hpp b/tests/general/include/tests/expressions/testTwoArgumentExpr2.hpp index f1374f65..01836003 100644 --- a/tests/general/include/tests/expressions/testTwoArgumentExpr2.hpp +++ b/tests/general/include/tests/expressions/testTwoArgumentExpr2.hpp @@ -38,7 +38,7 @@ struct TestTwoArgumentExpr2 : public TestInterface { public: NAME("TwoArgumentExpr2") IN(2) - OUT(18) + OUT(15) POINTS(18) = // clang-format off { {-10.0, -10}, @@ -78,8 +78,5 @@ struct TestTwoArgumentExpr2 : public TestInterface { y[12] = fmod(x[0], x[1]); // R x (R \ {0}) y[13] = fmod(5.00, x[1]); // R x (R \ {0}) y[14] = fmod(x[0], 5.00); // R x (R \ {0}) - y[15] = fmodf(x[0], x[1]); // R x (R \ {0}) - y[16] = fmodf(5.00, x[1]); // R x (R \ {0}) - y[17] = fmodf(x[0], 5.00); // R x (R \ {0}) } }; diff --git a/tests/general/results/deriv0th/TwoArgumentExpr1.out b/tests/general/results/deriv0th/TwoArgumentExpr1.out index 6b8066aa..0e186f7c 100644 --- a/tests/general/results/deriv0th/TwoArgumentExpr1.out +++ b/tests/general/results/deriv0th/TwoArgumentExpr1.out @@ -27,10 +27,7 @@ Point 0 : {-10.000000, -10.000000} out_025 -5 out_026 10 out_027 -10 - out_028 -5 - out_029 10 - out_030 -10 - out_031 -10 + out_028 -10 Point 1 : {-10.000000, -5.000000} out_000 -15 out_001 0 @@ -59,11 +56,8 @@ Point 1 : {-10.000000, -5.000000} out_024 -10 out_025 -5 out_026 10 - out_027 -10 - out_028 -5 - out_029 10 - out_030 -5 - out_031 -10 + out_027 -5 + out_028 -10 Point 2 : {-10.000000, 0.000000} out_000 -10 out_001 5 @@ -92,11 +86,8 @@ Point 2 : {-10.000000, 0.000000} out_024 10 out_025 5 out_026 10 - out_027 10 - out_028 5 - out_029 10 - out_030 0 - out_031 -10 + out_027 0 + out_028 -10 Point 3 : {-10.000000, 5.000000} out_000 -5 out_001 10 @@ -125,11 +116,8 @@ Point 3 : {-10.000000, 5.000000} out_024 10 out_025 5 out_026 10 - out_027 10 - out_028 5 - out_029 10 - out_030 5 - out_031 -10 + out_027 5 + out_028 -10 Point 4 : {-10.000000, 10.000000} out_000 0 out_001 15 @@ -159,10 +147,7 @@ Point 4 : {-10.000000, 10.000000} out_025 5 out_026 10 out_027 10 - out_028 5 - out_029 10 - out_030 10 - out_031 -10 + out_028 -10 Point 5 : {-5.000000, -10.000000} out_000 -15 out_001 -5 @@ -191,11 +176,8 @@ Point 5 : {-5.000000, -10.000000} out_024 -5 out_025 -5 out_026 5 - out_027 -5 + out_027 -10 out_028 -5 - out_029 5 - out_030 -10 - out_031 -5 Point 6 : {-5.000000, -5.000000} out_000 -10 out_001 0 @@ -226,9 +208,6 @@ Point 6 : {-5.000000, -5.000000} out_026 5 out_027 -5 out_028 -5 - out_029 5 - out_030 -5 - out_031 -5 Point 7 : {-5.000000, 0.000000} out_000 -5 out_001 5 @@ -257,11 +236,8 @@ Point 7 : {-5.000000, 0.000000} out_024 5 out_025 5 out_026 5 - out_027 5 - out_028 5 - out_029 5 - out_030 0 - out_031 -5 + out_027 0 + out_028 -5 Point 8 : {-5.000000, 5.000000} out_000 0 out_001 10 @@ -291,10 +267,7 @@ Point 8 : {-5.000000, 5.000000} out_025 5 out_026 5 out_027 5 - out_028 5 - out_029 5 - out_030 5 - out_031 -5 + out_028 -5 Point 9 : {-5.000000, 10.000000} out_000 5 out_001 15 @@ -323,11 +296,8 @@ Point 9 : {-5.000000, 10.000000} out_024 5 out_025 5 out_026 5 - out_027 5 - out_028 5 - out_029 5 - out_030 10 - out_031 -5 + out_027 10 + out_028 -5 Point 10 : {0.000000, -10.000000} out_000 -10 out_001 -5 @@ -356,11 +326,8 @@ Point 10 : {0.000000, -10.000000} out_024 -0 out_025 -5 out_026 0 - out_027 -0 - out_028 -5 - out_029 0 - out_030 -10 - out_031 0 + out_027 -10 + out_028 0 Point 11 : {0.000000, -5.000000} out_000 -5 out_001 0 @@ -389,11 +356,8 @@ Point 11 : {0.000000, -5.000000} out_024 -0 out_025 -5 out_026 0 - out_027 -0 - out_028 -5 - out_029 0 - out_030 -5 - out_031 0 + out_027 -5 + out_028 0 Point 12 : {0.000000, 0.000000} out_000 0 out_001 5 @@ -423,10 +387,7 @@ Point 12 : {0.000000, 0.000000} out_025 5 out_026 0 out_027 0 - out_028 5 - out_029 0 - out_030 0 - out_031 0 + out_028 0 Point 13 : {0.000000, 5.000000} out_000 5 out_001 10 @@ -455,11 +416,8 @@ Point 13 : {0.000000, 5.000000} out_024 0 out_025 5 out_026 0 - out_027 0 - out_028 5 - out_029 0 - out_030 5 - out_031 0 + out_027 5 + out_028 0 Point 14 : {0.000000, 10.000000} out_000 10 out_001 15 @@ -488,11 +446,8 @@ Point 14 : {0.000000, 10.000000} out_024 0 out_025 5 out_026 0 - out_027 0 - out_028 5 - out_029 0 - out_030 10 - out_031 0 + out_027 10 + out_028 0 Point 15 : {5.000000, -10.000000} out_000 -5 out_001 -5 @@ -521,11 +476,8 @@ Point 15 : {5.000000, -10.000000} out_024 -5 out_025 -5 out_026 5 - out_027 -5 - out_028 -5 - out_029 5 - out_030 -10 - out_031 5 + out_027 -10 + out_028 5 Point 16 : {5.000000, -5.000000} out_000 0 out_001 0 @@ -555,10 +507,7 @@ Point 16 : {5.000000, -5.000000} out_025 -5 out_026 5 out_027 -5 - out_028 -5 - out_029 5 - out_030 -5 - out_031 5 + out_028 5 Point 17 : {5.000000, 0.000000} out_000 5 out_001 5 @@ -587,11 +536,8 @@ Point 17 : {5.000000, 0.000000} out_024 5 out_025 5 out_026 5 - out_027 5 + out_027 0 out_028 5 - out_029 5 - out_030 0 - out_031 5 Point 18 : {5.000000, 5.000000} out_000 10 out_001 10 @@ -622,9 +568,6 @@ Point 18 : {5.000000, 5.000000} out_026 5 out_027 5 out_028 5 - out_029 5 - out_030 5 - out_031 5 Point 19 : {5.000000, 10.000000} out_000 15 out_001 15 @@ -653,11 +596,8 @@ Point 19 : {5.000000, 10.000000} out_024 5 out_025 5 out_026 5 - out_027 5 + out_027 10 out_028 5 - out_029 5 - out_030 10 - out_031 5 Point 20 : {10.000000, -10.000000} out_000 0 out_001 -5 @@ -687,10 +627,7 @@ Point 20 : {10.000000, -10.000000} out_025 -5 out_026 10 out_027 -10 - out_028 -5 - out_029 10 - out_030 -10 - out_031 10 + out_028 10 Point 21 : {10.000000, -5.000000} out_000 5 out_001 0 @@ -719,11 +656,8 @@ Point 21 : {10.000000, -5.000000} out_024 -10 out_025 -5 out_026 10 - out_027 -10 - out_028 -5 - out_029 10 - out_030 -5 - out_031 10 + out_027 -5 + out_028 10 Point 22 : {10.000000, 0.000000} out_000 10 out_001 5 @@ -752,11 +686,8 @@ Point 22 : {10.000000, 0.000000} out_024 10 out_025 5 out_026 10 - out_027 10 - out_028 5 - out_029 10 - out_030 0 - out_031 10 + out_027 0 + out_028 10 Point 23 : {10.000000, 5.000000} out_000 15 out_001 10 @@ -785,11 +716,8 @@ Point 23 : {10.000000, 5.000000} out_024 10 out_025 5 out_026 10 - out_027 10 - out_028 5 - out_029 10 - out_030 5 - out_031 10 + out_027 5 + out_028 10 Point 24 : {10.000000, 10.000000} out_000 20 out_001 15 @@ -819,7 +747,4 @@ Point 24 : {10.000000, 10.000000} out_025 5 out_026 10 out_027 10 - out_028 5 - out_029 10 - out_030 10 - out_031 10 + out_028 10 diff --git a/tests/general/results/deriv0th/TwoArgumentExpr2.out b/tests/general/results/deriv0th/TwoArgumentExpr2.out index 09ffe79a..768a2927 100644 --- a/tests/general/results/deriv0th/TwoArgumentExpr2.out +++ b/tests/general/results/deriv0th/TwoArgumentExpr2.out @@ -14,9 +14,6 @@ Point 0 : {-10.000000, -10.000000} out_012 -0 out_013 5 out_014 -0 - out_015 -0 - out_016 5 - out_017 -0 Point 1 : {-10.000000, -5.000000} out_000 2 out_001 -1 @@ -33,9 +30,6 @@ Point 1 : {-10.000000, -5.000000} out_012 -0 out_013 0 out_014 -0 - out_015 -0 - out_016 0 - out_017 -0 Point 2 : {-10.000000, 5.000000} out_000 -2 out_001 1 @@ -52,9 +46,6 @@ Point 2 : {-10.000000, 5.000000} out_012 -0 out_013 0 out_014 -0 - out_015 -0 - out_016 0 - out_017 -0 Point 3 : {-10.000000, 10.000000} out_000 -1 out_001 0.5 @@ -71,9 +62,6 @@ Point 3 : {-10.000000, 10.000000} out_012 -0 out_013 5 out_014 -0 - out_015 -0 - out_016 5 - out_017 -0 Point 4 : {-5.000000, -10.000000} out_000 0.5 out_001 -0.5 @@ -90,9 +78,6 @@ Point 4 : {-5.000000, -10.000000} out_012 -5 out_013 5 out_014 -0 - out_015 -5 - out_016 5 - out_017 -0 Point 5 : {-5.000000, -5.000000} out_000 1 out_001 -1 @@ -109,9 +94,6 @@ Point 5 : {-5.000000, -5.000000} out_012 -0 out_013 0 out_014 -0 - out_015 -0 - out_016 0 - out_017 -0 Point 6 : {-5.000000, 5.000000} out_000 -1 out_001 1 @@ -128,9 +110,6 @@ Point 6 : {-5.000000, 5.000000} out_012 -0 out_013 0 out_014 -0 - out_015 -0 - out_016 0 - out_017 -0 Point 7 : {-5.000000, 10.000000} out_000 -0.5 out_001 0.5 @@ -147,9 +126,6 @@ Point 7 : {-5.000000, 10.000000} out_012 -5 out_013 5 out_014 -0 - out_015 -5 - out_016 5 - out_017 -0 Point 8 : {0.000000, 5.000000} out_000 0 out_001 1 @@ -166,9 +142,6 @@ Point 8 : {0.000000, 5.000000} out_012 0 out_013 0 out_014 0 - out_015 0 - out_016 0 - out_017 0 Point 9 : {0.000000, 10.000000} out_000 0 out_001 0.5 @@ -185,9 +158,6 @@ Point 9 : {0.000000, 10.000000} out_012 0 out_013 5 out_014 0 - out_015 0 - out_016 5 - out_017 0 Point 10 : {5.000000, -10.000000} out_000 -0.5 out_001 -0.5 @@ -204,9 +174,6 @@ Point 10 : {5.000000, -10.000000} out_012 5 out_013 5 out_014 0 - out_015 5 - out_016 5 - out_017 0 Point 11 : {5.000000, -5.000000} out_000 -1 out_001 -1 @@ -223,9 +190,6 @@ Point 11 : {5.000000, -5.000000} out_012 0 out_013 0 out_014 0 - out_015 0 - out_016 0 - out_017 0 Point 12 : {5.000000, 5.000000} out_000 1 out_001 1 @@ -242,9 +206,6 @@ Point 12 : {5.000000, 5.000000} out_012 0 out_013 0 out_014 0 - out_015 0 - out_016 0 - out_017 0 Point 13 : {5.000000, 10.000000} out_000 0.5 out_001 0.5 @@ -261,9 +222,6 @@ Point 13 : {5.000000, 10.000000} out_012 5 out_013 5 out_014 0 - out_015 5 - out_016 5 - out_017 0 Point 14 : {10.000000, -10.000000} out_000 -1 out_001 -0.5 @@ -280,9 +238,6 @@ Point 14 : {10.000000, -10.000000} out_012 0 out_013 5 out_014 0 - out_015 0 - out_016 5 - out_017 0 Point 15 : {10.000000, -5.000000} out_000 -2 out_001 -1 @@ -299,9 +254,6 @@ Point 15 : {10.000000, -5.000000} out_012 0 out_013 0 out_014 0 - out_015 0 - out_016 0 - out_017 0 Point 16 : {10.000000, 5.000000} out_000 2 out_001 1 @@ -318,9 +270,6 @@ Point 16 : {10.000000, 5.000000} out_012 0 out_013 0 out_014 0 - out_015 0 - out_016 0 - out_017 0 Point 17 : {10.000000, 10.000000} out_000 1 out_001 0.5 @@ -337,6 +286,3 @@ Point 17 : {10.000000, 10.000000} out_012 0 out_013 5 out_014 0 - out_015 0 - out_016 5 - out_017 0 diff --git a/tests/general/results/deriv1st/TwoArgumentExpr1.out b/tests/general/results/deriv1st/TwoArgumentExpr1.out index d18cc04d..5263b55d 100644 --- a/tests/general/results/deriv1st/TwoArgumentExpr1.out +++ b/tests/general/results/deriv1st/TwoArgumentExpr1.out @@ -27,11 +27,8 @@ Point 0 : {-10.000000, -10.000000} out_024 1 0 out_025 0 0 out_026 -1 0 - out_027 1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 1 : {-10.000000, -5.000000} in_000 in_001 out_000 1 1 @@ -61,11 +58,8 @@ Point 1 : {-10.000000, -5.000000} out_024 1 0 out_025 0 0 out_026 -1 0 - out_027 1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 2 : {-10.000000, 0.000000} in_000 in_001 out_000 1 1 @@ -95,11 +89,8 @@ Point 2 : {-10.000000, 0.000000} out_024 -1 0 out_025 0 0 out_026 -1 0 - out_027 -1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 3 : {-10.000000, 5.000000} in_000 in_001 out_000 1 1 @@ -129,11 +120,8 @@ Point 3 : {-10.000000, 5.000000} out_024 -1 0 out_025 0 0 out_026 -1 0 - out_027 -1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 4 : {-10.000000, 10.000000} in_000 in_001 out_000 1 1 @@ -163,11 +151,8 @@ Point 4 : {-10.000000, 10.000000} out_024 -1 0 out_025 0 0 out_026 -1 0 - out_027 -1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 5 : {-5.000000, -10.000000} in_000 in_001 out_000 1 1 @@ -197,11 +182,8 @@ Point 5 : {-5.000000, -10.000000} out_024 1 0 out_025 0 0 out_026 -1 0 - out_027 1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 6 : {-5.000000, -5.000000} in_000 in_001 out_000 1 1 @@ -231,11 +213,8 @@ Point 6 : {-5.000000, -5.000000} out_024 1 0 out_025 0 0 out_026 -1 0 - out_027 1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 7 : {-5.000000, 0.000000} in_000 in_001 out_000 1 1 @@ -265,11 +244,8 @@ Point 7 : {-5.000000, 0.000000} out_024 -1 0 out_025 0 0 out_026 -1 0 - out_027 -1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 8 : {-5.000000, 5.000000} in_000 in_001 out_000 1 1 @@ -299,11 +275,8 @@ Point 8 : {-5.000000, 5.000000} out_024 -1 0 out_025 0 0 out_026 -1 0 - out_027 -1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 9 : {-5.000000, 10.000000} in_000 in_001 out_000 1 1 @@ -333,11 +306,8 @@ Point 9 : {-5.000000, 10.000000} out_024 -1 0 out_025 0 0 out_026 -1 0 - out_027 -1 0 - out_028 0 0 - out_029 -1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 10 : {0.000000, -10.000000} in_000 in_001 out_000 1 1 @@ -367,11 +337,8 @@ Point 10 : {0.000000, -10.000000} out_024 0 0 out_025 0 0 out_026 0 0 - out_027 0 0 - out_028 0 0 - out_029 0 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 11 : {0.000000, -5.000000} in_000 in_001 out_000 1 1 @@ -401,11 +368,8 @@ Point 11 : {0.000000, -5.000000} out_024 0 0 out_025 0 0 out_026 0 0 - out_027 0 0 - out_028 0 0 - out_029 0 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 12 : {0.000000, 0.000000} in_000 in_001 out_000 1 1 @@ -435,11 +399,8 @@ Point 12 : {0.000000, 0.000000} out_024 0 0 out_025 0 0 out_026 0 0 - out_027 0 0 - out_028 0 0 - out_029 0 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 13 : {0.000000, 5.000000} in_000 in_001 out_000 1 1 @@ -469,11 +430,8 @@ Point 13 : {0.000000, 5.000000} out_024 0 0 out_025 0 0 out_026 0 0 - out_027 0 0 - out_028 0 0 - out_029 0 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 14 : {0.000000, 10.000000} in_000 in_001 out_000 1 1 @@ -503,11 +461,8 @@ Point 14 : {0.000000, 10.000000} out_024 0 0 out_025 0 0 out_026 0 0 - out_027 0 0 - out_028 0 0 - out_029 0 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 15 : {5.000000, -10.000000} in_000 in_001 out_000 1 1 @@ -537,11 +492,8 @@ Point 15 : {5.000000, -10.000000} out_024 -1 0 out_025 0 0 out_026 1 0 - out_027 -1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 16 : {5.000000, -5.000000} in_000 in_001 out_000 1 1 @@ -571,11 +523,8 @@ Point 16 : {5.000000, -5.000000} out_024 -1 0 out_025 0 0 out_026 1 0 - out_027 -1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 17 : {5.000000, 0.000000} in_000 in_001 out_000 1 1 @@ -605,11 +554,8 @@ Point 17 : {5.000000, 0.000000} out_024 1 0 out_025 0 0 out_026 1 0 - out_027 1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 18 : {5.000000, 5.000000} in_000 in_001 out_000 1 1 @@ -639,11 +585,8 @@ Point 18 : {5.000000, 5.000000} out_024 1 0 out_025 0 0 out_026 1 0 - out_027 1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 19 : {5.000000, 10.000000} in_000 in_001 out_000 1 1 @@ -673,11 +616,8 @@ Point 19 : {5.000000, 10.000000} out_024 1 0 out_025 0 0 out_026 1 0 - out_027 1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 20 : {10.000000, -10.000000} in_000 in_001 out_000 1 1 @@ -707,11 +647,8 @@ Point 20 : {10.000000, -10.000000} out_024 -1 0 out_025 0 0 out_026 1 0 - out_027 -1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 21 : {10.000000, -5.000000} in_000 in_001 out_000 1 1 @@ -741,11 +678,8 @@ Point 21 : {10.000000, -5.000000} out_024 -1 0 out_025 0 0 out_026 1 0 - out_027 -1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 22 : {10.000000, 0.000000} in_000 in_001 out_000 1 1 @@ -775,11 +709,8 @@ Point 22 : {10.000000, 0.000000} out_024 1 0 out_025 0 0 out_026 1 0 - out_027 1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 23 : {10.000000, 5.000000} in_000 in_001 out_000 1 1 @@ -809,11 +740,8 @@ Point 23 : {10.000000, 5.000000} out_024 1 0 out_025 0 0 out_026 1 0 - out_027 1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 Point 24 : {10.000000, 10.000000} in_000 in_001 out_000 1 1 @@ -843,8 +771,5 @@ Point 24 : {10.000000, 10.000000} out_024 1 0 out_025 0 0 out_026 1 0 - out_027 1 0 - out_028 0 0 - out_029 1 0 - out_030 0 1 - out_031 1 0 + out_027 0 1 + out_028 1 0 diff --git a/tests/general/results/deriv1st/TwoArgumentExpr2.out b/tests/general/results/deriv1st/TwoArgumentExpr2.out index c07f82f0..1d4609d0 100644 --- a/tests/general/results/deriv1st/TwoArgumentExpr2.out +++ b/tests/general/results/deriv1st/TwoArgumentExpr2.out @@ -15,9 +15,6 @@ Point 0 : {-10.000000, -10.000000} out_012 1 -1 out_013 0 0 out_014 1 0 - out_015 1 -1 - out_016 0 0 - out_017 1 0 Point 1 : {-10.000000, -5.000000} in_000 in_001 out_000 -0.2 0.4 @@ -35,9 +32,6 @@ Point 1 : {-10.000000, -5.000000} out_012 1 -2 out_013 0 1 out_014 1 0 - out_015 1 -2 - out_016 0 1 - out_017 1 0 Point 2 : {-10.000000, 5.000000} in_000 in_001 out_000 0.2 0.4 @@ -55,9 +49,6 @@ Point 2 : {-10.000000, 5.000000} out_012 1 2 out_013 0 -1 out_014 1 0 - out_015 1 2 - out_016 0 -1 - out_017 1 0 Point 3 : {-10.000000, 10.000000} in_000 in_001 out_000 0.1 0.1 @@ -75,9 +66,6 @@ Point 3 : {-10.000000, 10.000000} out_012 1 1 out_013 0 0 out_014 1 0 - out_015 1 1 - out_016 0 0 - out_017 1 0 Point 4 : {-5.000000, -10.000000} in_000 in_001 out_000 -0.1 0.05 @@ -95,9 +83,6 @@ Point 4 : {-5.000000, -10.000000} out_012 1 0 out_013 0 0 out_014 1 0 - out_015 1 0 - out_016 0 0 - out_017 1 0 Point 5 : {-5.000000, -5.000000} in_000 in_001 out_000 -0.2 0.2 @@ -115,9 +100,6 @@ Point 5 : {-5.000000, -5.000000} out_012 1 -1 out_013 0 1 out_014 1 0 - out_015 1 -1 - out_016 0 1 - out_017 1 0 Point 6 : {-5.000000, 5.000000} in_000 in_001 out_000 0.2 0.2 @@ -135,9 +117,6 @@ Point 6 : {-5.000000, 5.000000} out_012 1 1 out_013 0 -1 out_014 1 0 - out_015 1 1 - out_016 0 -1 - out_017 1 0 Point 7 : {-5.000000, 10.000000} in_000 in_001 out_000 0.1 0.05 @@ -155,9 +134,6 @@ Point 7 : {-5.000000, 10.000000} out_012 1 0 out_013 0 0 out_014 1 0 - out_015 1 0 - out_016 0 0 - out_017 1 0 Point 8 : {0.000000, 5.000000} in_000 in_001 out_000 0.2 0 @@ -175,9 +151,6 @@ Point 8 : {0.000000, 5.000000} out_012 1 0 out_013 0 -1 out_014 1 0 - out_015 1 0 - out_016 0 -1 - out_017 1 0 Point 9 : {0.000000, 10.000000} in_000 in_001 out_000 0.1 0 @@ -195,9 +168,6 @@ Point 9 : {0.000000, 10.000000} out_012 1 0 out_013 0 0 out_014 1 0 - out_015 1 0 - out_016 0 0 - out_017 1 0 Point 10 : {5.000000, -10.000000} in_000 in_001 out_000 -0.1 -0.05 @@ -215,9 +185,6 @@ Point 10 : {5.000000, -10.000000} out_012 1 0 out_013 0 0 out_014 1 0 - out_015 1 0 - out_016 0 0 - out_017 1 0 Point 11 : {5.000000, -5.000000} in_000 in_001 out_000 -0.2 -0.2 @@ -235,9 +202,6 @@ Point 11 : {5.000000, -5.000000} out_012 1 1 out_013 0 1 out_014 1 0 - out_015 1 1 - out_016 0 1 - out_017 1 0 Point 12 : {5.000000, 5.000000} in_000 in_001 out_000 0.2 -0.2 @@ -255,9 +219,6 @@ Point 12 : {5.000000, 5.000000} out_012 1 -1 out_013 0 -1 out_014 1 0 - out_015 1 -1 - out_016 0 -1 - out_017 1 0 Point 13 : {5.000000, 10.000000} in_000 in_001 out_000 0.1 -0.05 @@ -275,9 +236,6 @@ Point 13 : {5.000000, 10.000000} out_012 1 0 out_013 0 0 out_014 1 0 - out_015 1 0 - out_016 0 0 - out_017 1 0 Point 14 : {10.000000, -10.000000} in_000 in_001 out_000 -0.1 -0.1 @@ -295,9 +253,6 @@ Point 14 : {10.000000, -10.000000} out_012 1 1 out_013 0 0 out_014 1 0 - out_015 1 1 - out_016 0 0 - out_017 1 0 Point 15 : {10.000000, -5.000000} in_000 in_001 out_000 -0.2 -0.4 @@ -315,9 +270,6 @@ Point 15 : {10.000000, -5.000000} out_012 1 2 out_013 0 1 out_014 1 0 - out_015 1 2 - out_016 0 1 - out_017 1 0 Point 16 : {10.000000, 5.000000} in_000 in_001 out_000 0.2 -0.4 @@ -335,9 +287,6 @@ Point 16 : {10.000000, 5.000000} out_012 1 -2 out_013 0 -1 out_014 1 0 - out_015 1 -2 - out_016 0 -1 - out_017 1 0 Point 17 : {10.000000, 10.000000} in_000 in_001 out_000 0.1 -0.1 @@ -355,6 +304,3 @@ Point 17 : {10.000000, 10.000000} out_012 1 -1 out_013 0 0 out_014 1 0 - out_015 1 -1 - out_016 0 0 - out_017 1 0 diff --git a/tests/general/results/deriv2nd/TwoArgumentExpr1.out b/tests/general/results/deriv2nd/TwoArgumentExpr1.out index 22ef60a9..151ad3f3 100644 --- a/tests/general/results/deriv2nd/TwoArgumentExpr1.out +++ b/tests/general/results/deriv2nd/TwoArgumentExpr1.out @@ -115,18 +115,6 @@ Point 0 : {-10.000000, -10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 1 : {-10.000000, -5.000000} out_000 in_000 in_001 in_000 0 0 @@ -244,18 +232,6 @@ Point 1 : {-10.000000, -5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 2 : {-10.000000, 0.000000} out_000 in_000 in_001 in_000 0 0 @@ -373,18 +349,6 @@ Point 2 : {-10.000000, 0.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 3 : {-10.000000, 5.000000} out_000 in_000 in_001 in_000 0 0 @@ -502,18 +466,6 @@ Point 3 : {-10.000000, 5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 4 : {-10.000000, 10.000000} out_000 in_000 in_001 in_000 0 0 @@ -631,18 +583,6 @@ Point 4 : {-10.000000, 10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 5 : {-5.000000, -10.000000} out_000 in_000 in_001 in_000 0 0 @@ -760,18 +700,6 @@ Point 5 : {-5.000000, -10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 6 : {-5.000000, -5.000000} out_000 in_000 in_001 in_000 0 0 @@ -889,18 +817,6 @@ Point 6 : {-5.000000, -5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 7 : {-5.000000, 0.000000} out_000 in_000 in_001 in_000 0 0 @@ -1018,18 +934,6 @@ Point 7 : {-5.000000, 0.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 8 : {-5.000000, 5.000000} out_000 in_000 in_001 in_000 0 0 @@ -1147,18 +1051,6 @@ Point 8 : {-5.000000, 5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 9 : {-5.000000, 10.000000} out_000 in_000 in_001 in_000 0 0 @@ -1276,18 +1168,6 @@ Point 9 : {-5.000000, 10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 10 : {0.000000, -10.000000} out_000 in_000 in_001 in_000 0 0 @@ -1405,18 +1285,6 @@ Point 10 : {0.000000, -10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 11 : {0.000000, -5.000000} out_000 in_000 in_001 in_000 0 0 @@ -1534,18 +1402,6 @@ Point 11 : {0.000000, -5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 12 : {0.000000, 0.000000} out_000 in_000 in_001 in_000 0 0 @@ -1663,18 +1519,6 @@ Point 12 : {0.000000, 0.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 13 : {0.000000, 5.000000} out_000 in_000 in_001 in_000 0 0 @@ -1792,18 +1636,6 @@ Point 13 : {0.000000, 5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 14 : {0.000000, 10.000000} out_000 in_000 in_001 in_000 0 0 @@ -1921,18 +1753,6 @@ Point 14 : {0.000000, 10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 15 : {5.000000, -10.000000} out_000 in_000 in_001 in_000 0 0 @@ -2050,18 +1870,6 @@ Point 15 : {5.000000, -10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 16 : {5.000000, -5.000000} out_000 in_000 in_001 in_000 0 0 @@ -2179,18 +1987,6 @@ Point 16 : {5.000000, -5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 17 : {5.000000, 0.000000} out_000 in_000 in_001 in_000 0 0 @@ -2308,18 +2104,6 @@ Point 17 : {5.000000, 0.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 18 : {5.000000, 5.000000} out_000 in_000 in_001 in_000 0 0 @@ -2437,18 +2221,6 @@ Point 18 : {5.000000, 5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 19 : {5.000000, 10.000000} out_000 in_000 in_001 in_000 0 0 @@ -2566,18 +2338,6 @@ Point 19 : {5.000000, 10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 20 : {10.000000, -10.000000} out_000 in_000 in_001 in_000 0 0 @@ -2695,18 +2455,6 @@ Point 20 : {10.000000, -10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 21 : {10.000000, -5.000000} out_000 in_000 in_001 in_000 0 0 @@ -2824,18 +2572,6 @@ Point 21 : {10.000000, -5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 22 : {10.000000, 0.000000} out_000 in_000 in_001 in_000 0 0 @@ -2953,18 +2689,6 @@ Point 22 : {10.000000, 0.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 23 : {10.000000, 5.000000} out_000 in_000 in_001 in_000 0 0 @@ -3082,18 +2806,6 @@ Point 23 : {10.000000, 5.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 24 : {10.000000, 10.000000} out_000 in_000 in_001 in_000 0 0 @@ -3211,14 +2923,3 @@ Point 24 : {10.000000, 10.000000} in_000 0 0 in_001 0 0 - out_029 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_030 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_031 in_000 in_001 - in_000 0 0 - in_001 0 0 diff --git a/tests/general/results/deriv2nd/TwoArgumentExpr2.out b/tests/general/results/deriv2nd/TwoArgumentExpr2.out index d99394e1..f6baa31a 100644 --- a/tests/general/results/deriv2nd/TwoArgumentExpr2.out +++ b/tests/general/results/deriv2nd/TwoArgumentExpr2.out @@ -59,18 +59,6 @@ Point 0 : {-10.000000, -10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 1 : {-10.000000, -5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -132,18 +120,6 @@ Point 1 : {-10.000000, -5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 2 : {-10.000000, 5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -205,18 +181,6 @@ Point 2 : {-10.000000, 5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 3 : {-10.000000, 10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -278,18 +242,6 @@ Point 3 : {-10.000000, 10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 4 : {-5.000000, -10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -351,18 +303,6 @@ Point 4 : {-5.000000, -10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 5 : {-5.000000, -5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -424,18 +364,6 @@ Point 5 : {-5.000000, -5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 6 : {-5.000000, 5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -497,18 +425,6 @@ Point 6 : {-5.000000, 5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 7 : {-5.000000, 10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -570,18 +486,6 @@ Point 7 : {-5.000000, 10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 8 : {0.000000, 5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -643,18 +547,6 @@ Point 8 : {0.000000, 5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 9 : {0.000000, 10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -716,18 +608,6 @@ Point 9 : {0.000000, 10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 10 : {5.000000, -10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -789,18 +669,6 @@ Point 10 : {5.000000, -10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 11 : {5.000000, -5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -862,18 +730,6 @@ Point 11 : {5.000000, -5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 12 : {5.000000, 5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -935,18 +791,6 @@ Point 12 : {5.000000, 5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 13 : {5.000000, 10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -1008,18 +852,6 @@ Point 13 : {5.000000, 10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 14 : {10.000000, -10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -1081,18 +913,6 @@ Point 14 : {10.000000, -10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 15 : {10.000000, -5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -1154,18 +974,6 @@ Point 15 : {10.000000, -5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 16 : {10.000000, 5.000000} out_000 in_000 in_001 in_000 0 -0.04 @@ -1227,18 +1035,6 @@ Point 16 : {10.000000, 5.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 - Point 17 : {10.000000, 10.000000} out_000 in_000 in_001 in_000 0 -0.01 @@ -1300,15 +1096,3 @@ Point 17 : {10.000000, 10.000000} in_000 0 0 in_001 0 0 - out_015 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_016 in_000 in_001 - in_000 0 0 - in_001 0 0 - - out_017 in_000 in_001 - in_000 0 0 - in_001 0 0 -