From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Sun, 6 Jan 2008 20:38:53 +0000 (+0000)
Subject: add noncircular, now it collapses
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=adb7009271496415357968a8b8a886706cc2906e;p=moebius2.git

add noncircular, now it collapses
---

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);