X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=641e4404c927c75cd927e68d771f85ef6a8148b0;hp=d085fd9212beee4f2ea2f7c67c9f5190f85a348e;hb=e6ede2b794c97801f3890af9ea634e67012420ef;hpb=3637de3ab66ba9c7bcd94d3b863bd22c706119e1

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index d085fd9..641e440 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -89,14 +89,16 @@ public class Main extends MeshViewer {
 
             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)),
@@ -105,7 +107,7 @@ public class Main extends MeshViewer {
 
             Matrix.translate(new Vec( width,           0,    0)),
             Matrix.translate(new Vec(-width,           0,    0)),
-
+            */
         };
 
         //   
@@ -214,23 +216,23 @@ public class Main extends MeshViewer {
                     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());
+                        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());
+                        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());
+                        t2.e3().bindEdge(t1.e3(), m);
+                        t2.e2().bindEdge(t1.e1(), m);
+                        t2.e1().bindEdge(t1.e2(), m);
                     }
 
                 }
@@ -267,7 +269,6 @@ public class Main extends MeshViewer {
     }
 
     public void breakit() {
-        /*
         int oldverts = verts;
         System.out.println("doubling vertices.");
         PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
@@ -282,12 +283,13 @@ public class Main extends MeshViewer {
             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();
         }
         tile.rebindPoints();
-        */
     }
 
     public synchronized void rand(float temp, Mesh.Vertex p) {
@@ -303,7 +305,7 @@ public class Main extends MeshViewer {
         Matrix m = Matrix.translate(v);
 
         boolean good = p.move(m, false);
-        if (!good) { misses++; return; }
+        if (!good) { /*misses++;*/ return; }
 
         double new_tile_error = tile.error();
         double new_goal_error = goal.error();
@@ -319,6 +321,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++;
@@ -346,9 +349,9 @@ public class Main extends MeshViewer {
                 if (breaks > 0) {
                     while (breaks>0) {
                         breaks--;
-                        //breakit();
+                        breakit();
                     }
-                    //seek_upward = true;
+                    seek_upward = true;
                 } else if (acceptance > 0.96) gamma = 0.4f;
                 else if (acceptance > 0.9)    gamma = 0.5f;
                 else if (acceptance > 0.8)    gamma = 0.65f;
@@ -357,7 +360,7 @@ public class Main extends MeshViewer {
                 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++;
+                else { /*breaks++;*/ }
 
                 if (seek_upward) {
                     if (acceptance > 0.2) seek_upward = false;
@@ -390,15 +393,16 @@ public class Main extends MeshViewer {
                     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) 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<1; i++) {
+                /*
+                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)) + " " +
@@ -409,7 +413,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);
                 }
             }
         }