checkpoint autogen tile

[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 ad9ee31..d884672 100644 (file)
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@ -4,7 +4,7 @@ import java.util.*;
 
 public abstract class HasBindingGroup {
 
 
 public abstract class HasBindingGroup {
 

-    BindingGroup bindingGroup;
+    public BindingGroup bindingGroup;

 
     // know:      self   = bindingGroup[self] * master
     // know:      other  = other.bindingGroup[other] * other.bindingGroup.master
 
     // know:      self   = bindingGroup[self] * master
     // know:      other  = other.bindingGroup[other] * other.bindingGroup.master

@@ -24,13 +24,22 @@ public abstract class HasBindingGroup {
                             + "; expected "
                             + getBindingMatrix(other));
             */
                             + "; expected "
                             + getBindingMatrix(other));
             */

-            System.err.println("WARNING: discarding rebind attempt: "+this+" and "+other+" with "
-                               + bindingMatrix
-                               + "; 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);
+            /*
+              System.err.println("WARNING: discarding rebind attempt: "+this+" and "+other+m);
+            */
+            //" with "
+            //+ bindingMatrix
+            //+ "; expected "
+            //+ getBindingMatrix(other));

             return;
         }
 
             return;
         }
 

+

         bindingMatrix =
             getBindingMatrix().inverse()
             .times(bindingMatrix)
         bindingMatrix =
             getBindingMatrix().inverse()
             .times(bindingMatrix)