checkpoint

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

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 5c913c4..c583106 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -163,9 +163,12 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public void reComputeErrorAround() {
             reComputeError();
-            if (nearest_in_other_mesh != null) nearest_in_other_mesh.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) {
@@ -189,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.reComputeErrorAround();
-                else       p.transform(p.oldp, true);
+                if (good || ignoreProblems)  p.reComputeErrorAround();
+                else                         p.transform(p.oldp, true);
             return good;
         }