X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=minimise.h;h=c2e13e7b40fef83169495c5b2754fc91333c90d1;hb=b955d8410f03c81aaac9406a8e335229bb8baf51;hp=097b8ac42bedc42942799c8919792822e074872b;hpb=21a2bd20afe0f4673494f4841a5675ca68cbd2d7;p=moebius2.git diff --git a/minimise.h b/minimise.h index 097b8ac..c2e13e7 100644 --- a/minimise.h +++ b/minimise.h @@ -18,10 +18,14 @@ void compute_edge_lengths(const Vertices vertices, int section); extern double vertex_areas[N], vertex_mean_edge_lengths[N], edge_lengths[N][V6]; +extern const double edge_angle_cost_circcircrat; + double line_bending_cost(const Vertices vertices, int section); double noncircular_rim_cost(const Vertices vertices, int section); double edge_length_variation_cost(const Vertices vertices, int section); double rim_proximity_cost(const Vertices vertices, int section); +double edge_angle_cost(const Vertices vertices, int section); +double small_triangles_cost(const Vertices vertices, int section); extern const char *input_file, *best_file; extern char *best_file_tmp;