From: adam <adam@megacz.com>
Date: Sun, 16 Dec 2007 04:05:54 +0000 (-0800)
Subject: checkpoint
X-Git-Url: http://git.megacz.com/?p=anneal.git;a=commitdiff_plain;h=37e1b841e1df6526d39f896ee3589efea2116409;hp=f7b132f369dea284b16c09f82902c2108100d374

checkpoint

darcs-hash:20071216040554-5007d-5d9c856f18b292a4ebd6eff5ff51e1a91fe48292.gz
---

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 6e376cc..28b04e2 100644
--- 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();
 
diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index ecc5e22..c583106 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -165,8 +165,10 @@ public class Mesh implements Iterable<Mesh.T> {
             reComputeError();
             if (nearest_in_other_mesh != null)
                 nearest_in_other_mesh.reComputeError();
+            /*
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
                 e.p2.reComputeError();
+            */
         }
 
         public boolean visit(Object o) {
@@ -190,8 +192,8 @@ public class Mesh implements Iterable<Mesh.T> {
             for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to)
                 good &= p.transform(m.times(p.p), ignoreProblems);
             for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to)
-                if (good)  { p.reComputeError/*Around*/(); }
-                else       p.transform(p.oldp, true);
+                if (good || ignoreProblems)  p.reComputeErrorAround();
+                else                         p.transform(p.oldp, true);
             return good;
         }