Changeset 446 for trunk

Timestamp:

03/18/2009 04:08:36 PM (3 years ago)

Author:

powell

Message:

Changes required to support square compositions.

Files:

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

trunk/matml/src/ternary/qhull.c

@@ -49 +49 @@
   if (edgenergy > edgecenter[2])
     ret++;
+#ifdef DEBUG
+  printf ("   Type: side 0-1 edge %g mid %g, ", edgenergy, edgecenter [2]);
+#endif
       
   edgecenter[0] = (corners[0] + corners[6]) / 2.;
@@ -63 +66 @@
   if (edgenergy > edgecenter[2])
     ret++;
+#ifdef DEBUG
+  printf ("0-2 edge %g mid %g, ", edgenergy, edgecenter [2]);
+#endif
       
   edgecenter[0] = (corners[3] + corners[6]) / 2.;
@@ -77 +83 @@
   if (edgenergy > edgecenter[2])
     ret++;
+#ifdef DEBUG
+  printf ("1-2 edge %g mid %g", edgenergy, edgecenter [2]);
+#endif
 
   return (facet_type) ret;
@@ -341 +350 @@
 
   while (distance >= newton_tolerance * newton_tolerance &&
-         current.C2>=0. && current.C3>=0. && current.C2+current.C3<=1.)
+         current.C2>=0. && current.C3>=0. && current.C2<=1. && current.C3<=1.)
     {
       double dC2, dC3, det;
@@ -571 +580 @@
           // Don't add the point, reallocate the points array instead!
           if (newcorners[0]>=0. && newcorners[1]>=0. &&
-              newcorners[0]+newcorners[1]<=1.)
+              newcorners[0]<=1. && newcorners[1]<=1.)
             {
 #ifdef DEBUG
@@ -592 +601 @@
               vertex_tolerance * vertex_tolerance &&
               newcorners[3]>=0. && newcorners[4]>=0. &&
-              newcorners[3]+newcorners[4]<=1.)
+              newcorners[3]<=1. && newcorners[4]<=1.)
             {
 #ifdef DEBUG
@@ -617 +626 @@
               vertex_tolerance * vertex_tolerance &&
               newcorners[6]>=0. && newcorners[7]>=0. &&
-              newcorners[6]+newcorners[7]<=1.)
+              newcorners[6]<=1. && newcorners[7]<=1.)
             {
 #ifdef DEBUG