X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FHasBindingGroup.java;h=65d581f9d5cce15645948c31a8fb6070a79fc8d7;hp=2a443140630b1129e8746d1914d1b4cf7b6e02ea;hb=30607e6bf4827d90fc055c8db1e7f363ef2693e6;hpb=78303bd63882bf70a079f25874a8ff78fa0f652c diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java index 2a44314..65d581f 100644 --- 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() {