wip new energy functions

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index 2374c92dbeb20c5a0f27783848d8ecf4cb4f3161..60efb3e53a07d83985cb277e927d400897d4c988 100644 (file)
--- a/minimise.h
+++ b/minimise.h
@@ -21,9 +21,13 @@ double line_bending_cost(const Vertices vertices);
 double noncircular_rim_cost(const Vertices vertices);
 double edge_length_variation_cost(const Vertices vertices);
 double rim_proximity_cost(const Vertices vertices);
+double edge_angle_cost(const Vertices vertices);
+double small_triangles_cost(const Vertices vertices);
 
-extern const char *input_file, *output_file;
-extern char *output_file_tmp;
+extern const char *input_file, *best_file;
+extern char *best_file_tmp;
+extern long long evaluations;
+extern double stop_epsilon;
 
 enum printing_instance { pr_cost, pr_size, pr__max };
 int printing_check(enum printing_instance, int indent);