X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=minimise.h;h=097b8ac42bedc42942799c8919792822e074872b;hp=b0d285d9b1ac16f7c4e09468cd3d5072483eaae5;hb=21a2bd20afe0f4673494f4841a5675ca68cbd2d7;hpb=23c346bb18366c8e9509743aacc5d777bd7f85cb

diff --git a/minimise.h b/minimise.h
index b0d285d..097b8ac 100644
--- a/minimise.h
+++ b/minimise.h
@@ -10,22 +10,23 @@
 double compute_energy(const struct Vertices *vs);
 void energy_init(void);
 
-double graph_layout_cost(const Vertices v);
+double graph_layout_cost(const Vertices v, int section);
 void graph_layout_prepare();
 
-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];
+void compute_vertex_areas(const Vertices vertices, int section);
+void compute_edge_lengths(const Vertices vertices, int section);
 
-extern double density;
+extern double vertex_areas[N], vertex_mean_edge_lengths[N], edge_lengths[N][V6];
 
-double line_bending_adjcost(const Vertices vertices);
-double noncircular_rim_cost(const Vertices vertices);
-double edge_length_variation_cost(const Vertices vertices);
-double rim_proximity_cost(const Vertices vertices);
+double line_bending_cost(const Vertices vertices, int section);
+double noncircular_rim_cost(const Vertices vertices, int section);
+double edge_length_variation_cost(const Vertices vertices, int section);
+double rim_proximity_cost(const Vertices vertices, int section);
 
-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);