From 924c1d358efe6373f09d224c3afbf14d89b37e98 Mon Sep 17 00:00:00 2001 From: Max Sagebaum Date: Fri, 9 Feb 2024 11:01:14 +0100 Subject: [PATCH] Added math funtions acosh, asinh, log1p and log2. --- .../codi/expressions/real/unaryOperators.hpp | 159 ++++++++++++++++ .../expressions/testOneArgumentExpr1.hpp | 3 +- .../expressions/testOneArgumentExpr2.hpp | 5 +- .../results/deriv0th/OneArgumentExpr1.out | 41 ++++ .../results/deriv0th/OneArgumentExpr2.out | 60 ++++++ .../results/deriv1st/OneArgumentExpr1.out | 41 ++++ .../results/deriv1st/OneArgumentExpr2.out | 60 ++++++ .../results/deriv2nd/OneArgumentExpr1.out | 124 ++++++++++++ .../results/deriv2nd/OneArgumentExpr2.out | 180 ++++++++++++++++++ 9 files changed, 671 insertions(+), 2 deletions(-) diff --git a/include/codi/expressions/real/unaryOperators.hpp b/include/codi/expressions/real/unaryOperators.hpp index c6b2cd72a..97f4b74e1 100644 --- a/include/codi/expressions/real/unaryOperators.hpp +++ b/include/codi/expressions/real/unaryOperators.hpp @@ -87,7 +87,9 @@ namespace codi { using std::abs; using std::acos; + using std::acosh; using std::asin; + using std::asinh; using std::atan; using std::atanh; using std::cbrt; @@ -105,6 +107,8 @@ namespace codi { using std::isnormal; using std::log; using std::log10; + using std::log1p; + using std::log2; using std::round; using std::sin; using std::sinh; @@ -190,6 +194,43 @@ namespace codi { #define OPERATION_LOGIC OperationAcos #define FUNCTION acosl +#include "unaryOverloads.tpp" + + /// UnaryOperation implementation for acosh + template + struct OperationAcosh : public UnaryOperation { + public: + + using Real = CODI_DD(T_Real, double); ///< See BinaryOperation. + + /// \copydoc UnaryOperation::primal + template + static CODI_INLINE Real primal(Arg const& arg) { + return acosh(arg); + } + + /// \copydoc UnaryOperation::gradient + template + static CODI_INLINE Real gradient(Arg const& arg, Real const& result) { + CODI_UNUSED(result); + if (Config::CheckExpressionArguments) { + if (RealTraits::getPassiveValue(arg) <= 1.0) { + CODI_EXCEPTION("acosh outside of (1, inf).(Value: %0.15e)", RealTraits::getPassiveValue(arg)); + } + } + return 1.0 / sqrt(arg * arg - 1.0); + } + }; +#define OPERATION_LOGIC OperationAcosh +#define FUNCTION acosh +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAcosh +#define FUNCTION acoshf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAcosh +#define FUNCTION acoshl #include "unaryOverloads.tpp" /// UnaryOperation implementation for asin @@ -227,6 +268,38 @@ namespace codi { #define OPERATION_LOGIC OperationAsin #define FUNCTION asinl +#include "unaryOverloads.tpp" + + /// UnaryOperation implementation for asinh + template + struct OperationAsinh : public UnaryOperation { + public: + + using Real = CODI_DD(T_Real, double); ///< See BinaryOperation. + + /// \copydoc UnaryOperation::primal + template + static CODI_INLINE Real primal(Arg const& arg) { + return asinh(arg); + } + + /// \copydoc UnaryOperation::gradient + template + static CODI_INLINE Real gradient(Arg const& arg, Real const& result) { + CODI_UNUSED(result); + return 1.0 / sqrt(arg * arg + 1.0); + } + }; +#define OPERATION_LOGIC OperationAsinh +#define FUNCTION asinh +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAsinh +#define FUNCTION asinhf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationAsinh +#define FUNCTION asinhl #include "unaryOverloads.tpp" /// UnaryOperation implementation for atan @@ -630,6 +703,80 @@ namespace codi { #define OPERATION_LOGIC OperationLog10 #define FUNCTION log10l +#include "unaryOverloads.tpp" + + /// UnaryOperation implementation for log1p + template + struct OperationLog1p : public UnaryOperation { + public: + + using Real = CODI_DD(T_Real, double); ///< See BinaryOperation. + + /// \copydoc UnaryOperation::primal + template + static CODI_INLINE Real primal(Arg const& arg) { + return log1p(arg); + } + + /// \copydoc UnaryOperation::gradient + template + static CODI_INLINE Real gradient(Arg const& arg, Real const& result) { + CODI_UNUSED(result); + if (Config::CheckExpressionArguments) { + if (0.0 > RealTraits::getPassiveValue(arg)) { + CODI_EXCEPTION("Logarithm of negative value or zero.(Value: %0.15e)", RealTraits::getPassiveValue(arg)); + } + } + return 1.0 / (arg + 1.0); + } + }; +#define OPERATION_LOGIC OperationLog1p +#define FUNCTION log1p +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog1p +#define FUNCTION log1pf +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog1p +#define FUNCTION log1pl +#include "unaryOverloads.tpp" + + /// UnaryOperation implementation for log2 + template + struct OperationLog2 : public UnaryOperation { + public: + + using Real = CODI_DD(T_Real, double); ///< See BinaryOperation. + + /// \copydoc UnaryOperation::primal + template + static CODI_INLINE Real primal(Arg const& arg) { + return log2(arg); + } + + /// \copydoc UnaryOperation::gradient + template + static CODI_INLINE Real gradient(Arg const& arg, Real const& result) { + CODI_UNUSED(result); + if (Config::CheckExpressionArguments) { + if (0.0 > RealTraits::getPassiveValue(arg)) { + CODI_EXCEPTION("Logarithm of negative value or zero.(Value: %0.15e)", RealTraits::getPassiveValue(arg)); + } + } + return 1.442695040888963 / arg; + } + }; +#define OPERATION_LOGIC OperationLog2 +#define FUNCTION log2 +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog2 +#define FUNCTION log2f +#include "unaryOverloads.tpp" + +#define OPERATION_LOGIC OperationLog2 +#define FUNCTION log2l #include "unaryOverloads.tpp" /// Function overload for round @@ -912,9 +1059,15 @@ namespace std { using codi::abs; using codi::acos; using codi::acosf; + using codi::acosh; + using codi::acoshf; + using codi::acoshl; using codi::acosl; using codi::asin; using codi::asinf; + using codi::asinh; + using codi::asinhf; + using codi::asinhl; using codi::asinl; using codi::atan; using codi::atanf; @@ -957,6 +1110,12 @@ namespace std { using codi::log10; using codi::log10f; using codi::log10l; + using codi::log1p; + using codi::log1pf; + using codi::log1pl; + using codi::log2; + using codi::log2f; + using codi::log2l; using codi::logf; using codi::logl; using codi::round; diff --git a/tests/general/include/tests/expressions/testOneArgumentExpr1.hpp b/tests/general/include/tests/expressions/testOneArgumentExpr1.hpp index d28d9a1ae..72b4ea287 100644 --- a/tests/general/include/tests/expressions/testOneArgumentExpr1.hpp +++ b/tests/general/include/tests/expressions/testOneArgumentExpr1.hpp @@ -38,7 +38,7 @@ struct TestOneArgumentExpr1 : public TestInterface { public: NAME("OneArgumentExpr1") IN(1) - OUT(20) + OUT(21) POINTS(41) = // clang-format off { {-10.0000}, @@ -107,5 +107,6 @@ struct TestOneArgumentExpr1 : public TestInterface { y[18] = ldexp(x[0], 7); // R int temp = 0; y[19] = frexp(x[0], &temp); // R + y[20] = asinh(x[0]); // R } }; diff --git a/tests/general/include/tests/expressions/testOneArgumentExpr2.hpp b/tests/general/include/tests/expressions/testOneArgumentExpr2.hpp index 83303446f..e774afc45 100644 --- a/tests/general/include/tests/expressions/testOneArgumentExpr2.hpp +++ b/tests/general/include/tests/expressions/testOneArgumentExpr2.hpp @@ -38,7 +38,7 @@ struct TestOneArgumentExpr2 : public TestInterface { public: NAME("OneArgumentExpr2") IN(1) - OUT(4) + OUT(7) POINTS(20) = // clang-format off { { 0.5000}, @@ -69,5 +69,8 @@ struct TestOneArgumentExpr2 : public TestInterface { y[1] = log10(x[0]); // (0, inf) y[2] = sqrt(x[0]); // [0, inf) y[3] = tgamma(x[0]); // R currently only defined for positive arguments + y[4] = acosh(x[0]); // (1, inf) + y[5] = log1p(x[0]); // (0, inf) + y[6] = log2(x[0]); // (0, inf) } }; diff --git a/tests/general/results/deriv0th/OneArgumentExpr1.out b/tests/general/results/deriv0th/OneArgumentExpr1.out index f913c2962..e28d53759 100644 --- a/tests/general/results/deriv0th/OneArgumentExpr1.out +++ b/tests/general/results/deriv0th/OneArgumentExpr1.out @@ -19,6 +19,7 @@ Point 0 : {-10.000000} out_017 -10 out_018 -1280 out_019 -0.625 + out_020 -2.99822 Point 1 : {-9.500000} out_000 -9.5 out_001 9.5 @@ -40,6 +41,7 @@ Point 1 : {-9.500000} out_017 -9 out_018 -1216 out_019 -0.59375 + out_020 -2.9472 Point 2 : {-9.000000} out_000 -9 out_001 9 @@ -61,6 +63,7 @@ Point 2 : {-9.000000} out_017 -9 out_018 -1152 out_019 -0.5625 + out_020 -2.89344 Point 3 : {-8.500000} out_000 -8.5 out_001 8.5 @@ -82,6 +85,7 @@ Point 3 : {-8.500000} out_017 -8 out_018 -1088 out_019 -0.53125 + out_020 -2.83666 Point 4 : {-8.000000} out_000 -8 out_001 8 @@ -103,6 +107,7 @@ Point 4 : {-8.000000} out_017 -8 out_018 -1024 out_019 -0.5 + out_020 -2.77647 Point 5 : {-7.500000} out_000 -7.5 out_001 7.5 @@ -124,6 +129,7 @@ Point 5 : {-7.500000} out_017 -7 out_018 -960 out_019 -0.9375 + out_020 -2.71247 Point 6 : {-7.000000} out_000 -7 out_001 7 @@ -145,6 +151,7 @@ Point 6 : {-7.000000} out_017 -7 out_018 -896 out_019 -0.875 + out_020 -2.64412 Point 7 : {-6.500000} out_000 -6.5 out_001 6.5 @@ -166,6 +173,7 @@ Point 7 : {-6.500000} out_017 -6 out_018 -832 out_019 -0.8125 + out_020 -2.57081 Point 8 : {-6.000000} out_000 -6 out_001 6 @@ -187,6 +195,7 @@ Point 8 : {-6.000000} out_017 -6 out_018 -768 out_019 -0.75 + out_020 -2.49178 Point 9 : {-5.500000} out_000 -5.5 out_001 5.5 @@ -208,6 +217,7 @@ Point 9 : {-5.500000} out_017 -5 out_018 -704 out_019 -0.6875 + out_020 -2.40606 Point 10 : {-5.000000} out_000 -5 out_001 5 @@ -229,6 +239,7 @@ Point 10 : {-5.000000} out_017 -5 out_018 -640 out_019 -0.625 + out_020 -2.31244 Point 11 : {-4.500000} out_000 -4.5 out_001 4.5 @@ -250,6 +261,7 @@ Point 11 : {-4.500000} out_017 -4 out_018 -576 out_019 -0.5625 + out_020 -2.20935 Point 12 : {-4.000000} out_000 -4 out_001 4 @@ -271,6 +283,7 @@ Point 12 : {-4.000000} out_017 -4 out_018 -512 out_019 -0.5 + out_020 -2.09471 Point 13 : {-3.500000} out_000 -3.5 out_001 3.5 @@ -292,6 +305,7 @@ Point 13 : {-3.500000} out_017 -3 out_018 -448 out_019 -0.875 + out_020 -1.96572 Point 14 : {-3.000000} out_000 -3 out_001 3 @@ -313,6 +327,7 @@ Point 14 : {-3.000000} out_017 -3 out_018 -384 out_019 -0.75 + out_020 -1.81845 Point 15 : {-2.500000} out_000 -2.5 out_001 2.5 @@ -334,6 +349,7 @@ Point 15 : {-2.500000} out_017 -2 out_018 -320 out_019 -0.625 + out_020 -1.64723 Point 16 : {-2.000000} out_000 -2 out_001 2 @@ -355,6 +371,7 @@ Point 16 : {-2.000000} out_017 -2 out_018 -256 out_019 -0.5 + out_020 -1.44364 Point 17 : {-1.500000} out_000 -1.5 out_001 1.5 @@ -376,6 +393,7 @@ Point 17 : {-1.500000} out_017 -1 out_018 -192 out_019 -0.75 + out_020 -1.19476 Point 18 : {-1.000000} out_000 -1 out_001 1 @@ -397,6 +415,7 @@ Point 18 : {-1.000000} out_017 -1 out_018 -128 out_019 -0.5 + out_020 -0.881374 Point 19 : {-0.500000} out_000 -0.5 out_001 0.5 @@ -418,6 +437,7 @@ Point 19 : {-0.500000} out_017 -0 out_018 -64 out_019 -0.5 + out_020 -0.481212 Point 20 : {0.000000} out_000 0 out_001 -0 @@ -439,6 +459,7 @@ Point 20 : {0.000000} out_017 0 out_018 0 out_019 0 + out_020 0 Point 21 : {0.500000} out_000 0.5 out_001 -0.5 @@ -460,6 +481,7 @@ Point 21 : {0.500000} out_017 1 out_018 64 out_019 0.5 + out_020 0.481212 Point 22 : {1.000000} out_000 1 out_001 -1 @@ -481,6 +503,7 @@ Point 22 : {1.000000} out_017 1 out_018 128 out_019 0.5 + out_020 0.881374 Point 23 : {1.500000} out_000 1.5 out_001 -1.5 @@ -502,6 +525,7 @@ Point 23 : {1.500000} out_017 2 out_018 192 out_019 0.75 + out_020 1.19476 Point 24 : {2.000000} out_000 2 out_001 -2 @@ -523,6 +547,7 @@ Point 24 : {2.000000} out_017 2 out_018 256 out_019 0.5 + out_020 1.44364 Point 25 : {2.500000} out_000 2.5 out_001 -2.5 @@ -544,6 +569,7 @@ Point 25 : {2.500000} out_017 3 out_018 320 out_019 0.625 + out_020 1.64723 Point 26 : {3.000000} out_000 3 out_001 -3 @@ -565,6 +591,7 @@ Point 26 : {3.000000} out_017 3 out_018 384 out_019 0.75 + out_020 1.81845 Point 27 : {3.500000} out_000 3.5 out_001 -3.5 @@ -586,6 +613,7 @@ Point 27 : {3.500000} out_017 4 out_018 448 out_019 0.875 + out_020 1.96572 Point 28 : {4.000000} out_000 4 out_001 -4 @@ -607,6 +635,7 @@ Point 28 : {4.000000} out_017 4 out_018 512 out_019 0.5 + out_020 2.09471 Point 29 : {4.500000} out_000 4.5 out_001 -4.5 @@ -628,6 +657,7 @@ Point 29 : {4.500000} out_017 5 out_018 576 out_019 0.5625 + out_020 2.20935 Point 30 : {5.000000} out_000 5 out_001 -5 @@ -649,6 +679,7 @@ Point 30 : {5.000000} out_017 5 out_018 640 out_019 0.625 + out_020 2.31244 Point 31 : {5.500000} out_000 5.5 out_001 -5.5 @@ -670,6 +701,7 @@ Point 31 : {5.500000} out_017 6 out_018 704 out_019 0.6875 + out_020 2.40606 Point 32 : {6.000000} out_000 6 out_001 -6 @@ -691,6 +723,7 @@ Point 32 : {6.000000} out_017 6 out_018 768 out_019 0.75 + out_020 2.49178 Point 33 : {6.500000} out_000 6.5 out_001 -6.5 @@ -712,6 +745,7 @@ Point 33 : {6.500000} out_017 7 out_018 832 out_019 0.8125 + out_020 2.57081 Point 34 : {7.000000} out_000 7 out_001 -7 @@ -733,6 +767,7 @@ Point 34 : {7.000000} out_017 7 out_018 896 out_019 0.875 + out_020 2.64412 Point 35 : {7.500000} out_000 7.5 out_001 -7.5 @@ -754,6 +789,7 @@ Point 35 : {7.500000} out_017 8 out_018 960 out_019 0.9375 + out_020 2.71247 Point 36 : {8.000000} out_000 8 out_001 -8 @@ -775,6 +811,7 @@ Point 36 : {8.000000} out_017 8 out_018 1024 out_019 0.5 + out_020 2.77647 Point 37 : {8.500000} out_000 8.5 out_001 -8.5 @@ -796,6 +833,7 @@ Point 37 : {8.500000} out_017 9 out_018 1088 out_019 0.53125 + out_020 2.83666 Point 38 : {9.000000} out_000 9 out_001 -9 @@ -817,6 +855,7 @@ Point 38 : {9.000000} out_017 9 out_018 1152 out_019 0.5625 + out_020 2.89344 Point 39 : {9.500000} out_000 9.5 out_001 -9.5 @@ -838,6 +877,7 @@ Point 39 : {9.500000} out_017 10 out_018 1216 out_019 0.59375 + out_020 2.9472 Point 40 : {10.000000} out_000 10 out_001 -10 @@ -859,3 +899,4 @@ Point 40 : {10.000000} out_017 10 out_018 1280 out_019 0.625 + out_020 2.99822 diff --git a/tests/general/results/deriv0th/OneArgumentExpr2.out b/tests/general/results/deriv0th/OneArgumentExpr2.out index ef385bd39..40d8037a0 100644 --- a/tests/general/results/deriv0th/OneArgumentExpr2.out +++ b/tests/general/results/deriv0th/OneArgumentExpr2.out @@ -3,98 +3,158 @@ Point 0 : {0.500000} out_001 -0.30103 out_002 0.707107 out_003 1.77245 + out_004 -nan + out_005 0.405465 + out_006 -1 Point 1 : {1.000000} out_000 0 out_001 0 out_002 1 out_003 1 + out_004 0 + out_005 0.693147 + out_006 0 Point 2 : {1.500000} out_000 0.405465 out_001 0.176091 out_002 1.22474 out_003 0.886227 + out_004 0.962424 + out_005 0.916291 + out_006 0.584963 Point 3 : {2.000000} out_000 0.693147 out_001 0.30103 out_002 1.41421 out_003 1 + out_004 1.31696 + out_005 1.09861 + out_006 1 Point 4 : {2.500000} out_000 0.916291 out_001 0.39794 out_002 1.58114 out_003 1.32934 + out_004 1.5668 + out_005 1.25276 + out_006 1.32193 Point 5 : {3.000000} out_000 1.09861 out_001 0.477121 out_002 1.73205 out_003 2 + out_004 1.76275 + out_005 1.38629 + out_006 1.58496 Point 6 : {3.500000} out_000 1.25276 out_001 0.544068 out_002 1.87083 out_003 3.32335 + out_004 1.92485 + out_005 1.50408 + out_006 1.80735 Point 7 : {4.000000} out_000 1.38629 out_001 0.60206 out_002 2 out_003 6 + out_004 2.06344 + out_005 1.60944 + out_006 2 Point 8 : {4.500000} out_000 1.50408 out_001 0.653213 out_002 2.12132 out_003 11.6317 + out_004 2.18464 + out_005 1.70475 + out_006 2.16993 Point 9 : {5.000000} out_000 1.60944 out_001 0.69897 out_002 2.23607 out_003 24 + out_004 2.29243 + out_005 1.79176 + out_006 2.32193 Point 10 : {5.500000} out_000 1.70475 out_001 0.740363 out_002 2.34521 out_003 52.3428 + out_004 2.38953 + out_005 1.8718 + out_006 2.45943 Point 11 : {6.000000} out_000 1.79176 out_001 0.778151 out_002 2.44949 out_003 120 + out_004 2.47789 + out_005 1.94591 + out_006 2.58496 Point 12 : {6.500000} out_000 1.8718 out_001 0.812913 out_002 2.54951 out_003 287.885 + out_004 2.55898 + out_005 2.0149 + out_006 2.70044 Point 13 : {7.000000} out_000 1.94591 out_001 0.845098 out_002 2.64575 out_003 720 + out_004 2.63392 + out_005 2.07944 + out_006 2.80735 Point 14 : {7.500000} out_000 2.0149 out_001 0.875061 out_002 2.73861 out_003 1871.25 + out_004 2.70358 + out_005 2.14007 + out_006 2.90689 Point 15 : {8.000000} out_000 2.07944 out_001 0.90309 out_002 2.82843 out_003 5040 + out_004 2.76866 + out_005 2.19722 + out_006 3 Point 16 : {8.500000} out_000 2.14007 out_001 0.929419 out_002 2.91548 out_003 14034.4 + out_004 2.82974 + out_005 2.25129 + out_006 3.08746 Point 17 : {9.000000} out_000 2.19722 out_001 0.954243 out_002 3 out_003 40320 + out_004 2.88727 + out_005 2.30259 + out_006 3.16993 Point 18 : {9.500000} out_000 2.25129 out_001 0.977724 out_002 3.08221 out_003 119292 + out_004 2.94166 + out_005 2.35138 + out_006 3.24793 Point 19 : {10.000000} out_000 2.30259 out_001 1 out_002 3.16228 out_003 362880 + out_004 2.99322 + out_005 2.3979 + out_006 3.32193 diff --git a/tests/general/results/deriv1st/OneArgumentExpr1.out b/tests/general/results/deriv1st/OneArgumentExpr1.out index d47f331cb..01221c122 100644 --- a/tests/general/results/deriv1st/OneArgumentExpr1.out +++ b/tests/general/results/deriv1st/OneArgumentExpr1.out @@ -20,6 +20,7 @@ Point 0 : {-10.000000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.0995037 Point 1 : {-9.500000} in_000 out_000 1 @@ -42,6 +43,7 @@ Point 1 : {-9.500000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.104685 Point 2 : {-9.000000} in_000 out_000 1 @@ -64,6 +66,7 @@ Point 2 : {-9.000000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.110432 Point 3 : {-8.500000} in_000 out_000 1 @@ -86,6 +89,7 @@ Point 3 : {-8.500000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.116841 Point 4 : {-8.000000} in_000 out_000 1 @@ -108,6 +112,7 @@ Point 4 : {-8.000000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.124035 Point 5 : {-7.500000} in_000 out_000 1 @@ -130,6 +135,7 @@ Point 5 : {-7.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.132164 Point 6 : {-7.000000} in_000 out_000 1 @@ -152,6 +158,7 @@ Point 6 : {-7.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.141421 Point 7 : {-6.500000} in_000 out_000 1 @@ -174,6 +181,7 @@ Point 7 : {-6.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.152057 Point 8 : {-6.000000} in_000 out_000 1 @@ -196,6 +204,7 @@ Point 8 : {-6.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.164399 Point 9 : {-5.500000} in_000 out_000 1 @@ -218,6 +227,7 @@ Point 9 : {-5.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.178885 Point 10 : {-5.000000} in_000 out_000 1 @@ -240,6 +250,7 @@ Point 10 : {-5.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.196116 Point 11 : {-4.500000} in_000 out_000 1 @@ -262,6 +273,7 @@ Point 11 : {-4.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.21693 Point 12 : {-4.000000} in_000 out_000 1 @@ -284,6 +296,7 @@ Point 12 : {-4.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.242536 Point 13 : {-3.500000} in_000 out_000 1 @@ -306,6 +319,7 @@ Point 13 : {-3.500000} out_017 0 out_018 128 out_019 0.25 + out_020 0.274721 Point 14 : {-3.000000} in_000 out_000 1 @@ -328,6 +342,7 @@ Point 14 : {-3.000000} out_017 0 out_018 128 out_019 0.25 + out_020 0.316228 Point 15 : {-2.500000} in_000 out_000 1 @@ -350,6 +365,7 @@ Point 15 : {-2.500000} out_017 0 out_018 128 out_019 0.25 + out_020 0.371391 Point 16 : {-2.000000} in_000 out_000 1 @@ -372,6 +388,7 @@ Point 16 : {-2.000000} out_017 0 out_018 128 out_019 0.25 + out_020 0.447214 Point 17 : {-1.500000} in_000 out_000 1 @@ -394,6 +411,7 @@ Point 17 : {-1.500000} out_017 0 out_018 128 out_019 0.5 + out_020 0.5547 Point 18 : {-1.000000} in_000 out_000 1 @@ -416,6 +434,7 @@ Point 18 : {-1.000000} out_017 0 out_018 128 out_019 0.5 + out_020 0.707107 Point 19 : {-0.500000} in_000 out_000 1 @@ -438,6 +457,7 @@ Point 19 : {-0.500000} out_017 0 out_018 128 out_019 1 + out_020 0.894427 Point 20 : {0.000000} in_000 out_000 1 @@ -460,6 +480,7 @@ Point 20 : {0.000000} out_017 0 out_018 128 out_019 1 + out_020 1 Point 21 : {0.500000} in_000 out_000 1 @@ -482,6 +503,7 @@ Point 21 : {0.500000} out_017 0 out_018 128 out_019 1 + out_020 0.894427 Point 22 : {1.000000} in_000 out_000 1 @@ -504,6 +526,7 @@ Point 22 : {1.000000} out_017 0 out_018 128 out_019 0.5 + out_020 0.707107 Point 23 : {1.500000} in_000 out_000 1 @@ -526,6 +549,7 @@ Point 23 : {1.500000} out_017 0 out_018 128 out_019 0.5 + out_020 0.5547 Point 24 : {2.000000} in_000 out_000 1 @@ -548,6 +572,7 @@ Point 24 : {2.000000} out_017 0 out_018 128 out_019 0.25 + out_020 0.447214 Point 25 : {2.500000} in_000 out_000 1 @@ -570,6 +595,7 @@ Point 25 : {2.500000} out_017 0 out_018 128 out_019 0.25 + out_020 0.371391 Point 26 : {3.000000} in_000 out_000 1 @@ -592,6 +618,7 @@ Point 26 : {3.000000} out_017 0 out_018 128 out_019 0.25 + out_020 0.316228 Point 27 : {3.500000} in_000 out_000 1 @@ -614,6 +641,7 @@ Point 27 : {3.500000} out_017 0 out_018 128 out_019 0.25 + out_020 0.274721 Point 28 : {4.000000} in_000 out_000 1 @@ -636,6 +664,7 @@ Point 28 : {4.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.242536 Point 29 : {4.500000} in_000 out_000 1 @@ -658,6 +687,7 @@ Point 29 : {4.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.21693 Point 30 : {5.000000} in_000 out_000 1 @@ -680,6 +710,7 @@ Point 30 : {5.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.196116 Point 31 : {5.500000} in_000 out_000 1 @@ -702,6 +733,7 @@ Point 31 : {5.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.178885 Point 32 : {6.000000} in_000 out_000 1 @@ -724,6 +756,7 @@ Point 32 : {6.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.164399 Point 33 : {6.500000} in_000 out_000 1 @@ -746,6 +779,7 @@ Point 33 : {6.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.152057 Point 34 : {7.000000} in_000 out_000 1 @@ -768,6 +802,7 @@ Point 34 : {7.000000} out_017 0 out_018 128 out_019 0.125 + out_020 0.141421 Point 35 : {7.500000} in_000 out_000 1 @@ -790,6 +825,7 @@ Point 35 : {7.500000} out_017 0 out_018 128 out_019 0.125 + out_020 0.132164 Point 36 : {8.000000} in_000 out_000 1 @@ -812,6 +848,7 @@ Point 36 : {8.000000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.124035 Point 37 : {8.500000} in_000 out_000 1 @@ -834,6 +871,7 @@ Point 37 : {8.500000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.116841 Point 38 : {9.000000} in_000 out_000 1 @@ -856,6 +894,7 @@ Point 38 : {9.000000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.110432 Point 39 : {9.500000} in_000 out_000 1 @@ -878,6 +917,7 @@ Point 39 : {9.500000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.104685 Point 40 : {10.000000} in_000 out_000 1 @@ -900,3 +940,4 @@ Point 40 : {10.000000} out_017 0 out_018 128 out_019 0.0625 + out_020 0.0995037 diff --git a/tests/general/results/deriv1st/OneArgumentExpr2.out b/tests/general/results/deriv1st/OneArgumentExpr2.out index 5427bb85e..f9359aa11 100644 --- a/tests/general/results/deriv1st/OneArgumentExpr2.out +++ b/tests/general/results/deriv1st/OneArgumentExpr2.out @@ -4,117 +4,177 @@ Point 0 : {0.500000} out_001 0.868589 out_002 0.707107 out_003 -3.48023 + out_004 0 + out_005 0.666667 + out_006 2.88539 Point 1 : {1.000000} in_000 out_000 1 out_001 0.434294 out_002 0.5 out_003 -0.577216 + out_004 0 + out_005 0.5 + out_006 1.4427 Point 2 : {1.500000} in_000 out_000 0.666667 out_001 0.28953 out_002 0.408248 out_003 0.0323384 + out_004 0.894427 + out_005 0.4 + out_006 0.961797 Point 3 : {2.000000} in_000 out_000 0.5 out_001 0.217147 out_002 0.353553 out_003 0.422784 + out_004 0.57735 + out_005 0.333333 + out_006 0.721348 Point 4 : {2.500000} in_000 out_000 0.4 out_001 0.173718 out_002 0.316228 out_003 0.934735 + out_004 0.436436 + out_005 0.285714 + out_006 0.577078 Point 5 : {3.000000} in_000 out_000 0.333333 out_001 0.144765 out_002 0.288675 out_003 1.84557 + out_004 0.353553 + out_005 0.25 + out_006 0.480898 Point 6 : {3.500000} in_000 out_000 0.285714 out_001 0.124084 out_002 0.267261 out_003 3.66618 + out_004 0.298142 + out_005 0.222222 + out_006 0.412199 Point 7 : {4.000000} in_000 out_000 0.25 out_001 0.108574 out_002 0.25 out_003 7.53671 + out_004 0.258199 + out_005 0.2 + out_006 0.360674 Point 8 : {4.500000} in_000 out_000 0.222222 out_001 0.0965099 out_002 0.235702 out_003 16.155 + out_004 0.227921 + out_005 0.181818 + out_006 0.320599 Point 9 : {5.000000} in_000 out_000 0.2 out_001 0.0868589 out_002 0.223607 out_003 36.1468 + out_004 0.204124 + out_005 0.166667 + out_006 0.288539 Point 10 : {5.500000} in_000 out_000 0.181818 out_001 0.0789626 out_002 0.213201 out_003 84.3291 + out_004 0.1849 + out_005 0.153846 + out_006 0.262308 Point 11 : {6.000000} in_000 out_000 0.166667 out_001 0.0723824 out_002 0.204124 out_003 204.734 + out_004 0.169031 + out_005 0.142857 + out_006 0.240449 Point 12 : {6.500000} in_000 out_000 0.153846 out_001 0.0668145 out_002 0.196116 out_003 516.153 + out_004 0.1557 + out_005 0.133333 + out_006 0.221953 Point 13 : {7.000000} in_000 out_000 0.142857 out_001 0.0620421 out_002 0.188982 out_003 1348.4 + out_004 0.144338 + out_005 0.125 + out_006 0.206099 Point 14 : {7.500000} in_000 out_000 0.133333 out_001 0.0579059 out_002 0.182574 out_003 3642.88 + out_004 0.134535 + out_005 0.117647 + out_006 0.192359 Point 15 : {8.000000} in_000 out_000 0.125 out_001 0.0542868 out_002 0.176777 out_003 10158.8 + out_004 0.125988 + out_005 0.111111 + out_006 0.180337 Point 16 : {8.500000} in_000 out_000 0.117647 out_001 0.0510935 out_002 0.171499 out_003 29192.8 + out_004 0.11847 + out_005 0.105263 + out_006 0.169729 Point 17 : {9.000000} in_000 out_000 0.111111 out_001 0.0482549 out_002 0.166667 out_003 86310.7 + out_004 0.111803 + out_005 0.1 + out_006 0.160299 Point 18 : {9.500000} in_000 out_000 0.105263 out_001 0.0457152 out_002 0.162221 out_003 262174 + out_004 0.105851 + out_005 0.0952381 + out_006 0.151863 Point 19 : {10.000000} in_000 out_000 0.1 out_001 0.0434294 out_002 0.158114 out_003 817116 + out_004 0.100504 + out_005 0.0909091 + out_006 0.14427 diff --git a/tests/general/results/deriv2nd/OneArgumentExpr1.out b/tests/general/results/deriv2nd/OneArgumentExpr1.out index e89839ec0..7d507ec6b 100644 --- a/tests/general/results/deriv2nd/OneArgumentExpr1.out +++ b/tests/general/results/deriv2nd/OneArgumentExpr1.out @@ -59,6 +59,9 @@ Point 0 : {-10.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.00985185 + Point 1 : {-9.500000} out_000 in_000 in_000 0 @@ -120,6 +123,9 @@ Point 1 : {-9.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0108987 + Point 2 : {-9.000000} out_000 in_000 in_000 0 @@ -181,6 +187,9 @@ Point 2 : {-9.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0121205 + Point 3 : {-8.500000} out_000 in_000 in_000 0 @@ -242,6 +251,9 @@ Point 3 : {-8.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0135584 + Point 4 : {-8.000000} out_000 in_000 in_000 0 @@ -303,6 +315,9 @@ Point 4 : {-8.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0152658 + Point 5 : {-7.500000} out_000 in_000 in_000 0 @@ -364,6 +379,9 @@ Point 5 : {-7.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.017314 + Point 6 : {-7.000000} out_000 in_000 in_000 0 @@ -425,6 +443,9 @@ Point 6 : {-7.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.019799 + Point 7 : {-6.500000} out_000 in_000 in_000 0 @@ -486,6 +507,9 @@ Point 7 : {-6.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0228525 + Point 8 : {-6.000000} out_000 in_000 in_000 0 @@ -547,6 +571,9 @@ Point 8 : {-6.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0266593 + Point 9 : {-5.500000} out_000 in_000 in_000 0 @@ -608,6 +635,9 @@ Point 9 : {-5.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0314838 + Point 10 : {-5.000000} out_000 in_000 in_000 0 @@ -669,6 +699,9 @@ Point 10 : {-5.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0377146 + Point 11 : {-4.500000} out_000 in_000 in_000 0 @@ -730,6 +763,9 @@ Point 11 : {-4.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0459382 + Point 12 : {-4.000000} out_000 in_000 in_000 0 @@ -791,6 +827,9 @@ Point 12 : {-4.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0570672 + Point 13 : {-3.500000} out_000 in_000 in_000 0 @@ -852,6 +891,9 @@ Point 13 : {-3.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0725678 + Point 14 : {-3.000000} out_000 in_000 in_000 0 @@ -913,6 +955,9 @@ Point 14 : {-3.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.0948683 + Point 15 : {-2.500000} out_000 in_000 in_000 0 @@ -974,6 +1019,9 @@ Point 15 : {-2.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.128066 + Point 16 : {-2.000000} out_000 in_000 in_000 0 @@ -1035,6 +1083,9 @@ Point 16 : {-2.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.178885 + Point 17 : {-1.500000} out_000 in_000 in_000 0 @@ -1096,6 +1147,9 @@ Point 17 : {-1.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.256015 + Point 18 : {-1.000000} out_000 in_000 in_000 0 @@ -1157,6 +1211,9 @@ Point 18 : {-1.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.353553 + Point 19 : {-0.500000} out_000 in_000 in_000 0 @@ -1218,6 +1275,9 @@ Point 19 : {-0.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0.357771 + Point 20 : {0.000000} out_000 in_000 in_000 0 @@ -1279,6 +1339,9 @@ Point 20 : {0.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 0 + Point 21 : {0.500000} out_000 in_000 in_000 0 @@ -1340,6 +1403,9 @@ Point 21 : {0.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.357771 + Point 22 : {1.000000} out_000 in_000 in_000 0 @@ -1401,6 +1467,9 @@ Point 22 : {1.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.353553 + Point 23 : {1.500000} out_000 in_000 in_000 0 @@ -1462,6 +1531,9 @@ Point 23 : {1.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.256015 + Point 24 : {2.000000} out_000 in_000 in_000 0 @@ -1523,6 +1595,9 @@ Point 24 : {2.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.178885 + Point 25 : {2.500000} out_000 in_000 in_000 0 @@ -1584,6 +1659,9 @@ Point 25 : {2.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.128066 + Point 26 : {3.000000} out_000 in_000 in_000 0 @@ -1645,6 +1723,9 @@ Point 26 : {3.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0948683 + Point 27 : {3.500000} out_000 in_000 in_000 0 @@ -1706,6 +1787,9 @@ Point 27 : {3.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0725678 + Point 28 : {4.000000} out_000 in_000 in_000 0 @@ -1767,6 +1851,9 @@ Point 28 : {4.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0570672 + Point 29 : {4.500000} out_000 in_000 in_000 0 @@ -1828,6 +1915,9 @@ Point 29 : {4.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0459382 + Point 30 : {5.000000} out_000 in_000 in_000 0 @@ -1889,6 +1979,9 @@ Point 30 : {5.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0377146 + Point 31 : {5.500000} out_000 in_000 in_000 0 @@ -1950,6 +2043,9 @@ Point 31 : {5.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0314838 + Point 32 : {6.000000} out_000 in_000 in_000 0 @@ -2011,6 +2107,9 @@ Point 32 : {6.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0266593 + Point 33 : {6.500000} out_000 in_000 in_000 0 @@ -2072,6 +2171,9 @@ Point 33 : {6.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0228525 + Point 34 : {7.000000} out_000 in_000 in_000 0 @@ -2133,6 +2235,9 @@ Point 34 : {7.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.019799 + Point 35 : {7.500000} out_000 in_000 in_000 0 @@ -2194,6 +2299,9 @@ Point 35 : {7.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.017314 + Point 36 : {8.000000} out_000 in_000 in_000 0 @@ -2255,6 +2363,9 @@ Point 36 : {8.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0152658 + Point 37 : {8.500000} out_000 in_000 in_000 0 @@ -2316,6 +2427,9 @@ Point 37 : {8.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0135584 + Point 38 : {9.000000} out_000 in_000 in_000 0 @@ -2377,6 +2491,9 @@ Point 38 : {9.000000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0121205 + Point 39 : {9.500000} out_000 in_000 in_000 0 @@ -2438,6 +2555,9 @@ Point 39 : {9.500000} out_019 in_000 in_000 0 + out_020 in_000 + in_000 -0.0108987 + Point 40 : {10.000000} out_000 in_000 in_000 0 @@ -2498,3 +2618,7 @@ Point 40 : {10.000000} out_019 in_000 in_000 0 + + out_020 in_000 + in_000 -0.00985185 + diff --git a/tests/general/results/deriv2nd/OneArgumentExpr2.out b/tests/general/results/deriv2nd/OneArgumentExpr2.out index 4076a681f..90f9ba3ce 100644 --- a/tests/general/results/deriv2nd/OneArgumentExpr2.out +++ b/tests/general/results/deriv2nd/OneArgumentExpr2.out @@ -11,6 +11,15 @@ Point 0 : {0.500000} out_003 in_000 in_000 15.5802 + out_004 in_000 + in_000 0 + + out_005 in_000 + in_000 -0.444444 + + out_006 in_000 + in_000 -5.77078 + Point 1 : {1.000000} out_000 in_000 in_000 -1 @@ -24,6 +33,15 @@ Point 1 : {1.000000} out_003 in_000 in_000 1.97811 + out_004 in_000 + in_000 0 + + out_005 in_000 + in_000 -0.25 + + out_006 in_000 + in_000 -1.4427 + Point 2 : {1.500000} out_000 in_000 in_000 -0.444444 @@ -37,6 +55,15 @@ Point 2 : {1.500000} out_003 in_000 in_000 0.829627 + out_004 in_000 + in_000 -1.07331 + + out_005 in_000 + in_000 -0.16 + + out_006 in_000 + in_000 -0.641198 + Point 3 : {2.000000} out_000 in_000 in_000 -0.25 @@ -50,6 +77,15 @@ Point 3 : {2.000000} out_003 in_000 in_000 0.823681 + out_004 in_000 + in_000 -0.3849 + + out_005 in_000 + in_000 -0.111111 + + out_006 in_000 + in_000 -0.360674 + Point 4 : {2.500000} out_000 in_000 in_000 -0.16 @@ -63,6 +99,15 @@ Point 4 : {2.500000} out_003 in_000 in_000 1.30912 + out_004 in_000 + in_000 -0.207827 + + out_005 in_000 + in_000 -0.0816327 + + out_006 in_000 + in_000 -0.230831 + Point 5 : {3.000000} out_000 in_000 in_000 -0.111111 @@ -76,6 +121,15 @@ Point 5 : {3.000000} out_003 in_000 in_000 2.49293 + out_004 in_000 + in_000 -0.132583 + + out_005 in_000 + in_000 -0.0625 + + out_006 in_000 + in_000 -0.160299 + Point 6 : {3.500000} out_000 in_000 in_000 -0.0816327 @@ -89,6 +143,15 @@ Point 6 : {3.500000} out_003 in_000 in_000 5.14226 + out_004 in_000 + in_000 -0.0927554 + + out_005 in_000 + in_000 -0.0493827 + + out_006 in_000 + in_000 -0.117771 + Point 7 : {4.000000} out_000 in_000 in_000 -0.0625 @@ -102,6 +165,15 @@ Point 7 : {4.000000} out_003 in_000 in_000 11.1699 + out_004 in_000 + in_000 -0.068853 + + out_005 in_000 + in_000 -0.04 + + out_006 in_000 + in_000 -0.0901684 + Point 8 : {4.500000} out_000 in_000 in_000 -0.0493827 @@ -115,6 +187,15 @@ Point 8 : {4.500000} out_003 in_000 in_000 25.3303 + out_004 in_000 + in_000 -0.0532803 + + out_005 in_000 + in_000 -0.0330579 + + out_006 in_000 + in_000 -0.0712442 + Point 9 : {5.000000} out_000 in_000 in_000 -0.04 @@ -128,6 +209,15 @@ Point 9 : {5.000000} out_003 in_000 in_000 59.7531 + out_004 in_000 + in_000 -0.0425259 + + out_005 in_000 + in_000 -0.0277778 + + out_006 in_000 + in_000 -0.0577078 + Point 10 : {5.500000} out_000 in_000 in_000 -0.0330579 @@ -141,6 +231,15 @@ Point 10 : {5.500000} out_003 in_000 in_000 146.296 + out_004 in_000 + in_000 -0.0347675 + + out_005 in_000 + in_000 -0.0236686 + + out_006 in_000 + in_000 -0.0476924 + Point 11 : {6.000000} out_000 in_000 in_000 -0.0277778 @@ -154,6 +253,15 @@ Point 11 : {6.000000} out_003 in_000 in_000 371.059 + out_004 in_000 + in_000 -0.0289767 + + out_005 in_000 + in_000 -0.0204082 + + out_006 in_000 + in_000 -0.0400749 + Point 12 : {6.500000} out_000 in_000 in_000 -0.0236686 @@ -167,6 +275,15 @@ Point 12 : {6.500000} out_003 in_000 in_000 973.287 + out_004 in_000 + in_000 -0.0245345 + + out_005 in_000 + in_000 -0.0177778 + + out_006 in_000 + in_000 -0.0341466 + Point 13 : {7.000000} out_000 in_000 in_000 -0.0204082 @@ -180,6 +297,15 @@ Point 13 : {7.000000} out_003 in_000 in_000 2635.82 + out_004 in_000 + in_000 -0.0210492 + + out_005 in_000 + in_000 -0.015625 + + out_006 in_000 + in_000 -0.0294428 + Point 14 : {7.500000} out_000 in_000 in_000 -0.0177778 @@ -193,6 +319,15 @@ Point 14 : {7.500000} out_003 in_000 in_000 7358.67 + out_004 in_000 + in_000 -0.0182626 + + out_005 in_000 + in_000 -0.0138408 + + out_006 in_000 + in_000 -0.0256479 + Point 15 : {8.000000} out_000 in_000 in_000 -0.015625 @@ -206,6 +341,15 @@ Point 15 : {8.000000} out_003 in_000 in_000 21147.6 + out_004 in_000 + in_000 -0.0159985 + + out_005 in_000 + in_000 -0.0123457 + + out_006 in_000 + in_000 -0.0225421 + Point 16 : {8.500000} out_000 in_000 in_000 -0.0138408 @@ -219,6 +363,15 @@ Point 16 : {8.500000} out_003 in_000 in_000 62475.8 + out_004 in_000 + in_000 -0.0141332 + + out_005 in_000 + in_000 -0.0110803 + + out_006 in_000 + in_000 -0.0199681 + Point 17 : {9.000000} out_000 in_000 in_000 -0.0123457 @@ -232,6 +385,15 @@ Point 17 : {9.000000} out_003 in_000 in_000 189498 + out_004 in_000 + in_000 -0.0125779 + + out_005 in_000 + in_000 -0.01 + + out_006 in_000 + in_000 -0.017811 + Point 18 : {9.500000} out_000 in_000 in_000 -0.0110803 @@ -245,6 +407,15 @@ Point 18 : {9.500000} out_003 in_000 in_000 589430 + out_004 in_000 + in_000 -0.0112671 + + out_005 in_000 + in_000 -0.00907029 + + out_006 in_000 + in_000 -0.0159855 + Point 19 : {10.000000} out_000 in_000 in_000 -0.01 @@ -258,3 +429,12 @@ Point 19 : {10.000000} out_003 in_000 in_000 1.87811e+06 + out_004 in_000 + in_000 -0.0101519 + + out_005 in_000 + in_000 -0.00826446 + + out_006 in_000 + in_000 -0.014427 +