checkpoint i think it works!

[anneal.git] / src / edu / berkeley / qfat / geom / HasBindingGroup.java

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index fc12a29..064b657 100644 (file)
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@ -16,7 +16,8 @@ public abstract class HasBindingGroup {
         if (other.bindingGroup == null) other.bindingGroup = new BindingGroup(other);
 
         if (other.bindingGroup == this.bindingGroup) {
-            if (getBindingMatrix(other).equals(bindingMatrix)) return;
+            if (getBindingMatrix(other).equals(bindingMatrix))
+                return;
             throw new Error("rebind attempt: "+this+" and "+other+" with "
                             + bindingMatrix
                             + "; expected "
@@ -24,18 +25,25 @@ public abstract class HasBindingGroup {
         }
 
         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);
     }
 
@@ -52,7 +60,7 @@ public abstract class HasBindingGroup {
     }
 
     public boolean isBoundTo(HasBindingGroup t) {
-        return bindingGroup.contains(t);
+        return t==this || (bindingGroup!=null && bindingGroup.contains(t));
     }
 
     public Iterable getBoundPeers() {