checkpoint

[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 2a44314..65d581f 100644 (file)
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@ -26,11 +26,7 @@ public abstract class HasBindingGroup {
                                 + "; expected "
                                 + getBindingMatrix(other));
             */
-            Matrix vom = other.getBindingMatrix(bindingGroup.getMaster());
-            Matrix v2 = bindingMatrix;
-            Matrix v3 = getBindingMatrix(other);
-            Matrix m = vom.inverse().times(v2.inverse()).times(v3).times(vom);
-            bindingGroup.krank = bindingGroup.krank.times(m);
+            setConstraint(bindingMatrix);
             /*
               System.err.println("WARNING: discarding rebind attempt: "+this+" and "+other+m);
             */
@@ -76,11 +72,9 @@ public abstract class HasBindingGroup {
         return v.inverse().times(bindingGroup.krank).times(v);
     }
     public void setConstraint(Matrix m) {
-        /*
         if (bindingGroup==null) bindingGroup = new BindingGroup(this);
         Matrix v = getBindingMatrix(getMaster());
         bindingGroup.krank = bindingGroup.krank.times(v.inverse().times(m).times(v));
-        */
     }
 
     public void unbind() {