X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=minimise.h;fp=minimise.h;h=f4eddfb222bfe4bb165475bffcb4d7d95e7300e3;hb=0fdb5046fb643441d6b4077e728769b92a89953e;hp=c611b89edf5f3b48ecc15549b7db3bd575724bc4;hpb=7cf56bef3c00a77e2432fbd499d79f06ff768752;p=moebius2.git

diff --git a/minimise.h b/minimise.h
index c611b89..f4eddfb 100644
--- a/minimise.h
+++ b/minimise.h
@@ -20,6 +20,8 @@ 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);
@@ -27,6 +29,7 @@ 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);
+double nonequilateral_triangles_cost(const Vertices vertices, int section);
 
 extern const char *input_file, *best_file;
 extern char *best_file_tmp;