stopping point for 64

[moebius2.git] / energy.c

diff --git a/energy.c b/energy.c
index c0090677b40f43c4cb09da43b36412741a06c63d..308aebfa3f890aea945bafc0aa38fc1feb18f9c8 100644 (file)
--- a/energy.c
+++ b/energy.c
@@ -46,20 +46,20 @@ static const CostContribution costs[]= {
 #endif
 
 #if XBITS==4
 #endif
 
 #if XBITS==4

-#define STOP_EPSILON 1e-6
+#define STOP_EPSILON 1.2e-4

     COST(  3e5,   line_bending_cost)
     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 ?
 
                                      // 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
 
                   #define EDGE_ANGLE_COST_CIRCCIRCRAT (0.5/1.3)
     COST(  1e18,   noncircular_rim_cost)
 #endif
 

-#if XBITS==5
+#if XBITS>=5 /* nonsense follows but never mind */

 #define STOP_EPSILON 1e-6
     COST(  3e5,   line_bending_cost)
     COST( 10e2,   edge_length_variation_cost)
 #define STOP_EPSILON 1e-6
     COST(  3e5,   line_bending_cost)
     COST( 10e2,   edge_length_variation_cost)


@@ -89,7 +89,7 @@ void compute_energy_separately(const struct Vertices *vs,
   int ci;
   
   for (ci=0; ci<NPRECOMPS; ci++) {
   int ci;
   
   for (ci=0; ci<NPRECOMPS; ci++) {

-    costs[ci].fn(vs->a, section);
+    precomps[ci](vs->a, section);

     inparallel_barrier();
   }
   for (ci=0; ci<NCOSTS; ci++)
     inparallel_barrier();
   }
   for (ci=0; ci<NCOSTS; ci++)