X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FBindingGroup.java;h=0c3049ff70b3ffdde0bac1010435a40c0db47ba5;hp=5f6bf2bfe3f67f2e30bb52da7fdcd941a0aed8c6;hb=0e80eb500d944f8ad1f3a9e2d296d9a4cbcd7e25;hpb=33fcd7732290bcd1c7108ba9388af173fd139ee2

diff --git a/src/edu/berkeley/qfat/geom/BindingGroup.java b/src/edu/berkeley/qfat/geom/BindingGroup.java
index 5f6bf2b..0c3049f 100644
--- a/src/edu/berkeley/qfat/geom/BindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/BindingGroup.java
@@ -4,6 +4,8 @@ import java.util.*;
 
 public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
 
+    public Matrix krank = Matrix.ONE;
+
     private T                  master   = null;
     private HashMap<T,Matrix>  matrices = new HashMap<T,Matrix>();
 
@@ -14,16 +16,24 @@ public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
 
     public int size() { return matrices.size(); }
 
+    public void setKrank(Matrix k) { krank = krank.times(k); }
     public void merge(BindingGroup<T> bg, Matrix m) {
         if (bg==this) throw new Error();
         for(HasBindingGroup hbg : bg.matrices.keySet()) {
             matrices.put((T)hbg, bg.matrices.get(hbg).times(m));
             hbg.bindingGroup = this;
         }
+
+        Matrix v = getMatrix(bg.master, master);
+        //krank = krank.times(v.inverse().times(bg.krank).times(v));
+
+        HashSet<HasBindingGroup> stuff = new HashSet<HasBindingGroup>();
         for(HasBindingGroup hbg : bg.matrices.keySet())
-            hbg.bindingGroupChanged(this);
+            stuff.add(hbg);
         bg.matrices.clear();
         bg.master = null;
+        for(HasBindingGroup hbg : stuff)
+            hbg.bindingGroupChanged(this);
     }
 
     public T getMaster() { return master; }