X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=energy.c;h=d673c14ea2820fd7e8e59b45678f486a842572a0;hp=89b56e219871247896580f5f266f0dc1515876bf;hb=fa669dcecb20a097bca7b2ecf5e509abcd68db82;hpb=83051837693783280938bf36e9e43c7687736753

diff --git a/energy.c b/energy.c
index 89b56e2..d673c14 100644
--- a/energy.c
+++ b/energy.c
@@ -18,8 +18,8 @@ static double noncircular_rim_cost(const Vertices vertices);
 static void compute_vertex_areas(const Vertices vertices, double areas[N]);
 static double best_energy= DBL_MAX;
 
-static void cost(double *energy, double tweight, double tcost);
-#define COST(weight, compute) cost(&energy, (weight), (compute))
+static void addcost(double *energy, double tweight, double tcost);
+#define COST(weight, compute) addcost(&energy, (weight), (compute))
 
 /*---------- main energy computation and subroutines ----------*/
 
@@ -30,9 +30,9 @@ static double compute_energy(const Vertices vertices) {
   energy= 0;
   printf("cost > energy |");
 
-  COST(1000.0, edgewise_vertex_displacement_cost(vertices));
-  COST(1.0,    graph_layout_cost(vertices,vertex_areas));
-  COST(1e3,    noncircular_rim_cost(vertices));
+  COST(1e4, edgewise_vertex_displacement_cost(vertices));
+  COST(1e2, graph_layout_cost(vertices,vertex_areas));
+  COST(1e4, noncircular_rim_cost(vertices));
   
   printf("| total %# e |", energy);
   if (energy < best_energy) {
@@ -42,9 +42,11 @@ static double compute_energy(const Vertices vertices) {
     printf(" BEST");
     
     best_f= fopen(BEST_F ".new","wb");  if (!best_f) diee("fopen new best");
-    r= fwrite(vertices,sizeof(vertices),1,best_f); if (r!=1) diee("fwrite");
+    r= fwrite(vertices,sizeof(Vertices),1,best_f); if (r!=1) diee("fwrite");
     if (fclose(best_f)) diee("fclose new best");
     if (rename(BEST_F ".new", BEST_F)) diee("rename install new best");
+
+    best_energy= energy;
   }
   putchar('\n');
   flushoutput();
@@ -52,7 +54,7 @@ static double compute_energy(const Vertices vertices) {
   return energy;
 }    
 
-static void cost(double *energy, double tweight, double tcost) {
+static void addcost(double *energy, double tweight, double tcost) {
   double tenergy= tweight * tcost;
   printf(" %# e > %# e |", tcost, tenergy);
   *energy += tenergy;
@@ -125,7 +127,7 @@ int main(int argc, const char *const *argv) {
   Vertices initial, step_size;
   FILE *initial_f;
   gsl_vector initial_gsl, step_size_gsl;
-  int r, v, vx,vy, k;
+  int r, v, k;
   
   if (argc>1) { fputs("takes no arguments\n",stderr); exit(8); }
 
@@ -148,13 +150,14 @@ int main(int argc, const char *const *argv) {
   initial_gsl.owner= 0;
   step_size_gsl= initial_gsl;
 
-  initial_gsl.data= (double*)initial;
-  step_size_gsl.data= (double*)step_size;
+  initial_gsl.data= &initial[0][0];
+  step_size_gsl.data= &step_size[0][0];
 
   FOR_VERTEX(v)
-    K step_size[v][k]= 1e-3;
-  FOR_RIM_VERTEX(vx,vy,v)
-    step_size[v][3] *= 0.1;
+    K step_size[v][k]= 0.01;
+//int vx,vy;
+//  FOR_RIM_VERTEX(vx,vy,v)
+//    step_size[v][3] *= 0.1;
 
   GA( gsl_multimin_fminimizer_set(minimiser, &multimin_function,
 				  &initial_gsl, &step_size_gsl) );
@@ -165,7 +168,7 @@ int main(int argc, const char *const *argv) {
     size= gsl_multimin_fminimizer_size(minimiser);
     r= gsl_multimin_test_size(size, stop_epsilon);
 
-    printf("size %# e, r=%d\n", size, r);
+    printf("%*s size %# e, r=%d\n", 135,"", size, r);
     flushoutput();
 
     if (r==GSL_SUCCESS) break;
@@ -247,8 +250,6 @@ static double edgewise_vertex_displacement_cost(const Vertices vertices) {
   FOR_EDGE(pi,e,qi) {
     ri= EDGE_END2(pi,(e+1)%V6); if (ri<0) continue;
     si= EDGE_END2(pi,(e+5)%V6); if (si<0) continue;
-    /* assert(ri == EDGE_END2(qi,(e+2)%V6)); */
-    /* assert(si == EDGE_END2(qi,(e+4)%V6)); */
     
     K m[k]= (vertices[pi][k] + vertices[qi][k]) * 0.5;
     K mprime[k]= (vertices[ri][k] + vertices[si][k]) * 0.5;