X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fbind%2FBindingGroup.java;h=6b06b47b44fcee8f213e20871e155ce5977b944c;hp=501fb813c0b71a95a0c916e6f93a305981709505;hb=HEAD;hpb=d52f92b29c1987b5734c7183a9c01b5660f86482 diff --git a/src/edu/berkeley/qfat/bind/BindingGroup.java b/src/edu/berkeley/qfat/bind/BindingGroup.java index 501fb81..6b06b47 100644 --- a/src/edu/berkeley/qfat/bind/BindingGroup.java +++ b/src/edu/berkeley/qfat/bind/BindingGroup.java @@ -33,11 +33,18 @@ class BindingGroup implements Iterable { void merge(BindingGroup bg, Matrix m, float epsilon) { if (bg==this) { if (m.equalsModuloEpsilon(Matrix.ONE, epsilon)) return; + /* + if (master instanceof edu.berkeley.qfat.Mesh.Vertex) + System.err.println(m.times(m)); + */ // FIXME: what if points do not fall on the merged constraint-line? constraint = constraint.intersect(m.getAffineConstraint(epsilon), epsilon); return; } + // bg.master = m * master + // hbg = bg.getMatrix(hbg) * bg.master + // hbg = bg.getMatrix(hbg) * m * master for(HasBindingGroup hbg : bg) { matrices.put((T)hbg, bg.getMatrix((T)hbg).times(m)); hbg.bindingGroup = this;