X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FPoint.java;h=f011243748bee0ff0ba919050183ac67a84a4a54;hp=b98fb2d639ec2775cfd1c2cfb8fd9db840e98dd3;hb=00235327934dbc5ffaf5b09cbda538ee0d3686e8;hpb=14f962b26092736eed3d8bcfd2d5642c4be4e133

diff --git a/src/edu/berkeley/qfat/geom/Point.java b/src/edu/berkeley/qfat/geom/Point.java
index b98fb2d..f011243 100644
--- a/src/edu/berkeley/qfat/geom/Point.java
+++ b/src/edu/berkeley/qfat/geom/Point.java
@@ -36,9 +36,10 @@ public final class Point implements HasBoundingBox, AffineConstraint, HasPoint {
 
     public Point getProjection(Point p) { return this; }
     public AffineConstraint intersect(AffineConstraint c, float epsilon) {
-        if (c.getProjection(this).distance(this) <= epsilon) return this;
-        System.err.println("off by: " + c.getProjection(this).distance(this));
-        return new AffineConstraint.Nothing();
+        Point p2 = c.getProjection(this);
+        if (p2==null) return AffineConstraint.NONE;
+        if (p2.distance(this) <= epsilon) return this;
+        return AffineConstraint.NONE;
     }
     public AffineConstraint multiply(Matrix m) { return m.times(this); }