[MaL] Moved operator<= and lessEq from Point to MathPoint.

GeoLib/Point.h

@@ -54,23 +54,7 @@ public:
 };
 
 static const Point ORIGIN(0, 0, 0);
-
-/**
- * lexicographic comparison of points
- */
-bool operator<= (GeoLib::Point const & p0, GeoLib::Point const & p1);
-
-/**
- * lexicographical comparison of points taking an epsilon into account
- * @param p0 first input Point
- * @param p1 first input Point
- * @param tol tolerance (if in the comparison operation the property fabs(p0[k] - p1[k]) < tol
- *     holds for the k-th coordinate the points are assumed the be equal in this coordinate)
- * @return true, if p0 is lexicographically smaller than p1
- */
-bool lessEq(const GeoLib::Point& p0,
-            const GeoLib::Point& p1,
-            double tol = std::numeric_limits<double>::epsilon());
 }
 
 #endif /* POINT_H_ */
+

GeoLib/Point.cpp → MathLib/MathPoint.cpp

 /**
  * \file
- * \author Thomas Fischer
- * \date   2010-06-22
- * \brief  Implementation of the Point class.
+ * \date   2015-01-16
+ * \brief  Implementation of the MathPoint class.
  *
  * \copyright
  * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
@@ -12,14 +11,11 @@
  *
  */
 
-
 #include <cmath>
 
-#include "Point.h"
-
-namespace GeoLib {
+#include "MathPoint.h"
 
-bool operator<= (const GeoLib::Point& p0, const GeoLib::Point& p1)
+bool operator<= (const MathLib::MathPoint& p0, const MathLib::MathPoint& p1)
 {
 	if (p0[0] > p1[0]) {
 		return false;
@@ -46,7 +42,7 @@ bool operator<= (const GeoLib::Point& p0, const GeoLib::Point& p1)
 	}
 }
 
-bool lessEq(const GeoLib::Point& p0, const GeoLib::Point& p1, double tol)
+bool lessEq(const MathLib::MathPoint& p0, const MathLib::MathPoint& p1, double tol)
 {
 	// test a relative and an absolute criterion
 	if (fabs(p0[0]-p1[0]) > tol * std::min(fabs(p1[0]), fabs(p0[0])) && fabs(p0[0]-p1[0]) > tol) {
@@ -75,4 +71,3 @@ bool lessEq(const GeoLib::Point& p0, const GeoLib::Point& p1, double tol)
 	}
 }
 
-} // end namespace GeoLib

MathLib/MathPoint.h

@@ -14,6 +14,8 @@
 #ifndef MATHPOINT_H_
 #define MATHPOINT_H_
 
+#include <cmath>
+
 #include "TemplatePoint.h"
 
 namespace MathLib
@@ -21,5 +23,22 @@ namespace MathLib
 typedef MathLib::TemplatePoint<double,3> MathPoint;
 } // end namespace MathLib
 
+/**
+ * lexicographic comparison of points
+ */
+bool operator<= (MathLib::MathPoint const & p0, MathLib::MathPoint const & p1);
+
+/**
+ * lexicographical comparison of points taking an epsilon into account
+ * @param p0 first input MathPoint
+ * @param p1 first input MathPoint
+ * @param tol tolerance (if in the comparison operation the property fabs(p0[k] - p1[k]) < tol
+ *     holds for the k-th coordinate the points are assumed the be equal in this coordinate)
+ * @return true, if p0 is lexicographically smaller than p1
+ */
+bool lessEq(const MathLib::MathPoint& p0,
+            const MathLib::MathPoint& p1,
+            double tol = std::numeric_limits<double>::epsilon());
+
 #endif /* MATHPOINT_H_ */