add nprocessors utility

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index b0d285d9b1ac16f7c4e09468cd3d5072483eaae5..a0761250e28ae5131988c0c10f7bed321bb16a4f 100644 (file)
--- a/minimise.h
+++ b/minimise.h
@@ -17,15 +17,15 @@ 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];
 
-extern double density;
-
-double line_bending_adjcost(const Vertices vertices);
+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);
 
-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);