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 8c38913..6e376cc 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -288,8 +288,8 @@ public class Main extends MeshViewer {
 
     public synchronized void rand(float temp, Mesh.Vertex p) {
 
-        //p.reComputeError();
-        p.reComputeErrorAround();
+        p.reComputeError();
+        //p.reComputeErrorAround();
         double tile_error = tile.error();
         double goal_error = goal.error();
 
@@ -307,10 +307,12 @@ 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);
+
+        boolean good = p.move(m, false);
         if (!good) { misses++; return; }
 
-        p.reComputeErrorAround();
+        //p.reComputeErrorAround();
 
         double new_tile_error = tile.error();
         double new_goal_error = goal.error();
@@ -327,7 +329,7 @@ public class Main extends MeshViewer {
             //System.out.println("error: " + tile_error + " / " + goal_error);
             hits++;
         } else {
-            p.move(v.times(-1));
+            p.move(Matrix.translate(v.times(-1)), true);
             misses++;
         }
     }