revert normalisation stuff

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index 2043d16249eef6ce6458a0de18030ca20437a52e..2374c92dbeb20c5a0f27783848d8ecf4cb4f3161 100644 (file)
--- a/minimise.h
+++ b/minimise.h
@@ -8,6 +8,7 @@
 #include "mgraph.h"
 
 double compute_energy(const struct Vertices *vs);
+void energy_init(void);
 
 double graph_layout_cost(const Vertices v);
 void graph_layout_prepare();
@@ -16,9 +17,10 @@ void compute_vertex_areas(const Vertices vertices);
 void compute_edge_lengths(const Vertices vertices);
 extern double vertex_areas[N], vertex_mean_edge_lengths[N], edge_lengths[N][V6];
 
+double line_bending_cost(const Vertices vertices);
 double noncircular_rim_cost(const Vertices vertices);
-double edgewise_vertex_displacement_cost(const Vertices vertices);
 double edge_length_variation_cost(const Vertices vertices);
+double rim_proximity_cost(const Vertices vertices);
 
 extern const char *input_file, *output_file;
 extern char *output_file_tmp;