bugfixes, smaller size

[moebius2.git] / energy.c

diff --git a/energy.c b/energy.c
index 3c76b0cc207383a098ba794e900affba613b5d8a..f6907bcfda9151eea1b8cd7d4666e66f88fba7f7 100644 (file)
--- a/energy.c
+++ b/energy.c
@@ -32,7 +32,7 @@ static double compute_energy(const Vertices vertices) {
 
   COST(1000.0, edgewise_vertex_displacement_cost(vertices));
   COST(1.0,    graph_layout_cost(vertices,vertex_areas));
-  COST(1e3,    noncircular_rim_cost(vertices));
+  COST(1e-30,    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();
@@ -148,11 +150,11 @@ 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;
+    K step_size[v][k]= 1e-4;
   FOR_RIM_VERTEX(vx,vy,v)
     step_size[v][3] *= 0.1;