Changeset 389

Timestamp:

09/11/08 06:39:16 (2 months ago)

Author:

powell

Message:

Wrapped printfs in #ifdef DEBUG, bit of reordering.

Files:

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

trunk/matml/src/ternary/qhull.c

@@ -127 +127 @@
       slope3 = (x2*yG-xG*y2)/vG;
 
+#ifdef DEBUG
       printf ("      corners: %g %g %g %g %g %g %g %g %g\n      slopes: %g %g\n",
               corners[0], corners[1], corners[2],
               corners[3], corners[4], corners[5],
               corners[6], corners[7], corners[8], slope2, slope3);
+#endif
     }
   else
@@ -164 +166 @@
       current.C3 += dC3;
       distance = dC2*dC2 + dC3*dC3;
-      //printf ("        Added %g,%g (dist %g) to go to %g,%g\n", dC2,dC3,
-      //      sqrt(distance), current.C2,current.C3);
+#ifdef DEBUG
+      printf ("        Added %g,%g (dist %g) to go to %g,%g\n", dC2,dC3,
+              sqrt(distance), current.C2,current.C3);
+#endif
     }
 
@@ -259 +263 @@
           int eparamc=0;
 
+#ifdef DEBUG
           printf ("Facet 0x%lx: %g,%g %g,%g %g,%g\n", facet,
                   corners[0], corners[1], corners[3],
@@ -266 +271 @@
                   thepoint[0], thepoint[1], thepoint[2],
                   fabs((corners[3]-corners[0])*(corners[7]-corners[1]) -
-                       (corners[6]-corners[0])*(corners[4]-corners[1])));
+                  (corners[6]-corners[0])*(corners[4]-corners[1])));
+#endif
 
           /*+
@@ -288 +294 @@
               }
 
+#ifdef DEBUG
           printf ("  Centroid %g, free energy %g (func %d)\n",
-                  centroid[2], Gcenter, eparamc);
+            centroid[2], Gcenter, eparamc);
+#endif
 
           if (Gcenter < centroid[2] &&
@@ -296 +304 @@
               if (one_phase_refine || eparam[0] != eparamc)
                 {
+#ifdef DEBUG
                   printf ("  Refining %s-phase triangle at centroid\n",
-                          (eparam[0]==eparamc) ? "one" : "multi");
+                    (eparam[0]==eparamc) ? "one" : "multi");
+#endif
                   if (numnewpoints >= newpointsize)
                     newpoints = realloc
@@ -310 +320 @@
               else
                 {
+#ifdef DEBUG
                   printf ("  Not refining one-phase triangle\n");
+#endif
                 }
             }
@@ -327 +339 @@
                                         corners[6], corners[7], corners[8]};
 
+#ifdef DEBUG
               printf ("  Refining multi-phase triangle\n");
+#endif
               for (j=0; j<3; j++)
                 {
@@ -358 +372 @@
               for (j=0; j<3; j++)
                 {
+#ifdef DEBUG
                   printf ("    Refining point at %g, %g function %d\n",
                           newcorners[3*j], newcorners[3*j+1], eparam[j]);
+#endif
                   NewtonRefine (newcorners+3*j, corners, eparams+eparam[j],
                                 T,P, 3,3, newton_tolerance);
+#ifdef DEBUG
                   printf ("    -> %g, %g\n", newcorners[3*j],
                           newcorners[3*j+1]);
+#endif
 
                   newcorners[3*j+2] = free_energy
@@ -381 +399 @@
                   newcorners[0]+newcorners[1]<=1.)
                 {
+#ifdef DEBUG
                   printf ("    Adding new point %g,%g,%g\n",
-                          newcorners[0], newcorners[1], newcorners[2]);
+                    newcorners[0], newcorners[1], newcorners[2]);
+#endif
                   if (numnewpoints >= newpointsize)
                     newpoints = realloc
@@ -400 +420 @@
                   newcorners[3]+newcorners[4]<=1.)
                 {
+#ifdef DEBUG
                   printf ("    Adding new point %g,%g,%g\n",
                           newcorners[3], newcorners[4], newcorners[5]);
+#endif
                   if (numnewpoints >= newpointsize)
                     newpoints = realloc
@@ -423 +445 @@
                   newcorners[6]+newcorners[7]<=1.)
                 {
+#ifdef DEBUG
                   printf ("    Adding new point %g,%g,%g\n",
                           newcorners[6], newcorners[7], newcorners[8]);
+#endif
                   if (numnewpoints >= newpointsize)
                     newpoints = realloc
@@ -442 +466 @@
     +*/
 
+  /*+ Unfortunately, adding new points can create dissonance between qhull
+    indices and Ternary indices.  So this frees the old hull and creates a new
+    one around the old points and new refined ones.  This adds an N log N
+    process to an otherwise order-N refining algorithm, but can't be
+    helped. +*/
+#ifdef DEBUG
+  printf ("Adding %d new points to hull\n", numnewpoints);
+#endif
+
   if (!(*points = realloc
         (*points, (*numpoints + numnewpoints) * sizeof (ternary_point))))
     return 1;
           
-  printf ("Adding %d new points to hull\n", numnewpoints);
+  qh_freeqhull (True);
+  free (qpoints);
+
   for (i=0; i<numnewpoints; i++)
     {
@@ -470 +505 @@
   *numpoints += numnewpoints;
 
-  qh_freeqhull (True);
-  free (qpoints);
-
+#ifdef DEBUG
   printf ("Done, returning\n");
+#endif
   free(newpoints);