checkpoint

[anneal.git] / src / edu / berkeley / qfat / Main.java

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 44a8312..9d5c4fc 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -264,8 +264,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 +290,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;
         /*
@@ -311,19 +311,19 @@ public class Main extends MeshViewer {
 
         p.reComputeErrorAround();
 
-        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;
+        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));
@@ -337,6 +337,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 +352,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 +373,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;