rename things more sensibly; now it can optimise but the edgewise vertex formula...

[moebius2.git] / energy.c

diff --git a/energy.c b/energy.c
index d673c14ea2820fd7e8e59b45678f486a842572a0..54c73faff22786536eabcbf66a3d76f6af863869 100644 (file)
--- a/energy.c
+++ b/energy.c
@@ -9,8 +9,8 @@
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_multimin.h>
 
-#define BEST_F "best"
-#define INITIAL_F "initial"
+static const char *input_file, *output_file;
+static char *output_file_tmp;
 
 static double edgewise_vertex_displacement_cost(const Vertices vertices);
 static double noncircular_rim_cost(const Vertices vertices);
@@ -41,10 +41,10 @@ static double compute_energy(const Vertices vertices) {
     
     printf(" BEST");
     
-    best_f= fopen(BEST_F ".new","wb");  if (!best_f) diee("fopen new best");
+    best_f= fopen(output_file_tmp,"wb");  if (!best_f) diee("fopen new out");
     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");
+    if (rename(output_file_tmp,output_file)) diee("rename install new best");
 
     best_energy= energy;
   }
@@ -129,7 +129,12 @@ int main(int argc, const char *const *argv) {
   gsl_vector initial_gsl, step_size_gsl;
   int r, v, k;
   
-  if (argc>1) { fputs("takes no arguments\n",stderr); exit(8); }
+  if (argc!=3 || argv[1][0]=='-' || strncmp(argv[2],"-o",2))
+    { fputs("usage: minimise <input> -o<output\n",stderr); exit(8); }
+
+  input_file= argv[1];
+  output_file= argv[2]+2;
+  if (asprintf(&output_file_tmp,"%s.new",output_file) <= 0) diee("asprintf");
 
   minimiser= gsl_multimin_fminimizer_alloc
     (gsl_multimin_fminimizer_nmsimplex, DIM);
@@ -139,7 +144,7 @@ int main(int argc, const char *const *argv) {
   multimin_function.n= DIM;
   multimin_function.params= 0;
 
-  initial_f= fopen(INITIAL_F,"rb");  if (!initial_f) diee("fopen initial");
+  initial_f= fopen(input_file,"rb");  if (!initial_f) diee("fopen initial");
   errno= 0; r= fread(initial,sizeof(initial),1,initial_f);
   if (r!=1) diee("fread");
   fclose(initial_f);
@@ -154,7 +159,7 @@ int main(int argc, const char *const *argv) {
   step_size_gsl.data= &step_size[0][0];
 
   FOR_VERTEX(v)
-    K step_size[v][k]= 0.01;
+    K step_size[v][k]= 0.03;
 //int vx,vy;
 //  FOR_RIM_VERTEX(vx,vy,v)
 //    step_size[v][3] *= 0.1;