stopping point for 64

diff --git a/Makefile b/Makefile
index 221eadbe3f14d45bfa20510cefbba88a86434847..50badd1e820b6ad7036b615e51648e0582700a02 100644 (file)
--- 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 164dcdf04b74487f804bafcde44e58c8db63e4fd..308aebfa3f890aea945bafc0aa38fc1feb18f9c8 100644 (file)
--- 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