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

diff --git a/energy.c b/energy.c
index ed50bc7e0effa6d235d6c29d02c22aab7feee5b5..a54cfe2f93bf07ab70d0f9bce02639a868bd9b1b 100644 (file)
--- 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 8636b91bff06efdcbdfcf275123874f514eb9402..714ff7ffb72319e2d9a874e615ad7cf8b0814fa1 100644 (file)
--- 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)