some history files; working on 246

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index 29e320795dc587e7fcebecf7b9690f7ff1f3a194..9ce07c429318949d5f9ca74d42c011ad2937a2a3 100644 (file)
--- a/minimise.h
+++ b/minimise.h
@@ -13,21 +13,26 @@ void energy_init(void);
 double graph_layout_cost(const Vertices v, int section);
 void graph_layout_prepare();
 
-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 */
+void compute_vertex_areas(const Vertices vertices, int section);
+void compute_edge_lengths(const Vertices vertices, int section);
+void compute_rim_twist_angles(const Vertices vertices, int section);
 
-extern double vertex_areas[N], vertex_mean_edge_lengths[N], edge_lengths[N][V6];
+//extern double vertex_areas[N], edge_lengths[N][V6];
+extern double vertex_mean_edge_lengths[N];
 
 extern const double edge_angle_cost_circcircrat;
 
+double vertex_displacement_cost(const Vertices vertices, int section);
+double vertex_edgewise_displ_cost(const Vertices vertices, int section);
 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 prop_edge_length_variation_cost(const Vertices vertices, int section);
 double rim_proximity_cost(const Vertices vertices, int section);
+double rim_twist_cost(const Vertices vertices, int section);
 double edge_angle_cost(const Vertices vertices, int section);
 double small_triangles_cost(const Vertices vertices, int section);
+double nonequilateral_triangles_cost(const Vertices vertices, int section);
 
 extern const char *input_file, *best_file;
 extern char *best_file_tmp;