From: adam <adam@megacz.com>
Date: Wed, 5 Dec 2007 05:55:45 +0000 (-0800)
Subject: checkpoint
X-Git-Url: http://git.megacz.com/?p=anneal.git;a=commitdiff_plain;h=b424ccb86139efcf43779ebb3267bc1709347dd8;hp=3a566fdd09e751b7901edc4d22060032f96fe438

checkpoint

darcs-hash:20071205055545-5007d-8c75017e01bd9bf8488e3a8da0811ed0ddf9af6e.gz
---

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 219da71..84cb091 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -241,6 +241,11 @@ public class Mesh implements Iterable<Mesh.T> {
             return null;
         }
 
+        public E getE(Point p2) {
+            Vert v = pointset.get(p2);
+            if (v==null) return null;
+            return getE(v);
+        }
         public E getE(Vert p2) {
             E e = this.e;
             do {
@@ -318,8 +323,8 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         boolean shattered = false;
-        public Vert shatter() { return shatter(register(midpoint()), null, null); }
-        public Vert shatter(Vert mid, BindingGroup bg1, BindingGroup bg2) {
+        public Point shatter() { return shatter(midpoint(), null, null); }
+        public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) {
             if (shattered) return mid;
             shattered = true;
 
@@ -329,14 +334,14 @@ public class Mesh implements Iterable<Mesh.T> {
 
             if (bg1==null) bg1 = new BindingGroup();
             if (bg2==null) bg2 = new BindingGroup();
-            for(E e : bg.es) e.shatter(register(e.midpoint()), bg1, bg2);
+            for(E e : bg.es) e.shatter(e.midpoint(), bg1, bg2);
             pair.shatter();
             destroy();
 
-            newT(r.p, p1.p, mid.p, null);
-            newT(r.p, mid.p, p2.p, null);
+            newT(r.p, p1.p, mid, null);
+            newT(r.p, mid, p2.p, null);
             bg1.add(p1.getE(mid));
-            bg2.add(mid.getE(p2));
+            bg2.add(p2.getE(mid).pair);
             return mid;
         }