Mesh.E e = es.poll();
verts++;
//System.out.println("shatter " + e);
- e.shatter();
+ //e.shatter(e.midpoint(), null, null, true, true);
+ e.shatter(e.midpoint(), null, null, true, false);
Thread.yield();
repaint();
}
Matrix m = Matrix.translate(v);
boolean good = p.move(m, false);
- if (!good) { misses++; return; }
-
- p.reComputeErrorAround();
+ if (!good) { /*misses++;*/ return; }
double new_tile_error = tile.error();
double new_goal_error = goal.error();
double tile_delta = (new_tile_error - tile_error) / tile_error;
double goal_delta = (new_goal_error - goal_error) / goal_error;
double delta = tile_delta + goal_delta;
- double swapProbability = Math.exp((-1 * delta) / (((double)temp)/10000));
+ double swapProbability = Math.exp((-1 * delta) / (((double)temp)/1000000));
boolean doSwap = good && (Math.random() < swapProbability);
//boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
//boolean doSwap = good && (tile_delta + goal_delta <= 0);
goal_error = new_goal_error;
//System.out.println("error: " + tile_error + " / " + goal_error);
hits++;
+ p.goodp = p.p;
} else {
p.move(Matrix.translate(v.times(-1)), true);
misses++;
else if (acceptance > 0.9) gamma = 0.5f;
else if (acceptance > 0.8) gamma = 0.65f;
else if (acceptance > 0.6) gamma = 0.7f;
- else if (acceptance > 0.3) gamma = 0.9f;
- else if (acceptance > 0.15) gamma = 0.95f;
- else if (acceptance > 0.10) gamma = 0.98f;
- else breaks++;
+ else if (acceptance > 0.3) gamma = 0.8f;
+ else if (acceptance > 0.15) gamma = 0.9f;
+ else if (acceptance > 0.05) gamma = 0.95f;
+ else if (acceptance > 0.01) gamma = 0.98f;
+ else { /*breaks++;*/ }
if (seek_upward) {
- if (acceptance > 0.3) seek_upward = false;
+ if (acceptance > 0.2) seek_upward = false;
else gamma = 2-gamma;
}
Thread.yield();
repaint();
}
+ PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
+ for(Mesh.T t : tile) {
+ float max = 5;
+ for(Mesh.E e : new Mesh.E[] { t.e1(), t.e2(), t.e3() }) {
+ if (e==null) continue;
+ if (e.stretchRatio() > max) es.add(e);
+ if (t.aspect() < 0.1 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
+ }
+ }
+
+ for(int i=0; i<5; i++) {
+ Mesh.E e = es.poll();
+ if (e==null) break;
+ e.shatter();
+ }
+ tile.rebindPoints();
+
System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +
"points_per_second=" +
(count*1000)/((double)(System.currentTimeMillis()-then)));
synchronized(safeTriangles) {
safeTriangles.clear();
- for(Mesh.T t : tile) if (t.shouldBeDrawn()) safeTriangles.add(t);
+ for(Mesh.T t : tile)
+ if (t.shouldBeDrawn())
+ safeTriangles.add(t);
}
}
}