rm Numeric::AreAlmostEqual

Fit/TestEngine/Numeric.cpp

@@ -22,14 +22,6 @@
 namespace Numeric
 {
 
-//! Returns true if two doubles agree within epsilon*tolerance.
-bool AreAlmostEqual(double a, double b, double tolerance)
-{
-    constexpr double eps = std::numeric_limits<double>::epsilon();
-    return std::abs(a - b)
-           <= eps * std::max(tolerance * eps, std::max(1., tolerance) * std::abs(b));
-}
-
 //! Returns the absolute value of the difference between a and b.
 double GetAbsoluteDifference(double a, double b)
 {

Fit/TestEngine/Numeric.h

@@ -22,8 +22,6 @@
 namespace Numeric
 {
 
-bool AreAlmostEqual(double a, double b, double tolerance_factor = 1.0);
-
 double GetAbsoluteDifference(double a, double b);
 
 double GetRelativeDifference(double a, double b);

Tests/UnitTests/Core/Detector/RectangularDetectorTest.cpp

 #include "Core/Detector/RectangularDetector.h"
 #include "Core/Basics/Units.h"
 #include "Core/Simulation/GISASSimulation.h"
-#include "Fit/TestEngine/Numeric.h"
+//#include "Fit/TestEngine/Numeric.h"
+#include "Core/Basics/Algorithms.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <iostream>
 #include <memory>
@@ -16,9 +17,9 @@ protected:
 
     bool isEqual(const kvector_t lhs, const kvector_t rhs)
     {
-        bool is_equal = Numeric::AreAlmostEqual(lhs.x(), rhs.x())
-                        && Numeric::AreAlmostEqual(lhs.y(), rhs.y())
-                        && Numeric::AreAlmostEqual(lhs.z(), rhs.z());
+        bool is_equal = algo::almostEqual(lhs.x(), rhs.x())
+                        && algo::almostEqual(lhs.y(), rhs.y())
+                        && algo::almostEqual(lhs.z(), rhs.z());
         if (!is_equal) {
             std::cout << "lhs:" << lhs << " rhs:" << rhs << " diff:" << (lhs - rhs) << std::endl;
         }

Tests/UnitTests/GUI/TestFormFactorItems.cpp

 #include "Core/Basics/Units.h"
 #include "Core/HardParticle/FormFactorAnisoPyramid.h"
-#include "Fit/TestEngine/Numeric.h"
+//#include "Fit/TestEngine/Numeric.h"
+#include "Core/Basics/Algorithms.h"
 #include "GUI/coregui/Models/FormFactorItems.h"
 #include "Tests/GTestWrapper/google_test.h"
 
@@ -22,5 +23,5 @@ TEST_F(TestFormFactorItems, test_AnisoPyramidItem)
     EXPECT_EQ(p_ff->getLength(), 20.0);
     EXPECT_EQ(p_ff->getWidth(), 16.0);
     EXPECT_EQ(p_ff->getHeight(), 13.0);
-    EXPECT_TRUE(Numeric::AreAlmostEqual(p_ff->getAlpha(), Units::deg2rad(60.0)));
+    EXPECT_TRUE(algo::almostEqual(p_ff->getAlpha(), Units::deg2rad(60.0)));
 }