cache =
- provider.getCache(readerContext.reader());
+ provider.getCache(readerContext.reader());
+ private final Point from = ShapeFieldCacheDistanceValueSource.this.from;
+ private final DistanceCalculator calculator = ctx.getDistCalc();
+ private final double nullValue = (ctx.isGeo() ? 180 : Double.MAX_VALUE);
- return new FunctionValues() {
@Override
public float floatVal(int doc) {
return (float) doubleVal(doc);
@@ -73,7 +77,7 @@
}
return v;
}
- return Double.NaN; // ?? maybe max?
+ return nullValue;
}
@Override
@@ -90,16 +94,15 @@
ShapeFieldCacheDistanceValueSource that = (ShapeFieldCacheDistanceValueSource) o;
- if (calculator != null ? !calculator.equals(that.calculator) : that.calculator != null) return false;
- if (from != null ? !from.equals(that.from) : that.from != null) return false;
+ if (!ctx.equals(that.ctx)) return false;
+ if (!from.equals(that.from)) return false;
+ if (!provider.equals(that.provider)) return false;
return true;
}
@Override
public int hashCode() {
- int result = calculator != null ? calculator.hashCode() : 0;
- result = 31 * result + (from != null ? from.hashCode() : 0);
- return result;
+ return from.hashCode();
}
}
Index: lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java (revision 1384629)
+++ lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java (revision )
@@ -18,13 +18,14 @@
*/
import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import org.apache.lucene.document.Field;
-import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.queries.function.valuesource.ReciprocalFloatFunction;
+import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.FilteredQuery;
-import org.apache.lucene.search.Query;
import org.apache.lucene.spatial.query.SpatialArgs;
/**
@@ -99,25 +100,48 @@
public abstract Field[] createIndexableFields(Shape shape);
/**
- * The value source yields a number that is proportional to the distance between the query shape and indexed data.
+ * Make a ValueSource returning the closest distance between the center of the
+ * indexed shape and {@code queryPoint}.
+ * @param queryPoint
*/
- public abstract ValueSource makeValueSource(SpatialArgs args);
+ public abstract ValueSource makeDistanceValueSource(Point queryPoint);
/**
- * Make a query which has a score based on the distance from the data to the query shape.
- * The default implementation constructs a {@link FilteredQuery} based on
- * {@link #makeFilter(org.apache.lucene.spatial.query.SpatialArgs)} and
- * {@link #makeValueSource(org.apache.lucene.spatial.query.SpatialArgs)}.
+ * Make a (ConstantScore) Query based principally on {@link org.apache.lucene.spatial.query.SpatialOperation}
+ * and {@link Shape} from the supplied {@code args}.
+ * The default implementation is
+ * return new ConstantScoreQuery(makeFilter(args));
*/
- public Query makeQuery(SpatialArgs args) {
- Filter filter = makeFilter(args);
- ValueSource vs = makeValueSource(args);
- return new FilteredQuery(new FunctionQuery(vs), filter);
+ public ConstantScoreQuery makeQuery(SpatialArgs args) {
+ return new ConstantScoreQuery(makeFilter(args));
}
+
/**
- * Make a Filter
+ * Make a Filter based principally on {@link org.apache.lucene.spatial.query.SpatialOperation}
+ * and {@link Shape} from the supplied {@code args}.
+ *
+ * If a subclasses implements
+ * {@link #makeQuery(org.apache.lucene.spatial.query.SpatialArgs)}
+ * then this method could be simply:
+ * return new QueryWrapperFilter(makeQuery(args).getQuery());
*/
public abstract Filter makeFilter(SpatialArgs args);
+
+ /**
+ * Returns a ValueSource useful as a score. It is c/(d + c) where 'd' is the
+ * distance retrieved from {@link #makeDistanceValueSource(com.spatial4j.core.shape.Point)}
+ * and 'c' is one tenth the distance to the farthest edge from the center.
+ * Thus the scores will be as high as 1 for matching points in the center of
+ * the query shape and as low as ~0.1 at its furthest edges.
+ */
+ public final ValueSource makeRecipDistanceValueSource(Shape queryShape) {
+ Rectangle bbox = queryShape.getBoundingBox();
+ double diagonalDist = ctx.getDistCalc().distance(
+ ctx.makePoint(bbox.getMinX(), bbox.getMinY()), bbox.getMaxX(), bbox.getMaxY());
+ double distToEdge = diagonalDist * 0.5;
+ float c = (float)distToEdge * 0.1f;//one tenth
+ return new ReciprocalFloatFunction(makeDistanceValueSource(queryShape.getCenter()), 1f, c, c);
+ }
@Override
public String toString() {
Index: lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java (revision )
+++ lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java (revision )
@@ -0,0 +1,129 @@
+package org.apache.lucene.spatial;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Shape;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.spatial.bbox.BBoxStrategy;
+import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
+import org.apache.lucene.spatial.prefix.TermQueryPrefixTreeStrategy;
+import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree;
+import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree;
+import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree;
+import org.apache.lucene.spatial.vector.TwoDoublesStrategy;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author David Smiley - dsmiley@mitre.org
+ */
+public class DistanceStrategyTest extends StrategyTestCase {
+
+ @ParametersFactory
+ public static Iterable parameters() {
+ List ctorArgs = new ArrayList();
+
+ SpatialContext ctx = SpatialContext.GEO;
+ SpatialPrefixTree grid;
+ SpatialStrategy strategy;
+
+ grid = new QuadPrefixTree(ctx,25);
+ strategy = new RecursivePrefixTreeStrategy(grid, "recursive_quad");
+ ctorArgs.add(new Object[]{new Param(strategy)});
+
+ grid = new GeohashPrefixTree(ctx,12);
+ strategy = new TermQueryPrefixTreeStrategy(grid, "termquery_geohash");
+ ctorArgs.add(new Object[]{new Param(strategy)});
+
+ strategy = new TwoDoublesStrategy(ctx, "twodoubles");
+ ctorArgs.add(new Object[]{new Param(strategy)});
+
+ strategy = new BBoxStrategy(ctx, "bbox");
+ ctorArgs.add(new Object[]{new Param(strategy)});
+
+ return ctorArgs;
+ }
+
+ // this is a hack for clover!
+ static class Param {
+ SpatialStrategy strategy;
+
+ Param(SpatialStrategy strategy) {
+ this.strategy = strategy;
+ }
+
+ @Override
+ public String toString() {
+ return strategy.getFieldName();
+ }
+ }
+
+// private String fieldName;
+
+ public DistanceStrategyTest(@Name("strategy") Param param) {
+ SpatialStrategy strategy = param.strategy;
+ this.ctx = strategy.getSpatialContext();
+ this.strategy = strategy;
+ }
+
+ @Test
+ public void testDistanceOrder() throws IOException {
+ adoc("100", ctx.makePoint(2,1));
+ adoc("101", ctx.makePoint(-1,4));
+ adoc("103", (Shape)null);//test score for nothing
+ commit();
+ //FYI distances are in docid order
+ checkDistValueSource("3,4", 2.8274937f, 5.0898066f, 180f);
+ checkDistValueSource("4,0", 3.6043684f, 0.9975641f, 180f);
+ }
+
+ @Test
+ public void testRecipScore() throws IOException {
+ Point p100 = ctx.makePoint(2, 1);
+ adoc("100", p100);
+ Point p101 = ctx.makePoint(-1, 4);
+ adoc("101", p101);
+ adoc("103", (Shape)null);//test score for nothing
+ commit();
+
+ double dist = ctx.getDistCalc().distance(p100, p101);
+ Shape queryShape = ctx.makeCircle(2.01, 0.99, dist);
+ checkValueSource(strategy.makeRecipDistanceValueSource(queryShape),
+ new float[]{1.00f, 0.10f, 0f}, 0.09f);
+ }
+
+ @Override
+ protected Document newDoc(String id, Shape shape) {
+ //called by adoc(). Make compatible with BBoxStrategy.
+ if (shape != null && strategy instanceof BBoxStrategy)
+ shape = ctx.makeRectangle(shape.getCenter(), shape.getCenter());
+ return super.newDoc(id, shape);
+ }
+
+ void checkDistValueSource(String ptStr, float... distances) throws IOException {
+ Point pt = (Point) ctx.readShape(ptStr);
+ checkValueSource(strategy.makeDistanceValueSource(pt), distances, 1.0e-4f);
+ }
+}
Index: lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java (revision 1384629)
+++ lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java (revision )
@@ -23,10 +23,6 @@
import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.spatial.SpatialMatchConcern;
import org.apache.lucene.spatial.StrategyTestCase;
import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree;
@@ -196,17 +192,6 @@
assertTrue("has "+assertId,gotIds.contains(assertId));
}
}
- }
-
- private Document newDoc(String id, Shape shape) {
- Document doc = new Document();
- doc.add(new StringField("id", id, Field.Store.YES));
- for (Field f : strategy.createIndexableFields(shape)) {
- doc.add(f);
- }
- if (storeShape)
- doc.add(new StoredField(strategy.getFieldName(), ctx.toString(shape)));
- return doc;
}
/** NGeohash round-trip for given precision. */
Index: lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java (revision 1384629)
+++ lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java (revision )
@@ -84,8 +84,9 @@
minX[doc], maxX[doc],
minY[doc], maxY[doc]);
return (float) similarity.score(rect, null);
+ } else {
+ return (float) similarity.score(null, null);
}
- return 0;
}
public Explanation explain(int doc) {
Index: lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java (revision 1384629)
+++ lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java (revision )
@@ -32,14 +32,15 @@
import org.junit.Before;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public abstract class SpatialTestCase extends LuceneTestCase {
private DirectoryReader indexReader;
private RandomIndexWriter indexWriter;
private Directory directory;
- private IndexSearcher indexSearcher;
+ protected IndexSearcher indexSearcher;
@Override
@Before
Index: lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java (revision 1384629)
+++ lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java (revision )
@@ -18,6 +18,7 @@
*/
import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Rectangle;
import com.spatial4j.core.shape.Shape;
import org.apache.lucene.document.DoubleField;
@@ -114,29 +115,33 @@
//---------------------------------
@Override
- public ValueSource makeValueSource(SpatialArgs args) {
- Shape shape = args.getShape();
- if (!(shape instanceof Rectangle))
- throw new IllegalArgumentException("Can only get valueSource by Rectangle, not " + shape);
+ public ValueSource makeDistanceValueSource(Point queryPoint) {
return new BBoxSimilarityValueSource(
- this, new AreaSimilarity((Rectangle)shape, queryPower, targetPower));
+ this, new DistanceSimilarity(this.getSpatialContext(), queryPoint));
}
+ public ValueSource makeBBoxAreaSimilarityValueSource(Rectangle queryBox) {
+ return new BBoxSimilarityValueSource(
+ this, new AreaSimilarity(queryBox, queryPower, targetPower));
+ }
@Override
public Filter makeFilter(SpatialArgs args) {
- Query spatial = makeSpatialQuery(args);
- return new QueryWrapperFilter( spatial );
+ return new QueryWrapperFilter(makeSpatialQuery(args));
}
@Override
- public Query makeQuery(SpatialArgs args) {
+ public ConstantScoreQuery makeQuery(SpatialArgs args) {
+ return new ConstantScoreQuery(makeSpatialQuery(args));
+ }
+
+ public Query makeQueryWithValueSource(SpatialArgs args, ValueSource valueSource) {
BooleanQuery bq = new BooleanQuery();
Query spatial = makeSpatialQuery(args);
bq.add(new ConstantScoreQuery(spatial), BooleanClause.Occur.MUST);
-
+
// This part does the scoring
- Query spatialRankingQuery = new FunctionQuery(makeValueSource(args));
+ Query spatialRankingQuery = new FunctionQuery(valueSource);
bq.add(spatialRankingQuery, BooleanClause.Occur.MUST);
return bq;
}
Index: lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java (revision 1384629)
+++ lucene/spatial/src/java/org/apache/lucene/spatial/vector/TwoDoublesStrategy.java (revision )
@@ -30,6 +30,7 @@
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.MatchAllDocsQuery;
@@ -94,32 +95,32 @@
}
@Override
- public ValueSource makeValueSource(SpatialArgs args) {
- Point p = args.getShape().getCenter();
- return new DistanceValueSource(this, p, ctx.getDistCalc());
+ public ValueSource makeDistanceValueSource(Point queryPoint) {
+ return new DistanceValueSource(this, queryPoint);
}
@Override
public Filter makeFilter(SpatialArgs args) {
- if( args.getShape() instanceof Circle) {
- if( SpatialOperation.is( args.getOperation(),
- SpatialOperation.Intersects,
- SpatialOperation.IsWithin )) {
- Circle circle = (Circle)args.getShape();
- Query bbox = makeWithin(circle.getBoundingBox());
+ return new QueryWrapperFilter(makeQuery(args).getQuery());
+ }
- // Make the ValueSource
- ValueSource valueSource = makeValueSource(args);
-
- return new ValueSourceFilter(
- new QueryWrapperFilter( bbox ), valueSource, 0, circle.getRadius() );
+ @Override
+ public ConstantScoreQuery makeQuery(SpatialArgs args) {
+ if(! SpatialOperation.is( args.getOperation(),
+ SpatialOperation.Intersects,
+ SpatialOperation.IsWithin ))
+ throw new UnsupportedSpatialOperation(args.getOperation());
+ Shape shape = args.getShape();
+ if (!(shape instanceof Rectangle))
+ throw new InvalidShapeException("Only Rectangle is currently supported, got "+shape.getClass());
+ Rectangle bbox = (Rectangle) shape;
+ if (bbox.getCrossesDateLine()) {
+ throw new UnsupportedOperationException( "Crossing dateline not yet supported" );
- }
+ }
+ return new ConstantScoreQuery(makeWithin(bbox));
- }
+ }
- return new QueryWrapperFilter( makeQuery(args) );
- }
- @Override
- public Query makeQuery(SpatialArgs args) {
+ public Query makeQueryDistanceScore(SpatialArgs args) {
// For starters, just limit the bbox
Shape shape = args.getShape();
if (!(shape instanceof Rectangle || shape instanceof Circle)) {
@@ -151,7 +152,7 @@
Circle circle = (Circle)args.getShape();
// Make the ValueSource
- valueSource = makeValueSource(args);
+ valueSource = makeDistanceValueSource(shape.getCenter());
ValueSourceFilter vsf = new ValueSourceFilter(
new QueryWrapperFilter( spatial ), valueSource, 0, circle.getRadius() );
@@ -171,7 +172,7 @@
valueSource = new CachingDoubleValueSource(valueSource);
}
else {
- valueSource = makeValueSource(args);
+ valueSource = makeDistanceValueSource(shape.getCenter());
}
Query spatialRankingQuery = new FunctionQuery(valueSource);
BooleanQuery bq = new BooleanQuery();
@@ -212,19 +213,19 @@
*/
Query makeDisjoint(Rectangle bbox) {
Query qX = NumericRangeQuery.newDoubleRange(
- fieldNameX,
- precisionStep,
- bbox.getMinX(),
- bbox.getMaxX(),
- true,
- true);
+ fieldNameX,
+ precisionStep,
+ bbox.getMinX(),
+ bbox.getMaxX(),
+ true,
+ true);
Query qY = NumericRangeQuery.newDoubleRange(
- fieldNameY,
- precisionStep,
- bbox.getMinY(),
- bbox.getMaxY(),
- true,
- true);
+ fieldNameY,
+ precisionStep,
+ bbox.getMinY(),
+ bbox.getMaxY(),
+ true,
+ true);
BooleanQuery bq = new BooleanQuery();
bq.add(qX,BooleanClause.Occur.MUST_NOT);
Index: lucene/spatial/src/java/org/apache/lucene/spatial/bbox/DistanceSimilarity.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/java/org/apache/lucene/spatial/bbox/DistanceSimilarity.java (revision )
+++ lucene/spatial/src/java/org/apache/lucene/spatial/bbox/DistanceSimilarity.java (revision )
@@ -0,0 +1,58 @@
+package org.apache.lucene.spatial.bbox;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.distance.DistanceCalculator;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Rectangle;
+import org.apache.lucene.search.Explanation;
+
+/**
+ * Returns the distance between the center of the indexed rectangle and the
+ * query shape.
+ * @lucene.experimental
+ */
+public class DistanceSimilarity implements BBoxSimilarity {
+ private final Point queryPoint;
+ private final DistanceCalculator distCalc;
+ private final double nullValue;
+
+ public DistanceSimilarity(SpatialContext ctx, Point queryPoint) {
+ this.queryPoint = queryPoint;
+ this.distCalc = ctx.getDistCalc();
+ this.nullValue = (ctx.isGeo() ? 180 : Double.MAX_VALUE);
+ }
+
+ @Override
+ public double score(Rectangle indexRect, Explanation exp) {
+ double score;
+ if (indexRect == null) {
+ score = nullValue;
+ } else {
+ score = distCalc.distance(queryPoint, indexRect.getCenter());
+ }
+ if (exp != null) {
+ exp.setValue((float)score);
+ exp.setDescription(this.getClass().getSimpleName());
+ exp.addDetail(new Explanation(-1f,""+queryPoint));
+ exp.addDetail(new Explanation(-1f,""+indexRect));
+ }
+ return score;
+ }
+}
Index: lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (revision 1384629)
+++ lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (revision )
@@ -27,6 +27,11 @@
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
+import org.apache.lucene.queries.function.FunctionQuery;
+import org.apache.lucene.queries.function.ValueSource;
+import org.apache.lucene.search.CheckHits;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.spatial.query.SpatialArgsParser;
import org.junit.Assert;
@@ -167,4 +172,47 @@
}
}
}
+
+ protected void adoc(String id, String shapeStr) throws IOException {
+ Shape shape = shapeStr==null ? null : new ShapeReadWriter(ctx).readShape(shapeStr);
+ addDocument(newDoc(id, shape));
+ }
+ protected void adoc(String id, Shape shape) throws IOException {
+ addDocument(newDoc(id, shape));
+ }
+
+ protected Document newDoc(String id, Shape shape) {
+ Document doc = new Document();
+ doc.add(new StringField("id", id, Field.Store.YES));
+ if (shape != null) {
+ for (Field f : strategy.createIndexableFields(shape)) {
+ doc.add(f);
+ }
+ if (storeShape)
+ doc.add(new StoredField(strategy.getFieldName(), ctx.toString(shape)));
+ }
+ return doc;
+ }
+
+ /** scores[] are in docId order */
+ protected void checkValueSource(ValueSource vs, float scores[], float delta) throws IOException {
+ FunctionQuery q = new FunctionQuery(vs);
+
+// //TODO is there any point to this check?
+// int expectedDocs[] = new int[scores.length];//fill with ascending 0....length-1
+// for (int i = 0; i < expectedDocs.length; i++) {
+// expectedDocs[i] = i;
+// }
+// CheckHits.checkHits(random(), q, "", indexSearcher, expectedDocs);
+
+ TopDocs docs = indexSearcher.search(q, 1000);//calculates the score
+ for (int i = 0; i < docs.scoreDocs.length; i++) {
+ ScoreDoc gotSD = docs.scoreDocs[i];
+ float expectedScore = scores[gotSD.doc];
+ assertEquals("Not equal for doc "+gotSD.doc, expectedScore, gotSD.score, delta);
+ }
+
+ CheckHits.checkExplanations(q, "", indexSearcher);
+ }
+
}