X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=minimise.h;h=c2e13e7b40fef83169495c5b2754fc91333c90d1;hb=135adb1269cc41c10ebaf03e72d7258fd9e88a7d;hp=60efb3e53a07d83985cb277e927d400897d4c988;hpb=ca6581b23c843e3117d3450a4ecf13bd6b71b8a5;p=moebius2.git

diff --git a/minimise.h b/minimise.h
index 60efb3e..c2e13e7 100644
--- a/minimise.h
+++ b/minimise.h
@@ -10,19 +10,22 @@
 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);
+void compute_vertex_areas(const Vertices vertices, int section);
+void compute_edge_lengths(const Vertices vertices, int section);
+
 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 edge_length_variation_cost(const Vertices vertices);
-double rim_proximity_cost(const Vertices vertices);
-double edge_angle_cost(const Vertices vertices);
-double small_triangles_cost(const Vertices vertices);
+extern const double edge_angle_cost_circcircrat;
+
+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);
+double edge_angle_cost(const Vertices vertices, int section);
+double small_triangles_cost(const Vertices vertices, int section);
 
 extern const char *input_file, *best_file;
 extern char *best_file_tmp;