chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor improvements
[moebius2.git]
/
minimise.h
diff --git
a/minimise.h
b/minimise.h
index 74788d3fbe862b55e3ba4459adbf98dd58dd6685..4ac64a93ab88e9b5b6a0ea37cb612562d979c14b 100644
(file)
--- a/
minimise.h
+++ b/
minimise.h
@@
-9,11
+9,16
@@
double compute_energy(const struct Vertices *vs);
double compute_energy(const struct Vertices *vs);
-double graph_layout_cost(const Vertices v
, const double vertex_areas[N]
);
+double graph_layout_cost(const Vertices v);
void graph_layout_prepare();
void graph_layout_prepare();
+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 noncircular_rim_cost(const Vertices vertices);
double edgewise_vertex_displacement_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);
extern const char *input_file, *output_file;
extern char *output_file_tmp;
extern const char *input_file, *output_file;
extern char *output_file_tmp;