Changeset 333

Timestamp:

03/26/08 17:39:03 (8 months ago)

Author:

powell

Message:

Removed the three-corner facet using an area test.

Files:

• trunk/matml/src/ternary/qhull.c (modified) (2 diffs)

trunk/matml/src/ternary/qhull.c

@@ -11 +11 @@
 #include <qhull/qhull.h>
 #include <stdlib.h>
+#include <math.h>
 
 
@@ -103 +104 @@
           j++;
         }
-      i++;
+
       /* Remove non-simplical facets */
       if (j>3)
         {
           (*numfacets)--;
-          i--;
         }
-      /* TODO: remove the trivial three-corners facet */
+
+      /* Remove facet with the three corners using an area test */
+      else
+        {
+          coordT x0 = qpoints [3* (*facetverts) [3*i]],
+            y0 = qpoints [3* (*facetverts) [3*i]+1],
+            x1 = qpoints [3* (*facetverts) [3*i+1]],
+            y1 = qpoints [3* (*facetverts) [3*i+1]+1],
+            x2 = qpoints [3* (*facetverts) [3*i+2]],
+            y2 = qpoints [3* (*facetverts) [3*i+2]+1];
+#ifdef DEBUG
+          printf ("  xyarea %g\n",
+                  fabs ((x1-x0)*(y2-y0) - (x2-x0)*(y1-y0)));
+#endif
+          if (fabs ((x1-x0)*(y2-y0) - (x2-x0)*(y1-y0)) == 1.)
+            (*numfacets)--;
+
+          else
+            i++;
+        }
     }
 
 #ifdef DEBUG
-  printf ("%d total facets\n", *numfacets);
   printf ("After loop: numfacets=%d, i=%d\n", *numfacets, i);
 #endif