You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/08/24 20:05:22 UTC
svn commit: r1697469 - in
/lucene/dev/branches/lucene6699/lucene/spatial3d/src:
java/org/apache/lucene/geo3d/Plane.java
java/org/apache/lucene/geo3d/Vector.java
java/org/apache/lucene/geo3d/XYZBounds.java
test/org/apache/lucene/geo3d/GeoCircleTest.java
Author: mikemccand
Date: Mon Aug 24 18:05:21 2015
New Revision: 1697469
URL: http://svn.apache.org/r1697469
Log:
LUCENE-6699: iterate
Modified:
lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java
lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java
lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java
lucene/dev/branches/lucene6699/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java
Modified: lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java?rev=1697469&r1=1697468&r2=1697469&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java (original)
+++ lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java Mon Aug 24 18:05:21 2015
@@ -819,9 +819,11 @@ public class Plane extends Vector {
// the y, and we use all four resulting points in the bounds computation.
if ((Math.abs(A) >= MINIMUM_RESOLUTION || Math.abs(B) >= MINIMUM_RESOLUTION)) {
// NOT a degenerate case
- final GeoPoint[] points = findIntersections(planetModel, constructNormalizedZPlane(A,B), bounds, NO_BOUNDS);
+ final Plane normalizedZPlane = constructNormalizedZPlane(A,B);
+ final GeoPoint[] points = findIntersections(planetModel, normalizedZPlane, bounds, NO_BOUNDS);
for (final GeoPoint point : points) {
assert planetModel.pointOnSurface(point);
+ //System.err.println("Point = "+point+"; this.evaluate(point)="+this.evaluate(point)+"; normalizedZPlane.evaluate(point)="+normalizedZPlane.evaluate(point));
addPoint(boundsInfo, bounds, point);
}
} else {
Modified: lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java?rev=1697469&r1=1697468&r2=1697469&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java (original)
+++ lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java Mon Aug 24 18:05:21 2015
@@ -28,7 +28,7 @@ public class Vector {
* Values that are all considered to be essentially zero have a magnitude
* less than this.
*/
- public static final double MINIMUM_RESOLUTION = 1e-12;//7.5e-11;
+ public static final double MINIMUM_RESOLUTION = 1.5e-12;//7.5e-11;
/**
* For squared quantities, the bound is squared too.
*/
Modified: lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java?rev=1697469&r1=1697468&r2=1697469&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java (original)
+++ lucene/dev/branches/lucene6699/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java Mon Aug 24 18:05:21 2015
@@ -24,6 +24,14 @@ package org.apache.lucene.geo3d;
*/
public class XYZBounds implements Bounds {
+ /** A 'fudge factor', which is added to maximums and subtracted from minimums,
+ * in order to compensate for potential error deltas. This would not be necessary
+ * except that our 'bounds' is defined as always equaling or exceeding the boundary
+ * of the shape, and we cannot guarantee that without making MINIMUM_RESOLUTION
+ * unacceptably large.
+ */
+ protected static final double FUDGE_FACTOR = Vector.MINIMUM_RESOLUTION * 100.0;
+
/** Minimum x */
protected Double minX = null;
/** Maximum x */
@@ -189,11 +197,13 @@ public class XYZBounds implements Bounds
@Override
public Bounds addXValue(final GeoPoint point) {
final double x = point.x;
- if (minX == null || minX > x) {
- minX = new Double(x);
- }
- if (maxX == null || maxX < x) {
- maxX = new Double(x);
+ final double small = x - FUDGE_FACTOR;
+ if (minX == null || minX > small) {
+ minX = new Double(small);
+ }
+ final double large = x + FUDGE_FACTOR;
+ if (maxX == null || maxX < large) {
+ maxX = new Double(large);
}
return this;
}
@@ -201,11 +211,13 @@ public class XYZBounds implements Bounds
@Override
public Bounds addYValue(final GeoPoint point) {
final double y = point.y;
- if (minY == null || minY > y) {
- minY = new Double(y);
- }
- if (maxY == null || maxY < y) {
- maxY = new Double(y);
+ final double small = y - FUDGE_FACTOR;
+ if (minY == null || minY > small) {
+ minY = new Double(small);
+ }
+ final double large = y + FUDGE_FACTOR;
+ if (maxY == null || maxY < large) {
+ maxY = new Double(large);
}
return this;
}
@@ -213,11 +225,13 @@ public class XYZBounds implements Bounds
@Override
public Bounds addZValue(final GeoPoint point) {
final double z = point.z;
- if (minZ == null || minZ > z) {
- minZ = new Double(z);
- }
- if (maxZ == null || maxZ < z) {
- maxZ = new Double(z);
+ final double small = z - FUDGE_FACTOR;
+ if (minZ == null || minZ > small) {
+ minZ = new Double(small);
+ }
+ final double large = z + FUDGE_FACTOR;
+ if (maxZ == null || maxZ < large) {
+ maxZ = new Double(large);
}
return this;
}
Modified: lucene/dev/branches/lucene6699/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6699/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java?rev=1697469&r1=1697468&r2=1697469&view=diff
==============================================================================
--- lucene/dev/branches/lucene6699/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java (original)
+++ lucene/dev/branches/lucene6699/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java Mon Aug 24 18:05:21 2015
@@ -100,7 +100,48 @@ public class GeoCircleTest extends Lucen
GeoArea area;
GeoPoint p1;
GeoPoint p2;
+ int relationship;
+
+ // Tenth BKD discovered failure
+ c = new GeoCircle(PlanetModel.WGS84,-0.0018829770647349636,-0.001969499061382591,1.3045439293158305E-5);
+ xyzb = new XYZBounds();
+ c.getBounds(xyzb);
+ area = GeoAreaFactory.makeGeoArea(PlanetModel.WGS84,
+ xyzb.getMinimumX(), xyzb.getMaximumX(), xyzb.getMinimumY(), xyzb.getMaximumY(), xyzb.getMinimumZ(), xyzb.getMaximumZ());
+ //System.err.println(area);
+ relationship = area.getRelationship(c);
+ assertTrue(GeoArea.WITHIN == relationship || GeoArea.OVERLAPS == relationship);
+
+ // Ninth BKD discovered failure
+ c = new GeoCircle(PlanetModel.SPHERE,-4.211990380885122E-5,-0.0022958453508173044,1.4318475623498535E-5);
+ xyzb = new XYZBounds();
+ c.getBounds(xyzb);
+ area = GeoAreaFactory.makeGeoArea(PlanetModel.SPHERE,
+ xyzb.getMinimumX(), xyzb.getMaximumX(), xyzb.getMinimumY(), xyzb.getMaximumY(), xyzb.getMinimumZ(), xyzb.getMaximumZ());
+ //System.err.println(area);
+ relationship = area.getRelationship(c);
+ assertTrue(GeoArea.WITHIN == relationship || GeoArea.OVERLAPS == relationship);
+ // Eighth BKD discovered failure
+ c = new GeoCircle(PlanetModel.SPHERE,0.005321278689117842,-0.00216937368755372,1.5306034422500785E-4);
+ xyzb = new XYZBounds();
+ c.getBounds(xyzb);
+ area = GeoAreaFactory.makeGeoArea(PlanetModel.SPHERE,
+ xyzb.getMinimumX(), xyzb.getMaximumX(), xyzb.getMinimumY(), xyzb.getMaximumY(), xyzb.getMinimumZ(), xyzb.getMaximumZ());
+ //System.err.println(area);
+ relationship = area.getRelationship(c);
+ assertTrue(GeoArea.WITHIN == relationship || GeoArea.OVERLAPS == relationship);
+
+ // Seventh BKD discovered failure
+ c = new GeoCircle(PlanetModel.SPHERE,-0.0021627146783861745, -0.0017298167021592304,2.0818312293195752E-4);
+ xyzb = new XYZBounds();
+ c.getBounds(xyzb);
+ area = GeoAreaFactory.makeGeoArea(PlanetModel.SPHERE,
+ xyzb.getMinimumX(), xyzb.getMaximumX(), xyzb.getMinimumY(), xyzb.getMaximumY(), xyzb.getMinimumZ(), xyzb.getMaximumZ());
+ //System.err.println(area);
+ relationship = area.getRelationship(c);
+ assertTrue(GeoArea.WITHIN == relationship || GeoArea.OVERLAPS == relationship);
+
// Sixth BKD discovered failure
c = new GeoCircle(PlanetModel.WGS84,-0.006450320645814321,0.004660694205115142,0.00489710732634323);
//xyzb = new XYZBounds();
@@ -161,7 +202,7 @@ public class GeoCircleTest extends Lucen
area = GeoAreaFactory.makeGeoArea(PlanetModel.SPHERE,
xyzb.getMinimumX(), xyzb.getMaximumX(), xyzb.getMinimumY(), xyzb.getMaximumY(), xyzb.getMinimumZ(), xyzb.getMaximumZ());
- int relationship = area.getRelationship(c);
+ relationship = area.getRelationship(c);
assertTrue(relationship == GeoArea.WITHIN || relationship == GeoArea.OVERLAPS);
// Test case from BKD