X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FHasBindingGroup.java;h=5b761a313f7e05dffae1eea05c0aee4a3f5f7ed7;hp=fc12a29465d1643fc928703a29f22ec05505e511;hb=e6ede2b794c97801f3890af9ea634e67012420ef;hpb=2b09dab499516873839b9bdbc972c980829e9bac

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index fc12a29..5b761a3 100644
--- 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,7 +25,7 @@ public abstract class HasBindingGroup {
         }
 
         bindingMatrix =
-            getBindingMatrix()
+            getBindingMatrix().inverse()
             .times(bindingMatrix)
             .times(other.getBindingMatrix());
         other.bindingGroup.merge(bindingGroup, bindingMatrix);