V1.6 (#9)

* revert cmake version to match libigl

* build executable option

* update to 1.6

Author: alecjacobson

CMakeLists.txt

@@ -1,8 +1,18 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.1)
 project(tetgen)
 
-add_library(tetgen STATIC tetgen.cxx predicates.cxx)
-target_compile_definitions(tetgen PRIVATE -DTETLIBRARY)
+option(BUILD_EXECUTABLE "Build tetgen executable" OFF)
+option(BUILD_LIBRARY    "Build libtetgen library" ON)
 
-# Generate position independent code
-set_target_properties(tetgen PROPERTIES POSITION_INDEPENDENT_CODE ON)
+if(BUILD_LIBRARY)
+  add_library(tetgen STATIC tetgen.cxx predicates.cxx)
+  target_compile_definitions(tetgen PRIVATE -DTETLIBRARY)
+  # Generate position independent code
+  set_target_properties(tetgen PROPERTIES POSITION_INDEPENDENT_CODE ON)
+endif()
+
+
+if(BUILD_EXECUTABLE)
+  add_executable(tetgen_exec tetgen.cxx predicates.cxx)
+  set_target_properties(tetgen_exec PROPERTIES OUTPUT_NAME tetgen)
+endif()

README

@@ -1,4 +1,4 @@
-This is TetGen version 1.5.1 (released on August, 2018)
+This is TetGen version 1.6.0 (released on August 31, 2020)
 
 Please see the documentation of TetGen for compiling and using TetGen.
 It is available at the following link:
@@ -13,7 +13,6 @@ For more information on this product, contact :
   Mohrenstr. 39
   10117 Berlin, Germany
 
- Phone: +49 (0) 30-20372-446   Fax: +49 (0) 30-2044975
  EMail: <[email protected]>
  Web Site: http://www.wias-berlin.de/~si
 

example.poly

@@ -382,12 +382,12 @@ static REAL o3derrboundA, o3derrboundB, o3derrboundC;
 static REAL iccerrboundA, iccerrboundB, iccerrboundC;
 static REAL isperrboundA, isperrboundB, isperrboundC;
 
-// Options to choose types of geometric computtaions.
+// Options to choose types of geometric computtaions. 
 // Added by H. Si, 2012-08-23.
 static int  _use_inexact_arith; // -X option.
 static int  _use_static_filter; // Default option, disable it by -X1
 
-// Static filters for orient3d() and insphere().
+// Static filters for orient3d() and insphere(). 
 // They are pre-calcualted and set in exactinit().
 // Added by H. Si, 2012-08-23.
 static REAL o3dstaticfilter;
@@ -399,7 +399,7 @@ static REAL ispstaticfilter;
 //          http://www.math.utah.edu/~beebe/software/ieee/
 // The original program was "fpinfo2.c".
 
-double fppow2(int n)
+static double fppow2(int n)
 {
   double x, power;
   x = (n < 0) ? ((double)1.0/(double)2.0) : (double)2.0;
@@ -412,12 +412,12 @@ double fppow2(int n)
 
 #ifdef SINGLE
 
-float fstore(float x)
+static float fstore(float x)
 {
   return (x);
 }
 
-int test_float(int verbose)
+static int test_float(int verbose)
 {
   float x;
   int pass = 1;
@@ -467,12 +467,12 @@ int test_float(int verbose)
 
 # else
 
-double dstore(double x)
+static double dstore(double x)
 {
   return (x);
 }
 
-int test_double(int verbose)
+static int test_double(int verbose)
 {
   double x;
   int pass = 1;
@@ -488,7 +488,7 @@ int test_double(int verbose)
   x = 1.0;
   while (dstore(1.0 + x/2.0) != 1.0)
     x /= 2.0;
-  if (verbose)
+  if (verbose) 
     (void)printf("  machine epsilon = %13.5le ", x);
 
   if (x == (double)fppow2(-52)) {
@@ -540,7 +540,7 @@ int test_double(int verbose)
 /*                                                                           */
 /*****************************************************************************/
 
-void exactinit(int verbose, int noexact, int nofilter, REAL maxx, REAL maxy,
+void exactinit(int verbose, int noexact, int nofilter, REAL maxx, REAL maxy, 
                REAL maxz)
 {
   REAL half;
@@ -881,7 +881,7 @@ int expansion_sum_zeroelim2(int elen, REAL *e, int flen, REAL *f, REAL *h)
 /*                                                                           */
 /*****************************************************************************/
 
-int fast_expansion_sum(int elen, REAL *e, int flen, REAL *f, REAL *h)
+static int fast_expansion_sum(int elen, REAL *e, int flen, REAL *f, REAL *h)
 /* h cannot be e or f. */
 {
   REAL Q;
@@ -953,7 +953,7 @@ int fast_expansion_sum(int elen, REAL *e, int flen, REAL *f, REAL *h)
 /*  properties.                                                              */
 /*                                                                           */
 /*****************************************************************************/
-
+static
 int fast_expansion_sum_zeroelim(int elen, REAL *e, int flen, REAL *f, REAL *h)
 /* h cannot be e or f. */
 {
@@ -970,47 +970,19 @@ int fast_expansion_sum_zeroelim(int elen, REAL *e, int flen, REAL *f, REAL *h)
   eindex = findex = 0;
   if ((fnow > enow) == (fnow > -enow)) {
     Q = enow;
-    /**
-     * [JWP] Increment 'eindex,' but only update 'enow' if it is
-     * safe.  Otherwise, 'enow' remains unchanged from the previous
-     * iteration...
-     */
-    ++eindex;
-    if (eindex < elen)
-      enow = e[eindex];
+    enow = e[++eindex];
   } else {
     Q = fnow;
-    /**
-     * [JWP] Increment 'findex,' but only update 'fnow' if it is
-     * safe.  Otherwise, 'fnow' remains unchanged from the previous
-     * iteration...
-     */
-    ++findex;
-    if (findex < flen)
-      fnow = f[findex];
+    fnow = f[++findex];
   }
   hindex = 0;
   if ((eindex < elen) && (findex < flen)) {
     if ((fnow > enow) == (fnow > -enow)) {
       Fast_Two_Sum(enow, Q, Qnew, hh);
-      /**
-       * [JWP] Increment 'eindex,' but only update 'enow' if it is
-       * safe.  Otherwise, 'enow' remains unchanged from the previous
-       * iteration...
-       */
-      ++eindex;
-      if (eindex < elen)
-        enow = e[eindex];
+      enow = e[++eindex];
     } else {
       Fast_Two_Sum(fnow, Q, Qnew, hh);
-      /**
-       * [JWP] Increment 'findex,' but only update 'fnow' if it is
-       * safe.  Otherwise, 'fnow' remains unchanged from the previous
-       * iteration...
-       */
-      ++findex;
-      if (findex < flen)
-        fnow = f[findex];
+      fnow = f[++findex];
     }
     Q = Qnew;
     if (hh != 0.0) {
@@ -1019,24 +991,10 @@ int fast_expansion_sum_zeroelim(int elen, REAL *e, int flen, REAL *f, REAL *h)
     while ((eindex < elen) && (findex < flen)) {
       if ((fnow > enow) == (fnow > -enow)) {
         Two_Sum(Q, enow, Qnew, hh);
-        /**
-         * [JWP] Increment 'eindex,' but only update 'enow' if it is
-         * safe.  Otherwise, 'enow' remains unchanged from the previous
-         * iteration...
-         */
-        ++eindex;
-        if (eindex < elen)
-          enow = e[eindex];
+        enow = e[++eindex];
       } else {
         Two_Sum(Q, fnow, Qnew, hh);
-        /**
-         * [JWP] Increment 'findex,' but only update 'fnow' if it is
-         * safe.  Otherwise, 'fnow' remains unchanged from the previous
-         * iteration...
-         */
-        ++findex;
-        if (findex < flen)
-          fnow = f[findex];
+        fnow = f[++findex];
       }
       Q = Qnew;
       if (hh != 0.0) {
@@ -1046,29 +1004,15 @@ int fast_expansion_sum_zeroelim(int elen, REAL *e, int flen, REAL *f, REAL *h)
   }
   while (eindex < elen) {
     Two_Sum(Q, enow, Qnew, hh);
-    /**
-     * [JWP] Increment 'eindex,' but only update 'enow' if it is
-     * safe.  Otherwise, 'enow' remains unchanged from the previous
-     * iteration...
-     */
-    ++eindex;
-    if (eindex < elen)
-      enow = e[eindex];
+    enow = e[++eindex];
     Q = Qnew;
     if (hh != 0.0) {
       h[hindex++] = hh;
     }
   }
   while (findex < flen) {
     Two_Sum(Q, fnow, Qnew, hh);
-    /**
-     * [JWP] Increment 'findex,' but only update 'fnow' if it is
-     * safe.  Otherwise, 'fnow' remains unchanged from the previous
-     * iteration...
-     */
-    ++findex;
-    if (findex < flen)
-      fnow = f[findex];
+    fnow = f[++findex];
     Q = Qnew;
     if (hh != 0.0) {
       h[hindex++] = hh;
@@ -1221,7 +1165,7 @@ int linear_expansion_sum_zeroelim(int elen, REAL *e, int flen, REAL *f,
 /*  will h.)                                                                 */
 /*                                                                           */
 /*****************************************************************************/
-
+static
 int scale_expansion(int elen, REAL *e, REAL b, REAL *h)
 /* e and h cannot be the same. */
 {
@@ -1267,7 +1211,7 @@ int scale_expansion(int elen, REAL *e, REAL b, REAL *h)
 /*  will h.)                                                                 */
 /*                                                                           */
 /*****************************************************************************/
-
+static
 int scale_expansion_zeroelim(int elen, REAL *e, REAL b, REAL *h)
 /* e and h cannot be the same. */
 {
@@ -1319,7 +1263,7 @@ int scale_expansion_zeroelim(int elen, REAL *e, REAL b, REAL *h)
 /*  nonadjacent expansion.                                                   */
 /*                                                                           */
 /*****************************************************************************/
-
+static
 int compress(int elen, REAL *e, REAL *h)
 /* e and h may be the same. */
 {
@@ -1362,7 +1306,7 @@ int compress(int elen, REAL *e, REAL *h)
 /*  See either version of my paper for details.                              */
 /*                                                                           */
 /*****************************************************************************/
-
+static
 REAL estimate(int elen, REAL *e)
 {
   REAL Q;
@@ -1400,7 +1344,7 @@ REAL estimate(int elen, REAL *e)
 /*  nearly so.                                                               */
 /*                                                                           */
 /*****************************************************************************/
-
+static
 REAL orient2dfast(REAL *pa, REAL *pb, REAL *pc)
 {
   REAL acx, bcx, acy, bcy;
@@ -1412,6 +1356,7 @@ REAL orient2dfast(REAL *pa, REAL *pb, REAL *pc)
   return acx * bcy - acy * bcx;
 }
 
+//static
 REAL orient2dexact(REAL *pa, REAL *pb, REAL *pc)
 {
   INEXACT REAL axby1, axcy1, bxcy1, bxay1, cxay1, cxby1;
@@ -2233,9 +2178,9 @@ REAL orient3dadapt(REAL *pa, REAL *pb, REAL *pc, REAL *pd, REAL permanent)
 
 REAL orient3d(REAL *pa, REAL *pb, REAL *pc, REAL *pd)
 {
-  return (REAL)
+  return (REAL) 
     - cgal_pred_obj.orientation_3_object()
-        (Point(pa[0], pa[1], pa[2]),
+        (Point(pa[0], pa[1], pa[2]), 
          Point(pb[0], pb[1], pb[2]),
          Point(pc[0], pc[1], pc[2]),
          Point(pd[0], pd[1], pd[2]));
@@ -2269,7 +2214,7 @@ REAL orient3d(REAL *pa, REAL *pb, REAL *pc, REAL *pd)
   adxbdy = adx * bdy;
   bdxady = bdx * ady;
 
-  det = adz * (bdxcdy - cdxbdy)
+  det = adz * (bdxcdy - cdxbdy) 
       + bdz * (cdxady - adxcdy)
       + cdz * (adxbdy - bdxady);
 
@@ -4237,9 +4182,9 @@ REAL insphere(REAL *pa, REAL *pb, REAL *pc, REAL *pd, REAL *pe)
 /*  See my Robust Predicates paper for details.                              */
 /*                                                                           */
 /*****************************************************************************/
-
+//static
 REAL orient4dexact(REAL* pa, REAL* pb, REAL* pc, REAL* pd, REAL* pe,
-                   REAL aheight, REAL bheight, REAL cheight, REAL dheight,
+                   REAL aheight, REAL bheight, REAL cheight, REAL dheight, 
                    REAL eheight)
 {
   INEXACT REAL axby1, bxcy1, cxdy1, dxey1, exay1;
@@ -4453,8 +4398,9 @@ REAL orient4dexact(REAL* pa, REAL* pb, REAL* pc, REAL* pd, REAL* pe,
   return deter[deterlen - 1];
 }
 
+static
 REAL orient4dadapt(REAL* pa, REAL* pb, REAL* pc, REAL* pd, REAL* pe,
-                   REAL aheight, REAL bheight, REAL cheight, REAL dheight,
+                   REAL aheight, REAL bheight, REAL cheight, REAL dheight, 
                    REAL eheight, REAL permanent)
 {
   INEXACT REAL aex, bex, cex, dex, aey, bey, cey, dey, aez, bez, cez, dez;
@@ -4649,8 +4595,8 @@ REAL orient4dadapt(REAL* pa, REAL* pb, REAL* pc, REAL* pd, REAL* pe,
                        aheight, bheight, cheight, dheight, eheight);
 }
 
-REAL orient4d(REAL* pa, REAL* pb, REAL* pc, REAL* pd, REAL* pe,
-              REAL aheight, REAL bheight, REAL cheight, REAL dheight,
+REAL orient4d(REAL* pa, REAL* pb, REAL* pc, REAL* pd, REAL* pe, 
+              REAL aheight, REAL bheight, REAL cheight, REAL dheight, 
               REAL eheight)
 {
  REAL aex, bex, cex, dex;
@@ -4756,3 +4702,9 @@ REAL orient4d(REAL* pa, REAL* pb, REAL* pc, REAL* pd, REAL* pe,
 
 
 
+
+
+
+//==============================================================================
+
+