Mercurial > hg > orthanc-stone

changeset 1650:af312e145980

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more tests for CoordinateSystem3D
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 13 Nov 2020 10:44:11 +0100
parents d77618883551
children 00674f3695f2
files OrthancStone/Sources/Toolbox/CoordinateSystem3D.cpp OrthancStone/Sources/Toolbox/CoordinateSystem3D.h UnitTestsSources/UnitTestsMain.cpp
diffstat 3 files changed, 74 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/CoordinateSystem3D.cpp	Thu Nov 12 20:56:04 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/CoordinateSystem3D.cpp	Fri Nov 13 10:44:11 2020 +0100
@@ -29,8 +29,6 @@
 #include <Toolbox.h>
 #include <OrthancException.h>
 
-#include <boost/math/constants/constants.hpp>
-
 namespace OrthancStone
 {
   void CoordinateSystem3D::CheckAndComputeNormal()
@@ -356,4 +354,22 @@
 
     return CoordinateSystem3D(origin, axisX, axisY);
   }
+
+
+  CoordinateSystem3D CoordinateSystem3D::CreateFromThreePoints(const Vector& a,
+                                                               const Vector& b,
+                                                               const Vector& c)
+  {
+    Vector axisX = b - a;
+    LinearAlgebra::NormalizeVector(axisX);
+    
+    Vector normal;
+    LinearAlgebra::CrossProduct(normal, axisX, c - a);
+
+    Vector axisY;
+    LinearAlgebra::CrossProduct(axisY, axisX, normal);
+    LinearAlgebra::NormalizeVector(axisY);
+
+    return CoordinateSystem3D(a, axisX, axisY);
+  }
 }
--- a/OrthancStone/Sources/Toolbox/CoordinateSystem3D.h	Thu Nov 12 20:56:04 2020 +0100
+++ b/OrthancStone/Sources/Toolbox/CoordinateSystem3D.h	Fri Nov 13 10:44:11 2020 +0100
@@ -155,5 +155,9 @@
                                                          double b,
                                                          double c,
                                                          double d);
+
+    static CoordinateSystem3D CreateFromThreePoints(const Vector& a,
+                                                    const Vector& b,
+                                                    const Vector& c);
   };
 }
--- a/UnitTestsSources/UnitTestsMain.cpp	Thu Nov 12 20:56:04 2020 +0100
+++ b/UnitTestsSources/UnitTestsMain.cpp	Fri Nov 13 10:44:11 2020 +0100
@@ -43,24 +43,24 @@
   using namespace OrthancStone::GeometryToolbox;
   
   // https://en.wikipedia.org/wiki/Bilinear_interpolation#Application_in_image_processing
-  ASSERT_FLOAT_EQ(146.1f, ComputeBilinearInterpolationUnitSquare(0.5f, 0.2f, 91, 210, 162, 95));
+  ASSERT_DOUBLE_EQ(146.1f, ComputeBilinearInterpolationUnitSquare(0.5f, 0.2f, 91, 210, 162, 95));
 
-  ASSERT_FLOAT_EQ(91,  ComputeBilinearInterpolationUnitSquare(0, 0, 91, 210, 162, 95));
-  ASSERT_FLOAT_EQ(210, ComputeBilinearInterpolationUnitSquare(1, 0, 91, 210, 162, 95));
-  ASSERT_FLOAT_EQ(162, ComputeBilinearInterpolationUnitSquare(0, 1, 91, 210, 162, 95));
-  ASSERT_FLOAT_EQ(95,  ComputeBilinearInterpolationUnitSquare(1, 1, 91, 210, 162, 95));
+  ASSERT_DOUBLE_EQ(91,  ComputeBilinearInterpolationUnitSquare(0, 0, 91, 210, 162, 95));
+  ASSERT_DOUBLE_EQ(210, ComputeBilinearInterpolationUnitSquare(1, 0, 91, 210, 162, 95));
+  ASSERT_DOUBLE_EQ(162, ComputeBilinearInterpolationUnitSquare(0, 1, 91, 210, 162, 95));
+  ASSERT_DOUBLE_EQ(95,  ComputeBilinearInterpolationUnitSquare(1, 1, 91, 210, 162, 95));
 
-  ASSERT_FLOAT_EQ(123.35f, ComputeTrilinearInterpolationUnitSquare
+  ASSERT_DOUBLE_EQ(123.35f, ComputeTrilinearInterpolationUnitSquare
                   (0.5f, 0.2f, 0.7f,
                    91, 210, 162, 95,
                    51, 190, 80, 92));
 
-  ASSERT_FLOAT_EQ(ComputeBilinearInterpolationUnitSquare(0.5f, 0.2f, 91, 210, 162, 95),
+  ASSERT_DOUBLE_EQ(ComputeBilinearInterpolationUnitSquare(0.5f, 0.2f, 91, 210, 162, 95),
                   ComputeTrilinearInterpolationUnitSquare(0.5f, 0.2f, 0,
                                                           91, 210, 162, 95,
                                                           51, 190, 80, 92));
 
-  ASSERT_FLOAT_EQ(ComputeBilinearInterpolationUnitSquare(0.5f, 0.2f, 51, 190, 80, 92),
+  ASSERT_DOUBLE_EQ(ComputeBilinearInterpolationUnitSquare(0.5f, 0.2f, 51, 190, 80, 92),
                   ComputeTrilinearInterpolationUnitSquare(0.5f, 0.2f, 1,
                                                           91, 210, 162, 95,
                                                           51, 190, 80, 92));
@@ -881,32 +881,61 @@
 
 TEST(CoordinateSystem3D, Basic)
 {
+  using namespace OrthancStone;
+  
   {
-    OrthancStone::CoordinateSystem3D c;
+    CoordinateSystem3D c;
     ASSERT_FALSE(c.IsValid());
-    ASSERT_FLOAT_EQ(c.GetNormal()[0], 0);
-    ASSERT_FLOAT_EQ(c.GetNormal()[1], 0);
-    ASSERT_FLOAT_EQ(c.GetNormal()[2], 1);
+    ASSERT_DOUBLE_EQ(c.GetNormal()[0], 0);
+    ASSERT_DOUBLE_EQ(c.GetNormal()[1], 0);
+    ASSERT_DOUBLE_EQ(c.GetNormal()[2], 1);
 
-    ASSERT_FLOAT_EQ(0, c.ComputeDistance(OrthancStone::LinearAlgebra::CreateVector(0, 0, 0)));
-    ASSERT_FLOAT_EQ(0, c.ComputeDistance(OrthancStone::LinearAlgebra::CreateVector(5, 0, 0)));
-    ASSERT_FLOAT_EQ(0, c.ComputeDistance(OrthancStone::LinearAlgebra::CreateVector(0, 5, 0)));
-    ASSERT_FLOAT_EQ(5, c.ComputeDistance(OrthancStone::LinearAlgebra::CreateVector(0, 0, 5)));
+    ASSERT_DOUBLE_EQ(0, c.ComputeDistance(LinearAlgebra::CreateVector(0, 0, 0)));
+    ASSERT_DOUBLE_EQ(0, c.ComputeDistance(LinearAlgebra::CreateVector(5, 0, 0)));
+    ASSERT_DOUBLE_EQ(0, c.ComputeDistance(LinearAlgebra::CreateVector(0, 5, 0)));
+    ASSERT_DOUBLE_EQ(5, c.ComputeDistance(LinearAlgebra::CreateVector(0, 0, 5)));
   }
 
   {
-    OrthancStone::CoordinateSystem3D c("nope1", "nope2");
+    CoordinateSystem3D c("nope1", "nope2");
     ASSERT_FALSE(c.IsValid());
-    ASSERT_FLOAT_EQ(c.GetNormal()[0], 0);
-    ASSERT_FLOAT_EQ(c.GetNormal()[1], 0);
-    ASSERT_FLOAT_EQ(c.GetNormal()[2], 1);
+    ASSERT_DOUBLE_EQ(c.GetNormal()[0], 0);
+    ASSERT_DOUBLE_EQ(c.GetNormal()[1], 0);
+    ASSERT_DOUBLE_EQ(c.GetNormal()[2], 1);
   }
 
   {
     // https://www.vedantu.com/maths/perpendicular-distance-of-a-point-from-a-plane
-    OrthancStone::CoordinateSystem3D c =
-      OrthancStone::CoordinateSystem3D::CreateFromPlaneGeneralForm(2, 4, -4, -6);
-    ASSERT_FLOAT_EQ(3, c.ComputeDistance(OrthancStone::LinearAlgebra::CreateVector(0, 3, 6)));
+    CoordinateSystem3D c = CoordinateSystem3D::CreateFromPlaneGeneralForm(2, 4, -4, -6);
+    ASSERT_DOUBLE_EQ(3, c.ComputeDistance(LinearAlgebra::CreateVector(0, 3, 6)));
+  }
+
+  {
+    // https://mathinsight.org/distance_point_plane_examples
+    CoordinateSystem3D c = CoordinateSystem3D::CreateFromPlaneGeneralForm(2, -2, 5, 8);
+    ASSERT_DOUBLE_EQ(39.0 / sqrt(33.0), c.ComputeDistance(LinearAlgebra::CreateVector(4, -4, 3)));
+  }
+
+  {
+    // https://www.ck12.org/calculus/distance-between-a-point-and-a-plane/lesson/Distance-Between-a-Point-and-a-Plane-MAT-ALY/
+    const Vector a = LinearAlgebra::CreateVector(3, 6, 9);
+    const Vector b = LinearAlgebra::CreateVector(9, 6, 3);
+    const Vector c = LinearAlgebra::CreateVector(6, -9, 9);
+    CoordinateSystem3D d = CoordinateSystem3D::CreateFromThreePoints(a, b, c);
+    ASSERT_DOUBLE_EQ(0, d.ComputeDistance(a));
+    ASSERT_DOUBLE_EQ(0, d.ComputeDistance(b));
+    ASSERT_DOUBLE_EQ(0, d.ComputeDistance(c));
+  }
+
+  {
+    // https://tutorial.math.lamar.edu/classes/calcii/eqnsofplanes.aspx
+    const Vector a = LinearAlgebra::CreateVector(1, -2, 0);
+    const Vector b = LinearAlgebra::CreateVector(3, 1, 4);
+    const Vector c = LinearAlgebra::CreateVector(0, -1, 2);
+    CoordinateSystem3D d = CoordinateSystem3D::CreateFromThreePoints(a, b, c);
+    double r = d.GetNormal() [0] / 2.0;
+    ASSERT_DOUBLE_EQ(-8 * r, d.GetNormal() [1]);
+    ASSERT_DOUBLE_EQ(5 * r, d.GetNormal() [2]);
   }
 }