X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FMatrix.java;h=c2419d6fa7aa9f3179da3304522ed724a95548dd;hb=7c73c0f732bbadef09d098b7f4542b060fdacc7d;hp=372e6c2db5329155417beb9b276b7e9074ffd32b;hpb=5dc5f8e70f3e4088f0f787e4c5e94d95c7e4c95f;p=anneal.git diff --git a/src/edu/berkeley/qfat/geom/Matrix.java b/src/edu/berkeley/qfat/geom/Matrix.java index 372e6c2..c2419d6 100644 --- a/src/edu/berkeley/qfat/geom/Matrix.java +++ b/src/edu/berkeley/qfat/geom/Matrix.java @@ -367,16 +367,16 @@ public class Matrix { } /** returns the constraint-conjunction "(forall v)Mv=v" */ - public AffineConstraint getConstraint(float epsilon) { - AffineConstraint c1 = getConstraint(a-1, b, c, d , epsilon); - AffineConstraint c2 = getConstraint(e, f-1, g, h , epsilon); - AffineConstraint c3 = getConstraint(i, j, k-1, l , epsilon); + public AffineConstraint getAffineConstraint(float epsilon) { + AffineConstraint c1 = getAffineConstraint(a-1, b, c, d , epsilon); + AffineConstraint c2 = getAffineConstraint(e, f-1, g, h , epsilon); + AffineConstraint c3 = getAffineConstraint(i, j, k-1, l , epsilon); // FIXME: bottom row constraint? return c1.intersect(c2.intersect(c3, epsilon), epsilon); } /** the AffineConstraint representing ax+by+cz+d=0 */ - private static AffineConstraint getConstraint(float a, float b, float c, float d, float epsilon) { + private static AffineConstraint getAffineConstraint(float a, float b, float c, float d, float epsilon) { a = Math.abs(a) <= epsilon ? 0 : a; b = Math.abs(b) <= epsilon ? 0 : b; c = Math.abs(c) <= epsilon ? 0 : c;