X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=14e6bcde90370a13bf1d2b46fccaf5311619a53a;hp=fa6905892713c92fcdc8f90b368de703987ddc72;hb=db91e356d433030537508cacbf91bce9dd82f38f;hpb=85bf586c55813abe79fab0476e2196700a6d0ea1 diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index fa69058..14e6bcd 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -51,6 +51,7 @@ public class Main extends MeshViewer { /** magnification factor */ private static final float MAG = 1; + public static final float MATCHING_EPSILON = 0.01f; public Main(StlFile stlf, Frame f) { super(f); @@ -86,22 +87,30 @@ public class Main extends MeshViewer { float halfup = 0; translations = new Matrix[] { - + /* Matrix.translate(new Vec(lshift, depth, halfup)), Matrix.translate(new Vec(rshift, depth, halfup)), Matrix.translate(new Vec(lshift, -depth, halfup)), Matrix.translate(new Vec(rshift, -depth, halfup)), - - /* - Matrix.translate(new Vec(0, depth, halfup)), - Matrix.translate(new Vec(0, -depth, halfup)), */ - Matrix.translate(new Vec(lshift, 0, height)), - Matrix.translate(new Vec(rshift, 0, height)), - Matrix.translate(new Vec(lshift, 0, -height)), - Matrix.translate(new Vec(rshift, 0, -height)), + //Matrix.translate(new Vec(0, depth, 0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)), + //Matrix.translate(new Vec(0, -depth, 0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)), + Matrix.translate(new Vec(0, 0, height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)), + Matrix.translate(new Vec(0, 0, -height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)), + /* + Matrix.translate(new Vec(0, depth, 0)), + Matrix.translate(new Vec(0, -depth, 0)), + Matrix.translate(new Vec(0, 0, height)), + Matrix.translate(new Vec(0, 0, -height)), + */ + //Matrix.translate(new Vec(lshift, depth, height/2)), + //Matrix.translate(new Vec(lshift, depth, -height/2)), + //Matrix.translate(new Vec(rshift, -depth, height/2)), + //Matrix.translate(new Vec(rshift, -depth, -height/2)), + //Matrix.translate(new Vec(rshift, 0, height)), + //Matrix.translate(new Vec(rshift, 0, -height)), Matrix.translate(new Vec( width, 0, 0)), Matrix.translate(new Vec(-width, 0, 0)), @@ -206,31 +215,44 @@ public class Main extends MeshViewer { tile.newT(rtf, mtf, rbf, null, 6); tile.newT(rbf, mtf, mbf, null, 6); + HashSet es = new HashSet(); + for(Mesh.T t : tile) { + es.add(t.e1()); + es.add(t.e2()); + es.add(t.e3()); + } + for(Mesh.E e : es) { + if (e.p1.p.x == e.p2.p.x && e.p1.p.y == e.p2.p.y) continue; + if (e.p1.p.z == e.p2.p.z && e.p1.p.y == e.p2.p.y) continue; + if (e.p1.p.x == e.p2.p.x && e.p1.p.z == e.p2.p.z) continue; + e.shatter(); + } + for(Matrix m : translations) { for(Mesh.T t1 : tile) { for(Mesh.T t2 : tile) { if (t1==t2) continue; - if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) && - (t1.v2().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) && - (t1.v3().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) { - t1.e1().bindEdge(t2.e3()); - t1.e2().bindEdge(t2.e2()); - t1.e3().bindEdge(t2.e1()); + if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) && + (t1.v2().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) && + (t1.v3().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) { + t2.e3().bindEdge(t1.e1(), m); + t2.e2().bindEdge(t1.e2(), m); + t2.e1().bindEdge(t1.e3(), m); } - if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) && - (t1.v3().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) && - (t1.v1().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) { - t1.e2().bindEdge(t2.e3()); - t1.e3().bindEdge(t2.e2()); - t1.e1().bindEdge(t2.e1()); + if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) && + (t1.v3().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) && + (t1.v1().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) { + t2.e3().bindEdge(t1.e2(), m); + t2.e2().bindEdge(t1.e3(), m); + t2.e1().bindEdge(t1.e1(), m); } - if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) && - (t1.v1().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) && - (t1.v2().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) { - t1.e3().bindEdge(t2.e3()); - t1.e1().bindEdge(t2.e2()); - t1.e2().bindEdge(t2.e1()); + if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) && + (t1.v1().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) && + (t1.v2().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) { + t2.e3().bindEdge(t1.e3(), m); + t2.e2().bindEdge(t1.e1(), m); + t2.e1().bindEdge(t1.e2(), m); } } @@ -281,6 +303,8 @@ public class Main extends MeshViewer { Mesh.E e = es.poll(); verts++; //System.out.println("shatter " + e); + //e.shatter(e.midpoint(), null, null, true, true); + e.shatter(); Thread.yield(); repaint(); @@ -301,16 +325,14 @@ public class Main extends MeshViewer { 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)/100000)); + 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); @@ -319,6 +341,7 @@ public class Main extends MeshViewer { 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++; @@ -353,13 +376,14 @@ public class Main extends MeshViewer { 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; } @@ -383,6 +407,24 @@ public class Main extends MeshViewer { Thread.yield(); repaint(); } + PriorityQueue es = new PriorityQueue(); + 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))); @@ -391,7 +433,9 @@ public class Main extends MeshViewer { 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); } } }