X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=energy.c;h=19f32e2fa3a0459ab94339a202b6844120b0a8b1;hp=c0090677b40f43c4cb09da43b36412741a06c63d;hb=32c7d2a5c5cb58ed3a8fb9fc383a31a80b01c052;hpb=30d841cc8a4e2ae0bec21b58e3c73057e4286f06

diff --git a/energy.c b/energy.c
index c009067..19f32e2 100644
--- a/energy.c
+++ b/energy.c
@@ -36,30 +36,39 @@ static const CostContribution costs[]= {
 
 #if XBITS==3
 #define STOP_EPSILON 1e-6
-    COST(  3e3,   line_bending_cost)
-    COST(  3e3,   edge_length_variation_cost)
+    COST(  3e3,   vertex_displacement_cost)
     COST( 0.4e3,  rim_proximity_cost)
-    COST(  1e6,   edge_angle_cost)
+    COST(  1e7,   edge_angle_cost)
+                  #define EDGE_ANGLE_COST_CIRCCIRCRAT (0.2/1.7)
+    COST(  1e2,   small_triangles_cost)
+    COST(  1e12,   noncircular_rim_cost)
+#endif
+
+#if XBITS==4
+#define STOP_EPSILON 1.2e-4
+    COST(  3e3,   vertex_displacement_cost)
+    COST( 0.2e3,  rim_proximity_cost)
+//    COST(  1e6,   edge_angle_cost)
                   #define EDGE_ANGLE_COST_CIRCCIRCRAT (0.5/1.7)
 //    COST(  1e1,   small_triangles_cost)
     COST(  1e12,   noncircular_rim_cost)
 #endif
 
-#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
+#if XBITS==5
+#define STOP_EPSILON 1.2e-4
+    COST(  3e7,   line_bending_cost)
+    COST( 10e2,   prop_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
 
-#if XBITS==5
+#if XBITS>=6 /* nonsense follows but never mind */
 #define STOP_EPSILON 1e-6
     COST(  3e5,   line_bending_cost)
     COST( 10e2,   edge_length_variation_cost)
@@ -89,7 +98,7 @@ void compute_energy_separately(const struct Vertices *vs,
   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++)
@@ -204,7 +213,47 @@ void compute_vertex_areas(const Vertices vertices, int section) {
   }
 }
 
-/*---------- Edgewise vertex displacement ----------*/
+/*---------- combined vertex displacement ----------*/
+
+  /*
+   *   At vertex Q considering edge direction e to R
+   *   and corresponding opposite edge to P.
+   *
+   *   Let  R' = Q + PQ
+   *        D  = R' - R
+   *                                                             delta
+   *              [       -1                                    ]
+   *   cost    =  [ lambda  . ( D . PQ/|PQ| ) + | D x PQ/|PQ| | ]
+   *       Q,e    [ ------------------------------------------- ]
+   *              [                      |PQ|                   ]
+   */
+
+double vertex_displacement_cost(const Vertices vertices, int section) {
+  const double inv_lambda= 1.0/1; //2;
+  const double delta= 4;
+  const double pqlen2_epsilon= 1e-12;
+
+  int pi,e,qi,ri, k;
+  double pq[D3], d[D3], ddot, dcross[D3];
+  double total_cost= 0;
+
+  FOR_EDGE(qi,e,ri, OUTER) {
+    pi= EDGE_END2(qi,(e+3)%V6); if (pi<0) continue;
+
+    K pq[k]= -vertices[pi][k] + vertices[qi][k];
+    K d[k]= vertices[qi][k] + pq[k] - vertices[ri][k];
+    ddot= dotprod(d,pq);
+    xprod(dcross, d,pq);
+    double pqlen2= magnD2(pq);
+    double cost_basis= inv_lambda * ddot + magnD(dcross);
+    double cost= pow(cost_basis / (pqlen2 + pqlen2_epsilon), delta);
+
+    total_cost += cost;
+  }
+  return total_cost;
+}
+
+/*---------- at-vertex edge angles ----------*/
 
   /*
    * Definition:
@@ -289,6 +338,34 @@ double edge_length_variation_cost(const Vertices vertices, int section) {
   return cost;
 }
 
+/*---------- proportional edge length variation ----------*/
+
+  /*
+   * Definition:
+   *
+   *    See the diagram above.
+   *                                r
+   *       cost    = ( |PQ| - |QR| )
+   *           Q,e
+   */
+
+double prop_edge_length_variation_cost(const Vertices vertices, int section) {
+  const double num_epsilon= 1e-6;
+
+  double cost= 0, exponent_r= 2;
+  int q, e,r, eback;
+
+  FOR_EDGE(q,e,r, OUTER) {
+    eback= edge_reverse(q,e);
+    double le= edge_lengths[q][e];
+    double leback= edge_lengths[q][eback];
+    double diff= le - leback;
+    double num= MIN(le, leback);
+    cost += pow(diff / (num + num_epsilon), exponent_r);
+  }
+  return cost;
+}
+
 /*---------- rim proximity cost ----------*/
 
 static void find_nearest_oncircle(double oncircle[D3], const double p[D3]) {