chiark / gitweb /
scale 125 seems to work ish although could be more bowl-like
authorIan Jackson <ian@turbine>
Mon, 20 Oct 2008 23:57:23 +0000 (00:57 +0100)
committerIan Jackson <ian@turbine>
Mon, 20 Oct 2008 23:57:23 +0000 (00:57 +0100)
energy.c

index 448fefa..2f8a854 100644 (file)
--- a/energy.c
+++ b/energy.c
@@ -53,7 +53,7 @@ static const CostContribution costs[]= {
 #define STOP_EPSILON 5e-3
     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( 2e2,  rim_proximity_cost)
     COST( 1e4,  rim_twist_cost)
     COST(  1e12,   noncircular_rim_cost)
     COST(  10e1,   nonequilateral_triangles_cost)
@@ -63,7 +63,7 @@ static const CostContribution costs[]= {
 #endif
 
 #if XBITS==5
-#define STOP_EPSILON 1e-5
+#define STOP_EPSILON 7e-4
     COST(  3e4,   vertex_displacement_cost)
     COST(  3e4,   vertex_edgewise_displ_cost)
     COST(  2e-1,  rim_proximity_cost)
@@ -77,10 +77,10 @@ static const CostContribution costs[]= {
 
 #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)
-    COST(  1e4,  rim_twist_cost)
+    COST(  3e4,   vertex_displacement_cost)
+    COST(  3e4,   vertex_edgewise_displ_cost)
+    COST( 2e-1,  rim_proximity_cost)
+    COST(  1e3,  rim_twist_cost)
     COST(  1e12,   noncircular_rim_cost)
     COST(  10e1,   nonequilateral_triangles_cost)
 //    COST(  1e1,   small_triangles_cost)