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 efeb89b..b25d1b7 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -66,6 +66,24 @@ public class Mesh implements Iterable<Mesh.T> {
         }
     }
 
+    public void unscore() {
+        HashSet<Vert> done = new HashSet<Vert>();
+        for(T t : this)
+            for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) {
+                if (done.contains(p)) continue;
+                done.add(p);
+                p.unscore();
+            }
+    }
+    public void fundamental() {
+        HashSet<Vert> done = new HashSet<Vert>();
+        for(T t : this)
+            for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) {
+                if (done.contains(p)) continue;
+                done.add(p);
+                p.recomputeFundamentalQuadric();
+            }
+    }
     public float rescore() {
         int num = 0;
         double dist = 0;
@@ -75,6 +93,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 if (done.contains(p)) continue;
                 done.add(p);
                 p.rescore();
+                
             }
         return (float)(dist/num);
     }
@@ -203,7 +222,7 @@ public class Mesh implements Iterable<Mesh.T> {
             s2 = quadric==null ? 0 : po.p.distance(quadric.p);
             oldscore = (float)(s1 + s2);
             */
-            oldscore = quadric.preAndPostMultiply(p);
+            oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count);
 
             score += oldscore;
         }
@@ -226,13 +245,13 @@ public class Mesh implements Iterable<Mesh.T> {
             rescore();
 
             // recompute fundamental quadrics of all vertices sharing a face
+            /*
             E e = this.e;
             do {
-                e.t.v1().recomputeFundamentalQuadric();
-                e.t.v2().recomputeFundamentalQuadric();
-                e.t.v3().recomputeFundamentalQuadric();
+                e.p2.recomputeFundamentalQuadric();
                 e = e.pair.next;
             } while(e != this.e);
+            */
             
             boolean good = true;
             /*