X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=minimise.c;fp=minimise.c;h=8f6a26173c5a9d6e39e1c658432384a8e7aeb5e5;hb=58a4b8719e43b27e6ae5493c9bfe32741d71c235;hp=e5bbc87bb6e3523ec43cd50b9665a80aae281b96;hpb=97ef96dd318b684d829ac950403582788df427d8;p=moebius2.git
diff --git a/minimise.c b/minimise.c
index e5bbc87..8f6a261 100644
--- a/minimise.c
+++ b/minimise.c
@@ -37,14 +37,16 @@
#include "half.h"
#include "minimise.h"
-const char *input_file, *output_file;
-char *output_file_tmp;
+const char *input_file, *best_file;
+char *best_file_tmp;
+long long evaluations;
static void printing_init(void);
-static gsl_multimin_fminimizer *minimiser;
-
static const double stop_epsilon= 1e-6;
+static gsl_multimin_fminimizer *minimiser;
+static const char *final_file;
+static char *final_file_tmp;
static double minfunc_f(const gsl_vector *x, void *params) {
struct Vertices vs;
@@ -55,6 +57,11 @@ static double minfunc_f(const gsl_vector *x, void *params) {
return compute_energy(&vs);
}
+static void badusage(void) {
+ fputs("usage: minimise [-i] -o