Changeset 353

Timestamp:

03/27/08 16:54:31 (8 months ago)

Author:

powell

Message:

One more O(N) function from main() to book.c.

Location:

trunk/matml/src/ternary

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• book.c (modified) (4 diffs)
• ternary.c (modified) (1 diff)
• ternary.h (modified) (1 diff)

trunk/matml/src/ternary/ChangeLog

@@ -4 +4 @@
   * Check for qhull library in configure.in.
   * Parameterized free energy function with temperature support.
+  * Moved many O(N) functions from main() out to new book.c file.
   * TODO: better single-phase check in ternary.c,
     multiple free energy functions; later refine qhull concave facets.

trunk/matml/src/ternary/Makefile.am

@@ -12 +12 @@
 noinst_HEADERS  = ternary.h
 ternary_SOURCES = ternary.c geomview.c qhull.c book.c freenergy.c
-ternary_CFLAGS  = -DGEOMVIEW=\"@GEOMVIEW@\" # -DDEBUG
+ternary_CFLAGS  = -std=c99 -DGEOMVIEW=\"@GEOMVIEW@\" # -DDEBUG
 ternary_LDADD   = -lm -lqhull
 

trunk/matml/src/ternary/book.c

@@ -9 +9 @@
 
 #include "ternary.h" /*+ Ternary prototypes, typedefs, etc. +*/
-#include <math.h>    /*+ For sqrt() +*/
+#include <math.h>    /*+ For sqrt(), fmin()/fmax() +*/
 
 
@@ -74 +74 @@
 
 /*++++++++++++++++++++++++++++++++++++++
+  This function fills an array with vertex indices.
+
+  int init_triangle_vertices It returns zero or an error code.
+
+  int resolution Resolution of the discretization (number of points on a side).
+
+  int *vertex_array Array of triangle indices of size
+  +latex+$N^2$, where $N$ is the resolution.
+  +html+ <i>N</i><sup>2</sup>, where <i>N</i> is the resolution.
+  ++++++++++++++++++++++++++++++++++++++*/
+
+int init_triangle_vertices (int resolution, int *vertex_array)
+{
+  int i,j, index;
+
+  for (i=0, index=0; i<resolution-1; i++)
+    {
+      for (j=0; j<resolution-i-1; j++)
+        {
+          vertex_array [3*index]   = ROWSTART(i)+j;
+          vertex_array [3*index+1] = ROWSTART(i)+j+1;
+          vertex_array [3*index+2] = ROWSTART(i+1)+j;
+          index++;
+
+          vertex_array [3*index]   = ROWSTART(i)+j+1;
+          vertex_array [3*index+1] = ROWSTART(i+1)+j+1;
+          vertex_array [3*index+2] = ROWSTART(i+1)+j;
+          index++;
+        }
+      vertex_array [3*index]   = ROWSTART(i)+resolution-i-1;
+      vertex_array [3*index+1] = ROWSTART(i)+resolution-i;
+      vertex_array [3*index+2] = ROWSTART(i+1)+resolution-i-1;
+      index++;
+    }
+  vertex_array [3*index]   = ROWSTART(resolution-1);
+  vertex_array [3*index+1] = ROWSTART(resolution-1)+1;
+  vertex_array [3*index+2] = ROWSTART(resolution);
+
+  return 0;
+}
+
+
+/*++++++++++++++++++++++++++++++++++++++
   This scales the free energy of an array of ternary points to the
   +latex+$y$-coordinate
@@ -79 +122 @@
   and colors the points according to free energy as well.
 
-  int scale_triangle_array It returns zero or an error code.
+  int scale_energy_array It returns zero or an error code.
 
   int num_points Number of points in the array
@@ -110 +153 @@
   ++++++++++++++++++++++++++++++++++++++*/
 
-int scale_triangle_array (int num_points, ternary_point *points,
+int scale_energy_array (int num_points, ternary_point *points,
                           double y0, double G0, double y1, double G1,
                           double *Gmin, double *Gmax)

trunk/matml/src/ternary/ternary.c

@@ -52 +52 @@
   printf("Geomview version: %s\n", gv_version);
 
-  /* Calculate free energies, including upper and lower bounds for coloring */
+  /* Initialize coordinates of triangle array */
   if (i=init_triangle_array (loop_max, points))
     { printf ("main: Error %d in init_triangle_array\n", i); exit (i); }
 
-#define ROWSTART(row) ((row)*(loop_max+1) - ((row)*((row)-1))/2)
+  /* Calculate triangle vertex indices */
+  if (i=init_triangle_vertices (loop_max, verts))
+    { printf ("main: Error %d in init_triangle_vertices\n", i); exit (i); }
 
+  /* Calculate free energies */
   for (index=0; index<(loop_max+1)*(loop_max+2)/2; index++)
     points[index].G =
       free_energy (points[index].C2, points[index].C3, T, &eparams1);
 
-  if (i=scale_triangle_array ((loop_max+1)*(loop_max+2)/2, points,
+  /* Scale free energy values to (0->1) */
+  if (i=scale_energy_array ((loop_max+1)*(loop_max+2)/2, points,
                               0., 0., 1., 0., NULL, NULL))
     { printf ("main: Error %d in scale_triangle_array\n", i); exit (i); }
-
-  /* Calculate triangle vertex indices */
-  for (i=0, index=0; i<loop_max-1; i++)
-    {
-      for (j=0; j<loop_max-1-i; j++)
-        {
-          verts [3*index]   = ROWSTART(i)+j;
-          verts [3*index+1] = ROWSTART(i)+j+1;
-          verts [3*index+2] = ROWSTART(i+1)+j;
-          index++;
-
-          verts [3*index]   = ROWSTART(i)+j+1;
-          verts [3*index+1] = ROWSTART(i+1)+j+1;
-          verts [3*index+2] = ROWSTART(i+1)+j;
-          index++;
-        }
-      verts [3*index]   = ROWSTART(i)+j;
-      verts [3*index+1] = ROWSTART(i)+j+1;
-      verts [3*index+2] = ROWSTART(i+1)+j;
-      index++;
-    }
-  verts [3*index]   = ROWSTART(i);
-  verts [3*index+1] = ROWSTART(i)+1;
-  verts [3*index+2] = ROWSTART(i+1);
 
   /* Send points and triangle vertex data to Geomview */

trunk/matml/src/ternary/ternary.h

@@ -104 +104 @@
 /* From book.c */
 int init_triangle_array (int resolution, ternary_point *points);
-int scale_triangle_array (int num_points, ternary_point *points,
-                          double y0, double G0, double y1, double G1,
-                          double *Gmin, double *Gmax);
+int init_triangle_vertices (int resolution, int *vertex_array);
+int scale_energy_array (int num_points, ternary_point *points,
+                        double y0, double G0, double y1, double G1,
+                        double *Gmin, double *Gmax);
 
 #endif /* TERNARY_H */