checkpoint

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

diff --git a/src/edu/berkeley/qfat/bind/HasBindingGroup.java b/src/edu/berkeley/qfat/bind/HasBindingGroup.java
index ee8157a..1b19310 100644 (file)
--- a/src/edu/berkeley/qfat/bind/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/bind/HasBindingGroup.java
@@ -14,6 +14,10 @@ public abstract class HasBindingGroup {
     // therefore: master = bindingGroup[self]^-1 * bindingMatrix * other
     // therefore:        = bindingGroup[self]^-1 * bindingMatrix * other.bindingGroup[other] * other.bindingGroup.master
     public void bindTo(Matrix bindingMatrix, HasBindingGroup other) {
+        // FIXME
+        bindTo(bindingMatrix, other, 0.001f);
+    }
+    public void bindTo(Matrix bindingMatrix, HasBindingGroup other, float epsilon) {
         if (bindingGroup == null) bindingGroup = new BindingGroup(this);
         if (other.bindingGroup == null) other.bindingGroup = new BindingGroup(other);
 
@@ -21,7 +25,7 @@ public abstract class HasBindingGroup {
             getBindingMatrix().inverse()
             .times(bindingMatrix)
             .times(other.getBindingMatrix());
-        other.bindingGroup.merge(bindingGroup, bindingMatrix);
+        other.bindingGroup.merge(bindingGroup, bindingMatrix, epsilon);
     }
 
     public int bindingGroupSize() {