and the stop epsilon, from size hovering around 7.something e-4

[moebius2.git] / energy.c

diff --git a/energy.c b/energy.c
index 2b6c04cf98a41d878f064d1ae8e38af666558de2..09c54811520c45ca3a43a79464afa15ebe262619 100644 (file)
--- a/energy.c
+++ b/energy.c
@@ -51,8 +51,8 @@ static const CostContribution costs[]= {
 
 #if XBITS==4
 #define STOP_EPSILON 5e-3
-    COST(  3e3,   vertex_displacement_cost) // NB this is probably wrong now
-    COST(  3e3,   vertex_edgewise_displ_cost) // we have changed the power
+    COST(  3e4,   vertex_displacement_cost) // NB this is probably wrong now
+    COST(  3e4,   vertex_edgewise_displ_cost) // we have changed the power
     COST( 0.2e3,  rim_proximity_cost)
     COST( 1e4,  rim_twist_cost)
     COST(  1e12,   noncircular_rim_cost)
@@ -76,10 +76,10 @@ static const CostContribution costs[]= {
 #endif
 
 #if XBITS==6
-#define STOP_EPSILON 1.2e-4
-    COST(  3e3,   vertex_displacement_cost)
-    COST(  3e3,   vertex_edgewise_displ_cost)
-    COST( 0.02e0,  rim_proximity_cost)
+#define STOP_EPSILON 8e-4
+    COST(  3e4,   vertex_displacement_cost)
+    COST(  3e4,   vertex_edgewise_displ_cost)
+    COST( 3e-2,  rim_proximity_cost)
     COST(  1e4,  rim_twist_cost)
     COST(  1e12,   noncircular_rim_cost)
     COST(  10e1,   nonequilateral_triangles_cost)