From 7e5bf81942176b16a2e68c8c8f82ec85d238b8a1 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 7 Jun 2016 11:55:33 +0200
Subject: [PATCH] [T] Mv test IsPointInTriangle from GL to MaL.
---
Tests/GeoLib/TestIsPointInTriangle.cpp | 76 ----------------------
Tests/MathLib/TestIsPointInTriangle.cpp | 86 +++++++++++++++++++++++++
2 files changed, 86 insertions(+), 76 deletions(-)
delete mode 100644 Tests/GeoLib/TestIsPointInTriangle.cpp
create mode 100644 Tests/MathLib/TestIsPointInTriangle.cpp
diff --git a/Tests/GeoLib/TestIsPointInTriangle.cpp b/Tests/GeoLib/TestIsPointInTriangle.cpp
deleted file mode 100644
index 23686418d77..00000000000
--- a/Tests/GeoLib/TestIsPointInTriangle.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * @file TestIsPointInTriangle.cpp
- * @date 2014-05-27
- *
- * \copyright
- * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
- * Distributed under a Modified BSD License.
- * See accompanying file LICENSE.txt or
- * http://www.opengeosys.org/project/license
- */
-
-#include "gtest/gtest.h"
-
-#include "GeoLib/AnalyticalGeometry.h"
-
-TEST(GeoLib, IsPointInTriangle)
-{
- GeoLib::Point const a(0.0, 0.0, 0.0);
- GeoLib::Point const b(100.0, 0.0, 0.0);
- GeoLib::Point const c(0.0, 100.0, 0.0);
-
- // check point on corner points of triangle
- GeoLib::Point q(a);
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = b;
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = c;
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c));
-
- // check points on edges of triangle
- q = GeoLib::Point(0.5*(b[0]+a[0]), 0.5*(b[1]+a[1]), 0.5*(b[2]+a[2]));
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = GeoLib::Point(0.5*(c[0]+a[0]), 0.5*(c[1]+a[1]), 0.5*(c[2]+a[2]));
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = GeoLib::Point(0.5*(c[0]+b[0]), 0.5*(c[1]+b[1]), 0.5*(c[2]+b[2]));
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c));
-
- // check points inside
- q = GeoLib::Point (0.1, 0.1, 0.0);
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = GeoLib::Point (0.1, 0.1, 1e-10);
- EXPECT_TRUE(GeoLib::gaussPointInTriangle(q, a, b, c));
- // here is a higher eps value needed for the second algorithm
- EXPECT_TRUE(GeoLib::barycentricPointInTriangle(q, a, b, c, 1e-5));
-
- // check points outside
- q = GeoLib::Point (-0.1, 0.1, 0.0);
- EXPECT_FALSE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_FALSE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = GeoLib::Point (0.1, 0.1, 0.0005);
- EXPECT_FALSE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_FALSE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = GeoLib::Point (0.1, 0.1, 0.0001);
- EXPECT_FALSE(GeoLib::gaussPointInTriangle(q, a, b, c, std::numeric_limits<double>::epsilon()));
- EXPECT_FALSE(GeoLib::barycentricPointInTriangle(q, a, b, c, std::numeric_limits<double>::epsilon()));
- q = GeoLib::Point (0.1, 0.1, 0.000001);
- EXPECT_FALSE(GeoLib::gaussPointInTriangle(q, a, b, c, std::numeric_limits<double>::epsilon()));
- EXPECT_FALSE(GeoLib::barycentricPointInTriangle(q, a, b, c, std::numeric_limits<double>::epsilon()));
- q = GeoLib::Point (0.1, 0.1, 1e-7);
- EXPECT_FALSE(GeoLib::gaussPointInTriangle(q, a, b, c, std::numeric_limits<double>::epsilon()));
- EXPECT_FALSE(GeoLib::barycentricPointInTriangle(q, a, b, c, std::numeric_limits<double>::epsilon()));
- q = GeoLib::Point (0.1, 0.1, 0.001);
- EXPECT_FALSE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_FALSE(GeoLib::barycentricPointInTriangle(q, a, b, c));
- q = GeoLib::Point (0.1, 0.1, 0.1);
- EXPECT_FALSE(GeoLib::gaussPointInTriangle(q, a, b, c));
- EXPECT_FALSE(GeoLib::barycentricPointInTriangle(q, a, b, c));
-}
-
diff --git a/Tests/MathLib/TestIsPointInTriangle.cpp b/Tests/MathLib/TestIsPointInTriangle.cpp
new file mode 100644
index 00000000000..eed12e1e82c
--- /dev/null
+++ b/Tests/MathLib/TestIsPointInTriangle.cpp
@@ -0,0 +1,86 @@
+/**
+ * @file TestIsPointInTriangle.cpp
+ * @date 2014-05-27
+ *
+ * \copyright
+ * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ */
+
+#include <gtest/gtest.h>
+
+#include "MathLib/Point3d.h"
+#include "MathLib/GeometricBasics.h"
+
+TEST(MathLib, IsPointInTriangle)
+{
+ MathLib::Point3d const a(std::array<double, 3>{{0.0, 0.0, 0.0}});
+ MathLib::Point3d const b(std::array<double, 3>{{100.0, 0.0, 0.0}});
+ MathLib::Point3d const c(std::array<double, 3>{{0.0, 100.0, 0.0}});
+
+ // check point on corner points of triangle
+ MathLib::Point3d q(a);
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = b;
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = c;
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c));
+
+ // check points on edges of triangle
+ q = MathLib::Point3d(std::array<double, 3>{
+ {0.5 * (b[0] + a[0]), 0.5 * (b[1] + a[1]), 0.5 * (b[2] + a[2])}});
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = MathLib::Point3d(std::array<double, 3>{
+ {0.5 * (c[0] + a[0]), 0.5 * (c[1] + a[1]), 0.5 * (c[2] + a[2])}});
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = MathLib::Point3d(std::array<double, 3>{
+ {0.5 * (c[0] + b[0]), 0.5 * (c[1] + b[1]), 0.5 * (c[2] + b[2])}});
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c));
+
+ // check points inside
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 0.0}});
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 1e-10}});
+ EXPECT_TRUE(MathLib::gaussPointInTriangle(q, a, b, c));
+ // here is a higher eps value needed for the second algorithm
+ EXPECT_TRUE(MathLib::barycentricPointInTriangle(q, a, b, c, 1e-5));
+
+ // check points outside
+ q = MathLib::Point3d(std::array<double, 3>{{-0.1, 0.1, 0.0}});
+ EXPECT_FALSE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_FALSE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 0.0005}});
+ EXPECT_FALSE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_FALSE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 0.0001}});
+ EXPECT_FALSE(MathLib::gaussPointInTriangle(
+ q, a, b, c, std::numeric_limits<double>::epsilon()));
+ EXPECT_FALSE(MathLib::barycentricPointInTriangle(
+ q, a, b, c, std::numeric_limits<double>::epsilon()));
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 0.000001}});
+ EXPECT_FALSE(MathLib::gaussPointInTriangle(
+ q, a, b, c, std::numeric_limits<double>::epsilon()));
+ EXPECT_FALSE(MathLib::barycentricPointInTriangle(
+ q, a, b, c, std::numeric_limits<double>::epsilon()));
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 1e-7}});
+ EXPECT_FALSE(MathLib::gaussPointInTriangle(
+ q, a, b, c, std::numeric_limits<double>::epsilon()));
+ EXPECT_FALSE(MathLib::barycentricPointInTriangle(
+ q, a, b, c, std::numeric_limits<double>::epsilon()));
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 0.001}});
+ EXPECT_FALSE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_FALSE(MathLib::barycentricPointInTriangle(q, a, b, c));
+ q = MathLib::Point3d(std::array<double, 3>{{0.1, 0.1, 0.1}});
+ EXPECT_FALSE(MathLib::gaussPointInTriangle(q, a, b, c));
+ EXPECT_FALSE(MathLib::barycentricPointInTriangle(q, a, b, c));
+}
+
--
GitLab