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 88e6d04..3c80182 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -149,14 +149,12 @@ public class Mesh implements Iterable<Mesh.T> {
             quadricStale = false;
             unApplyQuadricToNeighbor();
             Matrix m = Matrix.ZERO;
-            E e = this.e;
             int count = 0;
-            do {
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 T t = e.t;
                 m = m.plus(t.norm().fundamentalQuadric(t.centroid()));
                 count++;
-                e = e.pair.next;
-            } while(e != this.e);
+            }
             fundamentalQuadric = m.times(1/(float)count);
             applyQuadricToNeighbor();
         }
@@ -199,11 +197,8 @@ public class Mesh implements Iterable<Mesh.T> {
         public void reComputeErrorAround() {
             reComputeError();
             if (nearest_in_other_mesh != null) nearest_in_other_mesh.reComputeError();
-            E e = this.e;
-            do {
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
                 e.p2.reComputeError();
-                e = e.pair.next;
-            } while (e != this.e);
         }
         public void reComputeError() {
             unComputeError();
@@ -214,64 +209,34 @@ public class Mesh implements Iterable<Mesh.T> {
             oldscore = 0;
         }
         public void computeError() {
-            if (quadric_count == 0) {
-                if (immutableVertices) {
-                } else if (nearest_in_other_mesh == null) {
-                    if (score_against != null) {
-                        Vertex ne = score_against.nearest(p);
-                        oldscore = ne.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
-                    } else {
-                        oldscore = 0;
-                    }
-                } else {
-                    oldscore = nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10;
-                }
-            } else {
-                oldscore = (quadric.preAndPostMultiply(p) * 100) / quadric_count;
-            }
-
-            oldscore = oldscore;
-
-            int numaspects = 0;
-            float aspects = 0;
-            E e = this.e;
-            do {
-                //double ang = Math.abs(e.crossAngle());
+            oldscore =
+                quadric_count != 0
+                ? (quadric.preAndPostMultiply(p) * 100) / quadric_count
+                : immutableVertices
+                ? oldscore
+                : nearest_in_other_mesh != null
+                ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10
+                : score_against != null
+                ? score_against.nearest(p).fundamentalQuadric().preAndPostMultiply(p) * 100 * 10
+                : 0;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 double ang = Math.abs(e.crossAngle());
                 if (ang > Math.PI) throw new Error();
-                /*
-                  if (e.t != null) {
-                  numaspects++;
-                  aspects += e.t.aspect()*e.t.aspect();
-                  }
-                */
-
                 float minangle = (float)(Math.PI * 0.8);
                 if (ang > minangle)
                     oldscore += (ang - minangle);
+            }
 
-                e = e.pair.next;
-            } while (e != this.e);
-            if (numaspects > 0) oldscore += (aspects / numaspects);
-
-            //System.out.println(oldscore);
-            //oldscore = oldscore*oldscore;
             score += oldscore;
         }
 
         private void removeTrianglesFromRTree() {
-            E e = this.e;
-            do {
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
                 if (e.t != null) e.t.removeFromRTree();
-                e = e.pair.next;
-            } while(e != this.e);
         }
         private void addTrianglesToRTree() {
-            E e = this.e;
-            do {
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
                 if (e.t != null) e.t.addToRTree();
-                e = e.pair.next;
-            } while(e != this.e);
         }
 
         /** does NOT update bound pairs! */
@@ -295,7 +260,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
             good = true;
 
-            for(E e = null; e!=this.e; e=e.pair.next) { if (e==null) e = this.e;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 if (Math.abs(e.crossAngle()) > (Math.PI * 0.9) || Math.abs(e.next.crossAngle()) > (Math.PI * 0.9)) good = false;
                 if (e.t.aspect() < 0.1) good = false;
                 e.p2.quadricStale = true;
@@ -309,16 +274,14 @@ public class Mesh implements Iterable<Mesh.T> {
 
         public void visit(T t) {
             if (!good) return;
-            E e = Vertex.this.e;
-            do {
+            for(E e = Vertex.this.e; e!=null; e=e.pair.next==Vertex.this.e?null:e.pair.next) {
                 if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; }
                 if (e.t != null) {
                     if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; }
                     if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; }
                     if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; }
                 }
-                e = e.pair.next;
-            } while(e != Vertex.this.e);
+            }
         }
         private boolean good;