X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=energy.c;h=49d4e434e9243b037905b98afb5a2ae975a2fc7f;hb=adb7009271496415357968a8b8a886706cc2906e;hp=5e6de24e80186364a26855e6587b9f1a54cfb27a;hpb=a602fc812857788265c72c27b132f34b9d7d107c;p=moebius2.git diff --git a/energy.c b/energy.c index 5e6de24..49d4e43 100644 --- a/energy.c +++ b/energy.c @@ -30,7 +30,7 @@ double compute_energy(const struct Vertices *vs) { COST(1e2, edgewise_vertex_displacement_cost(vs->a)); COST(1e2, graph_layout_cost(vs->a)); COST(1e3, edge_length_variation_cost(vs->a)); -// COST(1e6, noncircular_rim_cost(vs->a)); + COST(1e8, noncircular_rim_cost(vs->a)); if (printing) printf("| total %# e |", energy);