fix threading bugs and arrangements

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index 74788d3fbe862b55e3ba4459adbf98dd58dd6685..29e320795dc587e7fcebecf7b9690f7ff1f3a194 100644 (file)
--- a/minimise.h
+++ b/minimise.h
@@ -8,17 +8,33 @@
 #include "mgraph.h"
 
 double compute_energy(const struct Vertices *vs);
+void energy_init(void);
 
-double graph_layout_cost(const Vertices v, const double vertex_areas[N]);
+double graph_layout_cost(const Vertices v, int section);
 void graph_layout_prepare();
 
-double noncircular_rim_cost(const Vertices vertices);
-double edgewise_vertex_displacement_cost(const Vertices vertices);
+double compute_vertex_areas(const Vertices vertices, int section);
+double compute_edge_lengths(const Vertices vertices, int section);
+ /* these don't actually return anything interesting - they're just
+  * like this so they fit into the parallel/sequential scheme */
 
-extern const char *input_file, *output_file;
-extern char *output_file_tmp;
+extern double vertex_areas[N], vertex_mean_edge_lengths[N], edge_lengths[N][V6];
+
+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;
+extern long long evaluations;
+extern double stop_epsilon;
 
 enum printing_instance { pr_cost, pr_size, pr__max };
-int printing_check(enum printing_instance);
+int printing_check(enum printing_instance, int indent);
 
 #endif /*MINIMISE_H*/