X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=minimise.h;h=9ce07c429318949d5f9ca74d42c011ad2937a2a3;hp=c2e13e7b40fef83169495c5b2754fc91333c90d1;hb=HEAD;hpb=c3fc916a828edf56f715a88e6a20f450c8b40fbd

diff --git a/minimise.h b/minimise.h
index c2e13e7..9ce07c4 100644
--- a/minimise.h
+++ b/minimise.h
@@ -15,17 +15,24 @@ void graph_layout_prepare();
 
 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;