X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=8a46c730fa131179ee8ac5689db3ae604f0039eb;hb=485efa58c987b9a4b5155b36ae7c64eff4251142;hp=51b9249829b5c4fdf23dfde13b3b13e5dba10d14;hpb=8190da98c29041324f9dcaa9bc86d0a8a3f77491;p=anneal.git

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 51b9249..8a46c73 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -74,33 +74,19 @@ public class Mesh implements Iterable<Mesh.T> {
     // Vertexices //////////////////////////////////////////////////////////////////////////////
 
     /** a vertex in the mesh */
-    public final class Vertex extends HasPoint implements Visitor<T> {
+    public final class Vertex extends HasQuadric implements Visitor<T> {
         public String toString() { return p.toString(); }
         public Point p;
         E e;                // some edge *leaving* this point
 
-        /** the nearest vertex in the "score_against" mesh */
-        Vertex   nearest_in_other_mesh;
-        /** the number of vertices in the other mesh for which this is the nearest_in_other_mesh */
-        int    quadric_count;
-        /** the total error quadric (contributions from all vertices in other mesh for which this is nearest) */
-        Matrix quadric = Matrix.ZERO;
-
         Matrix binding = Matrix.ONE;
         Vertex bound_to = this;
-        float oldscore = 0;
-        boolean quadricStale = false;
+        public float oldscore = 0;
+
 
-        public Matrix errorQuadric() { return quadric; }
         public Point getPoint() { return p; }
         public float score() { return oldscore; }
 
-        private Matrix fundamentalQuadric = null;
-        public Matrix fundamentalQuadric() {
-            if (fundamentalQuadric == null) recomputeFundamentalQuadric();
-            return fundamentalQuadric;
-        }
-
         private Vertex(Point p) {
             this.p = p;
             if (vertices.get(p) != null) throw new Error();
@@ -113,17 +99,18 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         public void recomputeFundamentalQuadric() {
-            if (!quadricStale && fundamentalQuadric != null) return;
-            quadricStale = false;
             unApplyQuadricToNeighbor();
-            Matrix m = Matrix.ZERO;
-            int count = 0;
-            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++;
+            if (quadricStale || fundamentalQuadric==null) {
+                Matrix m = Matrix.ZERO;
+                int count = 0;
+                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++;
+                }
+                quadricStale = false;
+                fundamentalQuadric = m.times(1/(float)count);
             }
-            fundamentalQuadric = m.times(1/(float)count);
             applyQuadricToNeighbor();
         }
 
@@ -151,7 +138,7 @@ public class Mesh implements Iterable<Mesh.T> {
             nearest_in_other_mesh = new_nearest;
                 
             // don't attract to vertices that face the other way
-            if (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) {
+            if (((Vertex)nearest_in_other_mesh).e == null || ((Vertex)nearest_in_other_mesh).norm().dot(norm()) < 0) {
                 nearest_in_other_mesh = null;
             } else {
                 nearest_in_other_mesh.unComputeError();
@@ -176,6 +163,7 @@ public class Mesh implements Iterable<Mesh.T> {
             score -= oldscore;
             oldscore = 0;
         }
+        public HasQuadric nearest() { return score_against.nearest(p); }
         public void computeError() {
             oldscore =
                 quadric_count != 0