From ae49b12780ad88eb28de186c62db99eac96ccde3 Mon Sep 17 00:00:00 2001 From: octoflar Date: Thu, 20 Jun 2024 23:01:38 +0200 Subject: [PATCH] Update: integrator tests --- src/test/cxx/core/integrator_test.cxx | 51 +++++---------------------- 1 file changed, 8 insertions(+), 43 deletions(-) diff --git a/src/test/cxx/core/integrator_test.cxx b/src/test/cxx/core/integrator_test.cxx index e6a6904..38c6955 100644 --- a/src/test/cxx/core/integrator_test.cxx +++ b/src/test/cxx/core/integrator_test.cxx @@ -95,25 +95,11 @@ class Integrator_Test : public Unit_Test using especia::sq; using std::exp; - double result; - - result = q13.integrate_positive_infinite ( - [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }, 0.0); - // - assert_equals (0.642572, result, 0.5E-06, - "integrate absorption (positive-infinite, Q13-Q19)"); - - result = q19.integrate_positive_infinite ( - [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }, 0.0); - // - assert_equals (0.642572, result, 0.5E-06, - "integrate absorption (positive-infinite, Q19-Q27)"); - - result = q27.integrate_positive_infinite ( - [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }, 0.0); + const double result = integrator.integrate_positive_infinite ( + [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }); // assert_equals (0.642572, result, 0.5E-06, - "integrate absorption (positive-infinite, Q27-Q41)"); + "integrate absorption (positive-infinite)"); } void @@ -122,25 +108,11 @@ class Integrator_Test : public Unit_Test using especia::sq; using std::exp; - double result; - - result = q13.integrate_negative_infinite ( - [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }, 0.0); - // - assert_equals (0.642572, result, 0.5E-06, - "integrate absorption (negative-infinite, Q13-Q19)"); - - result = q19.integrate_negative_infinite ( - [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }, 0.0); - // - assert_equals (0.642572, result, 0.5E-06, - "integrate absorption (negative-infinite, Q19-Q27)"); - - result = q27.integrate_negative_infinite ( - [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }, 0.0); + const double result = integrator.integrate_negative_infinite ( + [] (double x) -> double { return 1.0 - exp (-exp (-sq (x))); }); // assert_equals (0.642572, result, 0.5E-06, - "integrate absorption (negative-infinite, Q27-Q41)"); + "integrate absorption (negative-infinite"); } void @@ -171,15 +143,8 @@ class Integrator_Test : public Unit_Test run (this, &Integrator_Test::test_integrate_absorption_infinite); } - /// The default integrator - const Integrator integrator; - - const Integrator q13 - = Integrator<> (Integrator<>::Formula::Q13, Integrator<>::Formula::Q19); - const Integrator q19 - = Integrator<> (Integrator<>::Formula::Q19, Integrator<>::Formula::Q27); - const Integrator q27 - = Integrator<> (Integrator<>::Formula::Q27, Integrator<>::Formula::Q41); + const Integrator integrator + = Integrator<> (Integrator<>::Formula::Q13, Integrator<>::Formula::Q41); }; int