X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FHasBindingGroup.java;h=16dee1c8f4753f6d733370a8b2102a1313ca4456;hp=65d581f9d5cce15645948c31a8fb6070a79fc8d7;hb=64c6939d78acfa06e7bc380cb713e3800bf16be5;hpb=30607e6bf4827d90fc055c8db1e7f363ef2693e6 diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java index 65d581f..16dee1c 100644 --- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java +++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java @@ -16,28 +16,6 @@ public abstract class HasBindingGroup { if (bindingGroup == null) bindingGroup = new BindingGroup(this); if (other.bindingGroup == null) other.bindingGroup = new BindingGroup(other); - if (other.bindingGroup == this.bindingGroup) { - if (getBindingMatrix(other).equals(bindingMatrix)) - return; - /* - if (this instanceof Mesh.E) - throw new Error("rebind attempt: "+this+" and "+other+" with " - + bindingMatrix - + "; expected " - + getBindingMatrix(other)); - */ - setConstraint(bindingMatrix); - /* - System.err.println("WARNING: discarding rebind attempt: "+this+" and "+other+m); - */ - //" with " - //+ bindingMatrix - //+ "; expected " - //+ getBindingMatrix(other)); - return; - } - - bindingMatrix = getBindingMatrix().inverse() .times(bindingMatrix) @@ -61,22 +39,6 @@ public abstract class HasBindingGroup { return bindingGroup.getMatrix(this, other); } - public HasBindingGroup getMaster() { - if (bindingGroup==null) return this; - return bindingGroup.getMaster(); - } - - public Matrix getConstraint() { - if (bindingGroup==null) return Matrix.ONE; - Matrix v = getBindingMatrix(getMaster()); - 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() { if (bindingGroup==null) return; bindingGroup.unbind(this);