attempts to fix 125; really need to combine edge length variation and bending costs

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index 097b8ac42bedc42942799c8919792822e074872b..c611b89edf5f3b48ecc15549b7db3bd575724bc4 100644 (file)
--- a/minimise.h
+++ b/minimise.h
@@ -18,10 +18,15 @@ void compute_edge_lengths(const Vertices vertices, int section);
 
 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 prop_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;