X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FHasBindingGroup.java;h=064b65715eb94fcb7f443386fe7f4a988d7f2ad5;hp=715f76396ff85786b91f33c80b868a503aea27df;hb=33fcd7732290bcd1c7108ba9388af173fd139ee2;hpb=468b086402bb0ccae7ce4dda8b009d61bfc37a71

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index 715f763..064b657 100644
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@ -16,22 +16,37 @@ public abstract class HasBindingGroup {
         if (other.bindingGroup == null) other.bindingGroup = new BindingGroup(other);
 
         if (other.bindingGroup == this.bindingGroup) {
-            if (bindingGroup.getMatrix(other).equals(Matrix.ONE)) return;
-            throw new Error("rebind attempt with " + bindingGroup.getMatrix(other));
+            if (getBindingMatrix(other).equals(bindingMatrix))
+                return;
+            throw new Error("rebind attempt: "+this+" and "+other+" with "
+                            + bindingMatrix
+                            + "; expected "
+                            + getBindingMatrix(other));
         }
 
         bindingMatrix =
-            getBindingMatrix()
+            getBindingMatrix().inverse()
             .times(bindingMatrix)
             .times(other.getBindingMatrix());
         other.bindingGroup.merge(bindingGroup, bindingMatrix);
     }
 
+    public int bindingGroupSize() {
+        if (bindingGroup == null) return 1;
+        return bindingGroup.size();
+    }
+
+
     public Matrix getBindingMatrix() {
         if (bindingGroup==null) return Matrix.ONE;
         return bindingGroup.getMatrix(this);
     }
 
+    public Matrix getBindingMatrix(HasBindingGroup other) {
+        if (other==this) return Matrix.ONE;
+        return bindingGroup.getMatrix(this, other);
+    }
+
     public HasBindingGroup getMaster() {
         if (bindingGroup==null) return this;
         return bindingGroup.getMaster();
@@ -45,9 +60,12 @@ public abstract class HasBindingGroup {
     }
 
     public boolean isBoundTo(HasBindingGroup t) {
-        return bindingGroup.contains(t);
+        return t==this || (bindingGroup!=null && bindingGroup.contains(t));
     }
 
-    public Iterable getBoundPeers() { return bindingGroup; }
+    public Iterable getBoundPeers() {
+        if (bindingGroup==null) bindingGroup = new BindingGroup(this);
+        return bindingGroup;
+    }
     public void bindingGroupChanged(BindingGroup newBindingGroup) { }
 }