From: Ian Jackson <ian@turbine>
Date: Wed, 8 Oct 2008 23:24:52 +0000 (+0100)
Subject: stopping point for 64
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=commitdiff_plain;h=6df67fc7061e6fae41fec8c05b9e49e4e393c733

stopping point for 64
---

diff --git a/Makefile b/Makefile
index 221eadb..50badd1 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ all:		$(TARGETS)
 
 compute:	all
 		$(MAKE) best-33.CFM
-		$(MAKE) best-968.CFM
+		$(MAKE) best-64.CFM
+#		$(MAKE) best-968.CFM
 
 minimise:	energy.o graph.o common.o mgraph.o minimise.o half.o
 		$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
diff --git a/energy.c b/energy.c
index 164dcdf..308aebf 100644
--- a/energy.c
+++ b/energy.c
@@ -46,7 +46,7 @@ static const CostContribution costs[]= {
 #endif
 
 #if XBITS==4
-#define STOP_EPSILON 1e-6
+#define STOP_EPSILON 1.2e-4
     COST(  3e5,   line_bending_cost)
     COST( 10e3,   edge_length_variation_cost)
     COST( 9.0e3,  rim_proximity_cost) // 5e1 is too much