From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Sun, 6 Jan 2008 18:18:23 +0000 (+0000)
Subject: run at sane speed, turn all on, need to rethink cost function a bit
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=commitdiff_plain;h=190a54bc07e4c1497938a31373543650d3f19c55

run at sane speed, turn all on, need to rethink cost function a bit
---

diff --git a/energy.c b/energy.c
index ed50bc7..a54cfe2 100644
--- a/energy.c
+++ b/energy.c
@@ -27,7 +27,7 @@ double compute_energy(const struct Vertices *vs) {
 
   COST(1e2, edgewise_vertex_displacement_cost(vs->a));
   COST(1e2, graph_layout_cost(vs->a,vertex_areas));
-//  COST(1e4, noncircular_rim_cost(vs->a));
+  COST(1e6, noncircular_rim_cost(vs->a));
 
   if (printing) printf("| total %# e |", energy);
 
diff --git a/mgraph.h b/mgraph.h
index 8636b91..714ff7f 100644
--- a/mgraph.h
+++ b/mgraph.h
@@ -69,9 +69,9 @@
 
 #include "common.h"
 
-#define XBITS 4
+#define XBITS 3
 #define X (1<<XBITS)
-#define YBITS 4
+#define YBITS 3
 #define Y ((1<<YBITS) - 1)
 
 #define N (X*Y)