X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=f51c772f724559a8e29b85d08d8556f4cf681f2d;hp=44a8312669808ce28e75cb155fbb75e7f4ff369c;hb=4e22c754574f3d410e1ddc0bc5cdedd6b3586497;hpb=485efa58c987b9a4b5155b36ae7c64eff4251142

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 44a8312..f51c772 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -63,8 +63,6 @@ public class Main extends MeshViewer {
             Mesh.T t  = goal.newT(p0, p1, p2, n, 0);
         }
 
-        goal.ignorecollision = true;
-
         // rotate to align major axis -- this probably needs to be done by a human.
         goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2)));
 
@@ -264,8 +262,8 @@ public class Main extends MeshViewer {
         System.out.println("tile volume: " + tile.volume());
         System.out.println("goal volume: " + goal.volume());
 
-        tile.score_against = goal;
-        goal.score_against = tile;
+        tile.error_against = goal;
+        goal.error_against = tile;
     }
 
     public synchronized void breakit() {
@@ -290,8 +288,8 @@ public class Main extends MeshViewer {
 
         //p.reComputeError();
         p.reComputeErrorAround();
-        double tile_score = tile.score();
-        double goal_score = goal.score();
+        double tile_error = tile.error();
+        double goal_error = goal.error();
 
         Vec v;
         /*
@@ -307,26 +305,29 @@ public class Main extends MeshViewer {
         //v = v.plus(v2.norm().times(1/(float)300));
         v = v2.norm().times(1/(float)300);
 
-        boolean good = p.move(v);
+        Matrix m = Matrix.translate(v);
 
-        p.reComputeErrorAround();
+        boolean good = p.move(m, false);
+        if (!good) { misses++; return; }
 
-        double new_tile_score = tile.score();
-        double new_goal_score = goal.score();
-        double tile_delta = (new_tile_score - tile_score) / tile_score;
-        double goal_delta = (new_goal_score - goal_score) / goal_score;
+        //p.reComputeErrorAround();
+
+        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) / temp);
         boolean doSwap = good && (Math.random() < swapProbability);
         //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
         //boolean doSwap = good && (tile_delta + goal_delta <= 0);
         if (doSwap) {
-            tile_score = new_tile_score;
-            goal_score = new_goal_score;
-            //System.out.println("score: " + tile_score + " / " + goal_score);
+            tile_error = new_tile_error;
+            goal_error = new_goal_error;
+            //System.out.println("error: " + tile_error + " / " + goal_error);
             hits++;
         } else {
-            p.move(v.times(-1));
+            p.move(Matrix.translate(v.times(-1)), true);
             misses++;
         }
     }
@@ -337,6 +338,7 @@ public class Main extends MeshViewer {
         float hightemp = 10;
         float temp = hightemp;
         float last = 10;
+        float lastbreak = 10;
         while(true) {
             synchronized(this) {
                 double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses));
@@ -351,7 +353,10 @@ public class Main extends MeshViewer {
                         breaks--;
                         breakit();
                         //gamma = 1;
+                        float t = temp;
+                        temp = lastbreak;
                         gamma = 1;
+                        lastbreak = t;
                         //temp = last * 0.8f;
                         //last = temp;
                         //temp = hightemp;
@@ -369,8 +374,12 @@ public class Main extends MeshViewer {
                             gamma = 0.98f;
                         } else {
                             breakit();
+                        float t = temp;
+                        temp = lastbreak;
+                        gamma = 1;
+                        lastbreak = t;
                             //gamma = 1;
-                            gamma = 0.99f;
+                        //gamma = 0.99f;
                             //gamma = 1;
                             //temp = last * 0.8f;
                             //last = temp;