Merge multiprocessor support; fix up Makefile runes

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index a8a2288f5c14b38a1993ab84b4133070ce317fbc..c2e13e7b40fef83169495c5b2754fc91333c90d1 100644 (file)
--- 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 circcircrat);
-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;