#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)
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++)
edge_lengths[v1][e]= hypotD(vertices[v1],vertices[v2]);
}
-#include <pthread.h>
-
void compute_vertex_areas(const Vertices vertices, int section) {
int v0,v1,v2, e1,e2;
// int k;
}
}
-/*---------- 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:
double a[D3], b[D3], axb[D3];
double total_cost= 0;
- if (quitting_last_iteration) {
- char buf[100];
- int n= sprintf(buf,
- "section=%d thr=%#08lx qi=0x%03x START\n",
- section,(unsigned long)pthread_self(), N);
- write(2,buf,n);
- quitting_reported_threads= 1;
- }
-
FOR_EDGE(qi,e,ri, OUTER) {
- if (quitting_last_iteration) {
- char buf[100];
- int n= sprintf(buf,
- "section=%d thr=%#08lx qi=0x%03x,e=%d,ri=0x%03x\n",
- section,(unsigned long)pthread_self(),qi,e,ri);
- write(2,buf,n);
- }
-
pi= EDGE_END2(qi,(e+3)%V6); if (pi<0) continue;
//if (!(qi&XMASK)) fprintf(stderr,"%02x-%02x-%02x (%d)\n",pi,qi,ri,e);
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]) {