merge

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index f75bc571912ca4d596fe8fa4413765ed5747d10e..4999fd04790bab482f69acba42fa46d74814addc 100644 (file)
--- a/minimise.h
+++ b/minimise.h
@@ -21,13 +21,16 @@ extern double vertex_areas[N], vertex_mean_edge_lengths[N], edge_lengths[N][V6];
 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;