X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=energy.c;h=c0090677b40f43c4cb09da43b36412741a06c63d;hb=ad8f9959ed7e147b88a57a7634c78faa69cefc6a;hp=f6a4c290c5883d2c04ef0b9150717cc991f409b6;hpb=c3fc916a828edf56f715a88e6a20f450c8b40fbd;p=moebius2.git

diff --git a/energy.c b/energy.c
index f6a4c29..c009067 100644
--- a/energy.c
+++ b/energy.c
@@ -59,6 +59,20 @@ static const CostContribution costs[]= {
     COST(  1e18,   noncircular_rim_cost)
 #endif
 
+#if XBITS==5
+#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
+				      // 2.5e1 is too little
+    // 0.2e1 grows compared to previous ?
+    // 0.6e0 shrinks compared to previous ?
+
+    COST(  1e12,   edge_angle_cost)
+                  #define EDGE_ANGLE_COST_CIRCCIRCRAT (0.5/1.3)
+    COST(  1e18,   noncircular_rim_cost)
+#endif
+
 };
 
 const double edge_angle_cost_circcircrat= EDGE_ANGLE_COST_CIRCCIRCRAT;