X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=minimise.h;h=a0761250e28ae5131988c0c10f7bed321bb16a4f;hb=b80ac2586e60a67554af86a8345ccff79af8a570;hp=f1da76f1103458e54f32af6107511f42d947956c;hpb=13f94397661f67256a68849da13d2029880647c2;p=moebius2.git

diff --git a/minimise.h b/minimise.h
index f1da76f..a076125 100644
--- a/minimise.h
+++ b/minimise.h
@@ -8,6 +8,7 @@
 #include "mgraph.h"
 
 double compute_energy(const struct Vertices *vs);
+void energy_init(void);
 
 double graph_layout_cost(const Vertices v);
 void graph_layout_prepare();
@@ -16,13 +17,15 @@ void compute_vertex_areas(const Vertices vertices);
 void compute_edge_lengths(const Vertices vertices);
 extern double vertex_areas[N], vertex_mean_edge_lengths[N], edge_lengths[N][V6];
 
+double line_bending_cost(const Vertices vertices);
 double noncircular_rim_cost(const Vertices vertices);
-double edgewise_vertex_displacement_cost(const Vertices vertices);
 double edge_length_variation_cost(const Vertices vertices);
 double rim_proximity_cost(const Vertices vertices);
 
-extern const char *input_file, *output_file;
-extern char *output_file_tmp;
+extern const char *input_file, *best_file;
+extern char *best_file_tmp;
+extern long long evaluations;
+extern double stop_epsilon;
 
 enum printing_instance { pr_cost, pr_size, pr__max };
 int printing_check(enum printing_instance, int indent);