X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=12a82fc195ef949c251d21bfddd5e683a42aa822;hp=03ca6dcb96d5f645ca0cf2b84d4859af71841526;hb=de98420094a537a70140842ff185e6d113ad270e;hpb=0525dcc815af1e875699147e9f203969eeae723d

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 03ca6dc..12a82fc 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -281,7 +281,8 @@ 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();
         }
@@ -294,23 +295,21 @@ public class Main extends MeshViewer {
         double tile_error = tile.error();
         double goal_error = goal.error();
 
-        float max = p.averageEdgeLength()/30;
+        float max = p.averageEdgeLength()/10;
         Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
         v = v.norm().times((random.nextFloat() - 0.5f) * max);
         //System.out.println(max + " " + p.averageEdgeLength() + " " + v.mag());
         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);
@@ -319,6 +318,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 +353,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 +384,23 @@ public class Main extends MeshViewer {
                     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)));
@@ -391,7 +409,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);
                 }
             }
         }