chiark / gitweb /
adjusted costs for 64
authorIan Jackson <ian@turbine>
Wed, 8 Oct 2008 22:07:27 +0000 (23:07 +0100)
committerIan Jackson <ian@turbine>
Wed, 8 Oct 2008 22:07:27 +0000 (23:07 +0100)
energy.c

index 368abc4..164dcdf 100644 (file)
--- a/energy.c
+++ b/energy.c
@@ -48,13 +48,13 @@ static const CostContribution costs[]= {
 #if XBITS==4
 #define STOP_EPSILON 1e-6
     COST(  3e5,   line_bending_cost)
-    COST( 10e2,   edge_length_variation_cost)
-    COST( 9.0e1,  rim_proximity_cost) // 5e1 is too much
+    COST( 10e3,   edge_length_variation_cost)
+    COST( 9.0e3,  rim_proximity_cost) // 5e1 is too much
                                      // 2.5e1 is too little
     // 0.2e1 grows compared to previous ?
     // 0.6e0 shrinks compared to previous ?
 
-    COST(  1e12,   edge_angle_cost)
+//    COST(  1e12,   edge_angle_cost)
                   #define EDGE_ANGLE_COST_CIRCCIRCRAT (0.5/1.3)
     COST(  1e18,   noncircular_rim_cost)
 #endif