add nprocessors utility

[moebius2.git] / minimise.h

diff --git a/minimise.h b/minimise.h
index 4ac64a93ab88e9b5b6a0ea37cb612562d979c14b..a0761250e28ae5131988c0c10f7bed321bb16a4f 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,14 +17,17 @@ 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;
+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 printing_check(enum printing_instance, int indent);
 
 #endif /*MINIMISE_H*/