checkpoint

darcs-hash:20071205084633-5007d-b1d3460d0bdc7ebf8fd0131945ca89088615b13d.gz

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 23ae1c8..5dd2aea 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -325,14 +325,14 @@ public class Mesh implements Iterable<Mesh.T> {
             ess.add(e);
         }
         public void add(E e) {
             ess.add(e);
         }
         public void add(E e) {

-            if (e.bg != null) { merge(e.bg); return; }
-            ess.add(e);
-            e.bg = this;
-        }
-        public void merge(BindingGroup bg) {
-            for(E e : bg.ess) {
-                e.bg = null;
-                add(e);
+            if (e.bg != null) {
+                for(E ex : e.bg.ess) {
+                    ex.bg = null;
+                    add(ex);
+                }
+            } else {
+                ess.add(e);
+                e.bg = this;

             }
         }
         public void dobind(E e) {
             }
         }
         public void dobind(E e) {

@@ -384,8 +384,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
             newT(r.p, p1.p, mid, null);
             newT(r.p, mid, p2.p, null);
 
             newT(r.p, p1.p, mid, null);
             newT(r.p, mid, p2.p, null);

-            //bg1.add(p1.getE(mid));
-            //bg2.add(p2.getE(mid).pair);
+            bg1.add(p1.getE(mid));
+            bg2.add(p2.getE(mid).pair);

             return mid;
         }
 
             return mid;
         }