X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=774efa3e56b7fb4eadb82743ed2e79f4d513ee2d;hb=db6e4abf611268c147509a955e1111706a45eea2;hp=f96346d8eebc375c0ac50ee60e02535ebfbdf395;hpb=0f91cadcd5a273c8c312c1d054fe9de1a82ebf8e;p=anneal.git

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index f96346d..774efa3 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -50,15 +50,14 @@ public class Mesh implements Iterable<Mesh.T> {
     public int numedges = 0;
     public float avgedge = 0;
 
-    public void unbind() {
+    public void rebindPoints() {
+        // unbind all points
         for(Mesh.T t : this) {
             t.v1().unbind();
             t.v2().unbind();
             t.v3().unbind();
         }
-    }
-
-    public void bind() {
+        // ask edges to re-implement their bindings
         for(Mesh.T t : this) {
             t.e1().dobind();
             t.e2().dobind();
@@ -66,7 +65,7 @@ public class Mesh implements Iterable<Mesh.T> {
         }
     }
 
-    public void unscore() {
+    public void unscoreAll() {
         HashSet<Vert> done = new HashSet<Vert>();
         for(T t : this)
             for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) {
@@ -75,7 +74,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 p.unscore();
             }
     }
-    public void fundamental() {
+    public void recomputeAllFundamentalQuadrics() {
         HashSet<Vert> done = new HashSet<Vert>();
         for(T t : this)
             for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) {
@@ -84,7 +83,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 p.recomputeFundamentalQuadric();
             }
     }
-    public float rescore() {
+    public float rescoreAll() {
         int num = 0;
         double dist = 0;
         HashSet<Vert> done = new HashSet<Vert>();
@@ -144,8 +143,6 @@ public class Mesh implements Iterable<Mesh.T> {
         public Point p;
         E e;                // some edge *leaving* this point
 
-        Vert bound_to = this;
-
         /** the nearest vertex in the "score_against" mesh */
         Vert   nearest_in_other_mesh;
         /** the number of vertices in the other mesh for which this is the nearest_in_other_mesh */
@@ -153,11 +150,13 @@ public class Mesh implements Iterable<Mesh.T> {
         /** the total error quadric (contributions from all vertices in other mesh for which this is nearest) */
         Matrix quadric = Matrix.ZERO;
 
+        Vert bound_to = this;
         Matrix binding = new Matrix();
         float oldscore = 0;
-        boolean inserted = false;
 
         public Matrix errorQuadric() { return quadric; }
+        public Point getPoint() { return p; }
+        public float score() { return oldscore; }
 
         private Matrix fundamentalQuadric = null;
         public Matrix fundamentalQuadric() {
@@ -165,13 +164,11 @@ public class Mesh implements Iterable<Mesh.T> {
             return fundamentalQuadric;
         }
 
-        public Point getPoint() { return p; }
         private Vert(Point p) {
             this.p = p;
             if (pointset.get(p) != null) throw new Error();
             pointset.add(this);
         }
-        public float score() { return oldscore; }
 
         public void recomputeFundamentalQuadric() {
             unscore();
@@ -189,18 +186,23 @@ public class Mesh implements Iterable<Mesh.T> {
         public void unscore() {
             if (nearest_in_other_mesh == null) return;
             if (fundamentalQuadric == null) return;
+            nearest_in_other_mesh.unsc();
             nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.minus(fundamentalQuadric);
             nearest_in_other_mesh.quadric_count--;
             if (nearest_in_other_mesh.quadric_count==0)
                 nearest_in_other_mesh.quadric = Matrix.ZERO;
+            nearest_in_other_mesh.resc();
             nearest_in_other_mesh = null;
         }
 
+        public void unsc() {
+            score -= oldscore;
+            oldscore = 0;
+        }
         public void rescore() {
             if (score_against == null) return;
 
-            score -= oldscore;
-            oldscore = 0;
+            unsc();
 
             if (nearest_in_other_mesh != null) unscore();
             if (nearest_in_other_mesh == null) {
@@ -210,11 +212,16 @@ public class Mesh implements Iterable<Mesh.T> {
                 if (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) {
                     nearest_in_other_mesh = null;
                 } else {
+                    nearest_in_other_mesh.unsc();
                     nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric());
                     nearest_in_other_mesh.quadric_count++;
+                    nearest_in_other_mesh.resc();
                 }
             }
 
+            resc();
+        }
+        public void resc() {
             oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count);
             score += oldscore;
         }
@@ -239,13 +246,13 @@ public class Mesh implements Iterable<Mesh.T> {
             // FIXME: intersection test needed?
             return true;
         }
+
         public boolean move(Vec v) {
             Matrix m = new Matrix(v);
             Vert p = this;
             boolean good = true;
             do {
                 good &= p.transform(m);
-                v = v.times(binding); // bleh wrong
                 p = p.bound_to;
             } while (p != this);
             return good;
@@ -283,6 +290,16 @@ public class Mesh implements Iterable<Mesh.T> {
             return null;
         }
 
+        public Vec norm() {
+            Vec norm = new Vec(0, 0, 0);
+            E e = this.e;
+            do {
+                if (e.t != null) norm = norm.plus(e.t.norm().times((float)e.prev.angle()));
+                e = e.pair.next;
+            } while(e != this.e);
+            return norm.norm();
+        }
+
         public boolean isBoundTo(Vert p) {
             Vert px = p;
             do {
@@ -291,7 +308,6 @@ public class Mesh implements Iterable<Mesh.T> {
             } while(px != p);
             return false;
         }
-
         public void unbind() { bound_to = this; binding = new Matrix(); }
         public void bind(Vert p) { bind(p, new Matrix()); }
         public void bind(Vert p, Matrix binding) {
@@ -303,15 +319,6 @@ public class Mesh implements Iterable<Mesh.T> {
             this.bound_to = temp_bound_to;
             this.binding = temp_binding.times(temp_binding); // FIXME: may have order wrong here
         }
-        public Vec norm() {
-            Vec norm = new Vec(0, 0, 0);
-            E e = this.e;
-            do {
-                if (e.t != null) norm = norm.plus(e.t.norm().times((float)e.prev.angle()));
-                e = e.pair.next;
-            } while(e != this.e);
-            return norm.norm();
-        }
     }
 
     /** [UNIQUE] an edge */