remove ttmath in favour of DD

libgeos · Apr 16, 2020 · ab1b004 · ab1b004
1 parent 472c1f9
commit ab1b004
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 24,796 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -2,7 +2,6 @@ coverage:
   precision: 2
 
 ignore:
-  - "include/geos/algorithm/ttmath"
   - "tests/unit/tut"
   - "tests/xmltester/tinyxml2"
 

diff --git a/Makefile.am b/Makefile.am
@@ -73,5 +73,4 @@ valgrindcheck:
 check-local:
 	! find $(srcdir) -name '*.cpp' -o -name '*.h' | \
 		grep -v tests/xmltester/tinyxml | \
-		grep -v include/geos/algorithm/ttmath | \
 		xargs grep -n '[[:space:]]$$'
diff --git a/configure.ac b/configure.ac
@@ -376,7 +376,6 @@ AC_OUTPUT([
 	include/geos/algorithm/Makefile
 	include/geos/algorithm/locate/Makefile
 	include/geos/algorithm/distance/Makefile
-	include/geos/algorithm/ttmath/Makefile
 	include/geos/geom/Makefile
 	include/geos/geom/prep/Makefile
 	include/geos/geom/util/Makefile

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -853,7 +853,6 @@ EXCLUDE_PATTERNS       = */examples/* \
                          */test/* \
                          */bigtest/* \
                          */io/markup/* \
-                         */ttmath/* \
                          config.h \
                          acconfig.h \
                          CoordinateList.cpp \

diff --git a/include/geos/algorithm/CGAlgorithmsDD.h b/include/geos/algorithm/CGAlgorithmsDD.h
@@ -19,23 +19,7 @@
 #ifndef GEOS_ALGORITHM_CGALGORITHMDD_H
 #define GEOS_ALGORITHM_CGALGORITHMDD_H
 #include <geos/export.h>
-
-// #define USE_TTMATH
-
-#ifdef USE_TTMATH
-
-#include <geos/algorithm/ttmath/ttmath.h>
-
-/// Usage: `ttmath::Big<exponent, mantissa>`
-typedef ttmath::Big<TTMATH_BITS(32), TTMATH_BITS(128)> DD;
-//typedef ttmath::Big<TTMATH_BITS(64), TTMATH_BITS(128)> DD;
-//typedef ttmath::Big<TTMATH_BITS(32), TTMATH_BITS(256)> DD;
-//typedef ttmath::Big<TTMATH_BITS(64), TTMATH_BITS(256)> DD;
-#else
 #include <geos/math/DD.h>
-using namespace geos::math;
-#endif
-
 
 // Forward declarations
 namespace geos {
@@ -45,6 +29,8 @@ class CoordinateSequence;
 }
 }
 
+using namespace geos::math;
+
 namespace geos {
 namespace algorithm { // geos::algorithm
 

diff --git a/include/geos/algorithm/Makefile.am b/include/geos/algorithm/Makefile.am
@@ -3,8 +3,7 @@
 #
 SUBDIRS = \
 	locate \
-	distance \
-	ttmath
+	distance 
 
 EXTRA_DIST =
 

diff --git a/include/geos/algorithm/ttmath/COPYRIGHT b/include/geos/algorithm/ttmath/COPYRIGHT
diff --git a/include/geos/algorithm/ttmath/Makefile.am b/include/geos/algorithm/ttmath/Makefile.am
diff --git a/include/geos/algorithm/ttmath/README b/include/geos/algorithm/ttmath/README