You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/03/25 15:00:43 UTC
svn commit: r1085374 - in /lucene/dev/trunk:
lucene/contrib/misc/src/test/org/apache/lucene/index/
lucene/contrib/misc/src/test/org/apache/lucene/misc/
lucene/src/java/org/apache/lucene/search/
lucene/src/test/org/apache/lucene/index/ lucene/src/test/o...
Author: rmuir
Date: Fri Mar 25 14:00:42 2011
New Revision: 1085374
URL: http://svn.apache.org/viewvc?rev=1085374&view=rev
Log:
LUCENE-2986: split DefaultSimilarity's provider methods into DefaultSimilarityProvider; clean up uses of sim in tests
Added:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarityProvider.java (with props)
Modified:
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Similarity.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
lucene/dev/trunk/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Fri Mar 25 14:00:42 2011
@@ -26,8 +26,10 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
@@ -42,10 +44,15 @@ public class TestFieldNormModifier exten
public Directory store;
/** inverts the normal notion of lengthNorm */
- public static SimilarityProvider s = new DefaultSimilarity() {
+ public static SimilarityProvider s = new DefaultSimilarityProvider() {
@Override
- public float computeNorm(FieldInvertState state) {
- return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+ @Override
+ public float computeNorm(FieldInvertState state) {
+ return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
+ }
+ };
}
};
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java Fri Mar 25 14:00:42 2011
@@ -19,6 +19,7 @@
package org.apache.lucene.misc;
import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.util.LuceneTestCase;
@@ -84,7 +85,7 @@ public class SweetSpotSimilarityTest ext
final SweetSpotSimilarity ssB = new SweetSpotSimilarity();
ssB.setLengthNormFactors(5,8,0.1f, false);
- SimilarityProvider sp = new SweetSpotSimilarity() {
+ SimilarityProvider sp = new DefaultSimilarityProvider() {
public Similarity get(String field) {
if (field.equals("bar"))
return ssBar;
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Fri Mar 25 14:00:42 2011
@@ -31,8 +31,10 @@ import org.apache.lucene.index.MultiNorm
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
@@ -47,12 +49,17 @@ public class TestLengthNormModifier exte
public Directory store;
/** inverts the normal notion of lengthNorm */
- public static SimilarityProvider s = new DefaultSimilarity() {
- @Override
- public float computeNorm(FieldInvertState state) {
- return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
- }
- };
+ public static SimilarityProvider s = new DefaultSimilarityProvider() {
+ @Override
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+ @Override
+ public float computeNorm(FieldInvertState state) {
+ return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
+ }
+ };
+ }
+ };
@Override
public void setUp() throws Exception {
@@ -163,12 +170,18 @@ public class TestLengthNormModifier exte
}
// override the norms to be inverted
- SimilarityProvider s = new DefaultSimilarity() {
- @Override
- public float computeNorm(FieldInvertState state) {
- return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
- }
- };
+ SimilarityProvider s = new DefaultSimilarityProvider() {
+ @Override
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+ @Override
+ public float computeNorm(FieldInvertState state) {
+ return state.getBoost() * (discountOverlaps ? state.getLength() - state.getNumOverlap() : state.getLength());
+ }
+ };
+ }
+ };
+
FieldNormModifier fnm = new FieldNormModifier(store, s);
fnm.reSetNorms("field");
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarity.java Fri Mar 25 14:00:42 2011
@@ -20,7 +20,7 @@ import org.apache.lucene.index.FieldInve
*/
/** Expert: Default scoring implementation. */
-public class DefaultSimilarity extends Similarity implements SimilarityProvider {
+public class DefaultSimilarity extends Similarity {
/** Implemented as
* <code>state.getBoost()*lengthNorm(numTerms)</code>, where
@@ -40,11 +40,6 @@ public class DefaultSimilarity extends S
return state.getBoost() * ((float) (1.0 / Math.sqrt(numTerms)));
}
- /** Implemented as <code>1/sqrt(sumOfSquaredWeights)</code>. */
- public float queryNorm(float sumOfSquaredWeights) {
- return (float)(1.0 / Math.sqrt(sumOfSquaredWeights));
- }
-
/** Implemented as <code>sqrt(freq)</code>. */
@Override
public float tf(float freq) {
@@ -63,11 +58,6 @@ public class DefaultSimilarity extends S
return (float)(Math.log(numDocs/(double)(docFreq+1)) + 1.0);
}
- /** Implemented as <code>overlap / maxOverlap</code>. */
- public float coord(int overlap, int maxOverlap) {
- return overlap / (float)maxOverlap;
- }
-
// Default true
protected boolean discountOverlaps = true;
@@ -88,12 +78,4 @@ public class DefaultSimilarity extends S
public boolean getDiscountOverlaps() {
return discountOverlaps;
}
-
- /**
- * Returns this default implementation for all fields.
- * Override this method to customize scoring on a per-field basis.
- */
- public Similarity get(String field) {
- return this;
- }
}
Added: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarityProvider.java?rev=1085374&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarityProvider.java (added)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/DefaultSimilarityProvider.java Fri Mar 25 14:00:42 2011
@@ -0,0 +1,41 @@
+package org.apache.lucene.search;
+
+/**
+ * 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.
+ */
+
+/**
+ * Expert: Default scoring provider.
+ * <p>
+ * Returns {@link DefaultSimilarity} for every field
+ */
+public class DefaultSimilarityProvider implements SimilarityProvider {
+ private static final Similarity impl = new DefaultSimilarity();
+
+ /** Implemented as <code>overlap / maxOverlap</code>. */
+ public float coord(int overlap, int maxOverlap) {
+ return overlap / (float)maxOverlap;
+ }
+
+ /** Implemented as <code>1/sqrt(sumOfSquaredWeights)</code>. */
+ public float queryNorm(float sumOfSquaredWeights) {
+ return (float)(1.0 / Math.sqrt(sumOfSquaredWeights));
+ }
+
+ public Similarity get(String field) {
+ return impl;
+ }
+}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/IndexSearcher.java Fri Mar 25 14:00:42 2011
@@ -72,7 +72,7 @@ public class IndexSearcher {
private final ExecutorService executor;
// the default SimilarityProvider
- private static final SimilarityProvider defaultProvider = new DefaultSimilarity();
+ private static final SimilarityProvider defaultProvider = new DefaultSimilarityProvider();
/**
* Expert: returns a default SimilarityProvider instance.
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Similarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Similarity.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Similarity.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/Similarity.java Fri Mar 25 14:00:42 2011
@@ -362,7 +362,7 @@ import org.apache.lucene.util.SmallFloat
* than another document with fewer query terms.
* This is a search time factor computed in
* {@link SimilarityProvider#coord(int, int) coord(q,d)}
- * by the Similarity in effect at search time.
+ * by the SimilarityProvider in effect at search time.
* <br> <br>
* </li>
*
@@ -373,17 +373,17 @@ import org.apache.lucene.util.SmallFloat
* is a normalizing factor used to make scores between queries comparable.
* This factor does not affect document ranking (since all ranked documents are multiplied by the same factor),
* but rather just attempts to make scores from different queries (or even different indexes) comparable.
- * This is a search time factor computed by the Similarity in effect at search time.
+ * This is a search time factor computed by the SimilarityProvider in effect at search time.
*
* The default computation in
- * {@link org.apache.lucene.search.DefaultSimilarity#queryNorm(float) DefaultSimilarity}
+ * {@link org.apache.lucene.search.DefaultSimilarityProvider#queryNorm(float) DefaultSimilarityProvider}
* produces a <a href="http://en.wikipedia.org/wiki/Euclidean_norm#Euclidean_norm">Euclidean norm</a>:
* <br> <br>
* <table cellpadding="1" cellspacing="0" border="0" align="center">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* queryNorm(q) =
- * {@link org.apache.lucene.search.DefaultSimilarity#queryNorm(float) queryNorm(sumOfSquaredWeights)}
+ * {@link org.apache.lucene.search.DefaultSimilarityProvider#queryNorm(float) queryNorm(sumOfSquaredWeights)}
* =
* </td>
* <td valign="middle" align="center" rowspan="1">
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java Fri Mar 25 14:00:42 2011
@@ -31,6 +31,7 @@ import org.apache.lucene.document.Field.
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.SegmentReader.Norm;
import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.store.Directory;
@@ -41,17 +42,22 @@ import org.apache.lucene.util.LuceneTest
*/
public class TestIndexReaderCloneNorms extends LuceneTestCase {
- private class SimilarityOne extends DefaultSimilarity {
+ private class SimilarityProviderOne extends DefaultSimilarityProvider {
@Override
- public float computeNorm(FieldInvertState state) {
- // diable length norm
- return state.getBoost();
- }
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+ @Override
+ public float computeNorm(FieldInvertState state) {
+ // diable length norm
+ return state.getBoost();
+ }
+ };
+ }
}
private static final int NUM_FIELDS = 10;
- private SimilarityProvider similarityOne;
+ private SimilarityProvider similarityProviderOne;
private Analyzer anlzr;
@@ -68,7 +74,7 @@ public class TestIndexReaderCloneNorms e
@Override
public void setUp() throws Exception {
super.setUp();
- similarityOne = new SimilarityOne();
+ similarityProviderOne = new SimilarityProviderOne();
anlzr = new MockAnalyzer();
}
@@ -249,7 +255,7 @@ public class TestIndexReaderCloneNorms e
}
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.CREATE)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityOne).setMergePolicy(newLogMergePolicy()));
+ .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newLogMergePolicy()));
LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
lmp.setMergeFactor(3);
@@ -307,7 +313,7 @@ public class TestIndexReaderCloneNorms e
throws IOException {
IndexWriterConfig conf = newIndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityOne).setMergePolicy(newLogMergePolicy());
+ .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newLogMergePolicy());
LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setMergeFactor(3);
lmp.setUseCompoundFile(compound);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Fri Mar 25 14:00:42 2011
@@ -26,14 +26,14 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.index.DocumentsWriter.IndexingChain;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
public class TestIndexWriterConfig extends LuceneTestCase {
- private static final class MySimilarity extends DefaultSimilarity {
+ private static final class MySimilarityProvider extends DefaultSimilarityProvider {
// Does not implement anything - used only for type checking on IndexWriterConfig.
}
@@ -177,8 +177,8 @@ public class TestIndexWriterConfig exten
// Test Similarity:
// we shouldnt assert what the default is, just that its not null.
assertTrue(IndexSearcher.getDefaultSimilarityProvider() == conf.getSimilarityProvider());
- conf.setSimilarityProvider(new MySimilarity());
- assertEquals(MySimilarity.class, conf.getSimilarityProvider().getClass());
+ conf.setSimilarityProvider(new MySimilarityProvider());
+ assertEquals(MySimilarityProvider.class, conf.getSimilarityProvider().getClass());
conf.setSimilarityProvider(null);
assertTrue(IndexSearcher.getDefaultSimilarityProvider() == conf.getSimilarityProvider());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMaxTermFrequency.java Fri Mar 25 14:00:42 2011
@@ -27,6 +27,8 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
+import org.apache.lucene.search.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -46,7 +48,12 @@ public class TestMaxTermFrequency extend
dir = newDirectory();
IndexWriterConfig config = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(MockTokenizer.SIMPLE, true)).setMergePolicy(newInOrderLogMergePolicy());
- config.setSimilarityProvider(new TestSimilarity());
+ config.setSimilarityProvider(new DefaultSimilarityProvider() {
+ @Override
+ public Similarity get(String field) {
+ return new TestSimilarity();
+ }
+ });
RandomIndexWriter writer = new RandomIndexWriter(random, dir, config);
Document doc = new Document();
Field foo = newField("foo", "", Field.Store.NO, Field.Index.ANALYZED);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java Fri Mar 25 14:00:42 2011
@@ -29,6 +29,7 @@ import org.apache.lucene.document.Field.
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.store.Directory;
@@ -40,17 +41,22 @@ import org.apache.lucene.util.LuceneTest
*/
public class TestNorms extends LuceneTestCase {
- private class SimilarityOne extends DefaultSimilarity {
+ private class SimilarityProviderOne extends DefaultSimilarityProvider {
@Override
- public float computeNorm(FieldInvertState state) {
- // Disable length norm
- return state.getBoost();
- }
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+ @Override
+ public float computeNorm(FieldInvertState state) {
+ // diable length norm
+ return state.getBoost();
+ }
+ };
+ }
}
private static final int NUM_FIELDS = 10;
- private SimilarityProvider similarityOne;
+ private SimilarityProvider similarityProviderOne;
private Analyzer anlzr;
private int numDocNorms;
private ArrayList<Float> norms;
@@ -61,7 +67,7 @@ public class TestNorms extends LuceneTes
@Override
public void setUp() throws Exception {
super.setUp();
- similarityOne = new SimilarityOne();
+ similarityProviderOne = new SimilarityProviderOne();
anlzr = new MockAnalyzer();
}
@@ -152,7 +158,7 @@ public class TestNorms extends LuceneTes
private void createIndex(Random random, Directory dir) throws IOException {
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.CREATE)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityOne).setMergePolicy(newInOrderLogMergePolicy()));
+ .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newInOrderLogMergePolicy()));
LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
lmp.setMergeFactor(3);
lmp.setUseCompoundFile(true);
@@ -186,7 +192,7 @@ public class TestNorms extends LuceneTes
assertEquals("number of norms mismatches",numDocNorms,b.length);
ArrayList<Float> storedNorms = (i==1 ? modifiedNorms : norms);
for (int j = 0; j < b.length; j++) {
- float norm = similarityOne.get(field).decodeNormValue(b[j]);
+ float norm = similarityProviderOne.get(field).decodeNormValue(b[j]);
float norm1 = storedNorms.get(j).floatValue();
assertEquals("stored norm value of "+field+" for doc "+j+" is "+norm+" - a mismatch!", norm, norm1, 0.000001);
}
@@ -197,7 +203,7 @@ public class TestNorms extends LuceneTes
private void addDocs(Random random, Directory dir, int ndocs, boolean compound) throws IOException {
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityOne).setMergePolicy(newInOrderLogMergePolicy()));
+ .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newInOrderLogMergePolicy()));
LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
lmp.setMergeFactor(3);
lmp.setUseCompoundFile(compound);
@@ -222,7 +228,7 @@ public class TestNorms extends LuceneTes
// return unique norm values that are unchanged by encoding/decoding
private float nextNorm(String fname) {
float norm = lastNorm + normDelta;
- Similarity similarity = similarityOne.get(fname);
+ Similarity similarity = similarityProviderOne.get(fname);
do {
float norm1 = similarity.decodeNormValue(similarity.encodeNormValue(norm));
if (norm1 > lastNorm) {
@@ -261,7 +267,12 @@ public class TestNorms extends LuceneTes
public void testCustomEncoder() throws Exception {
Directory dir = newDirectory();
IndexWriterConfig config = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer());
- config.setSimilarityProvider(new CustomNormEncodingSimilarity());
+ config.setSimilarityProvider(new DefaultSimilarityProvider() {
+ @Override
+ public Similarity get(String field) {
+ return new CustomNormEncodingSimilarity();
+ }
+ });
RandomIndexWriter writer = new RandomIndexWriter(random, dir, config);
Document doc = new Document();
Field foo = newField("foo", "", Field.Store.NO, Field.Index.ANALYZED);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java Fri Mar 25 14:00:42 2011
@@ -35,27 +35,29 @@ import org.apache.lucene.search.Explanat
public class TestOmitTf extends LuceneTestCase {
- public static class SimpleSimilarity extends Similarity implements SimilarityProvider {
- @Override public float computeNorm(FieldInvertState state) { return state.getBoost(); }
- @Override public float tf(float freq) { return freq; }
- @Override public float sloppyFreq(int distance) { return 2.0f; }
- @Override public float idf(int docFreq, int numDocs) { return 1.0f; }
- @Override public IDFExplanation idfExplain(Collection<Term> terms, IndexSearcher searcher) throws IOException {
- return new IDFExplanation() {
- @Override
- public float getIdf() {
- return 1.0f;
- }
- @Override
- public String explain() {
- return "Inexplicable";
- }
- };
- }
+ public static class SimpleSimilarityProvider implements SimilarityProvider {
public float queryNorm(float sumOfSquaredWeights) { return 1.0f; }
public float coord(int overlap, int maxOverlap) { return 1.0f; }
public Similarity get(String field) {
- return this;
+ return new Similarity() {
+
+ @Override public float computeNorm(FieldInvertState state) { return state.getBoost(); }
+ @Override public float tf(float freq) { return freq; }
+ @Override public float sloppyFreq(int distance) { return 2.0f; }
+ @Override public float idf(int docFreq, int numDocs) { return 1.0f; }
+ @Override public IDFExplanation idfExplain(Collection<Term> terms, IndexSearcher searcher) throws IOException {
+ return new IDFExplanation() {
+ @Override
+ public float getIdf() {
+ return 1.0f;
+ }
+ @Override
+ public String explain() {
+ return "Inexplicable";
+ }
+ };
+ }
+ };
}
}
@@ -254,7 +256,7 @@ public class TestOmitTf extends LuceneTe
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).
setMaxBufferedDocs(2).
- setSimilarityProvider(new SimpleSimilarity()).
+ setSimilarityProvider(new SimpleSimilarityProvider()).
setMergePolicy(newInOrderLogMergePolicy(2))
);
writer.setInfoStream(VERBOSE ? System.out : null);
@@ -285,7 +287,7 @@ public class TestOmitTf extends LuceneTe
* Verify the index
*/
IndexSearcher searcher = new IndexSearcher(dir, true);
- searcher.setSimilarityProvider(new SimpleSimilarity());
+ searcher.setSimilarityProvider(new SimpleSimilarityProvider());
Term a = new Term("noTf", term);
Term b = new Term("tf", term);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java Fri Mar 25 14:00:42 2011
@@ -210,7 +210,7 @@ public class TestBoolean2 extends Lucene
int[] expDocNrs = {2, 3};
SimilarityProvider oldSimilarity = searcher.getSimilarityProvider();
try {
- searcher.setSimilarityProvider(new DefaultSimilarity(){
+ searcher.setSimilarityProvider(new DefaultSimilarityProvider(){
@Override
public float coord(int overlap, int maxOverlap) {
return overlap / ((float)maxOverlap - 1);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java Fri Mar 25 14:00:42 2011
@@ -44,8 +44,8 @@ public class TestComplexExplanations ext
}
// must be static for weight serialization tests
- private static DefaultSimilarity createQnorm1Similarity() {
- return new DefaultSimilarity() {
+ private static DefaultSimilarityProvider createQnorm1Similarity() {
+ return new DefaultSimilarityProvider() {
@Override
public float queryNorm(float sumOfSquaredWeights) {
return 1.0f; // / (float) Math.sqrt(1.0f + sumOfSquaredWeights);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java Fri Mar 25 14:00:42 2011
@@ -97,7 +97,7 @@ public class TestConstantScoreQuery exte
searcher = newSearcher(reader);
// set a similarity that does not normalize our boost away
- searcher.setSimilarityProvider(new DefaultSimilarity() {
+ searcher.setSimilarityProvider(new DefaultSimilarityProvider() {
@Override
public float queryNorm(float sumOfSquaredWeights) {
return 1.0f;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Fri Mar 25 14:00:42 2011
@@ -73,7 +73,12 @@ public class TestDisjunctionMaxQuery ext
}
}
- public SimilarityProvider sim = new TestSimilarity();
+ public SimilarityProvider sim = new DefaultSimilarityProvider() {
+ @Override
+ public Similarity get(String field) {
+ return new TestSimilarity();
+ }
+ };
public Directory index;
public IndexReader r;
public IndexSearcher s;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Fri Mar 25 14:00:42 2011
@@ -296,25 +296,30 @@ public class TestMultiPhraseQuery extend
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- searcher.setSimilarityProvider(new DefaultSimilarity() {
-
+ searcher.setSimilarityProvider(new DefaultSimilarityProvider() {
@Override
- public IDFExplanation idfExplain(Collection<Term> terms,
- IndexSearcher searcher) throws IOException {
- return new IDFExplanation() {
-
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+
@Override
- public float getIdf() {
- return 10f;
- }
+ public IDFExplanation idfExplain(Collection<Term> terms,
+ IndexSearcher searcher) throws IOException {
+ return new IDFExplanation() {
- @Override
- public String explain() {
- return "just a test";
- }
-
+ @Override
+ public float getIdf() {
+ return 10f;
+ }
+
+ @Override
+ public String explain() {
+ return "just a test";
+ }
+
+ };
+ }
};
- }
+ }
});
MultiPhraseQuery query = new MultiPhraseQuery();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java Fri Mar 25 14:00:42 2011
@@ -39,27 +39,28 @@ import org.apache.lucene.search.Explanat
*/
public class TestSimilarity extends LuceneTestCase {
- public static class SimpleSimilarity extends Similarity implements SimilarityProvider {
- @Override public float computeNorm(FieldInvertState state) { return state.getBoost(); }
- @Override public float tf(float freq) { return freq; }
- @Override public float sloppyFreq(int distance) { return 2.0f; }
- @Override public float idf(int docFreq, int numDocs) { return 1.0f; }
- @Override public IDFExplanation idfExplain(Collection<Term> terms, IndexSearcher searcher) throws IOException {
- return new IDFExplanation() {
- @Override
- public float getIdf() {
- return 1.0f;
- }
- @Override
- public String explain() {
- return "Inexplicable";
- }
- };
- }
+ public static class SimpleSimilarityProvider implements SimilarityProvider {
public float queryNorm(float sumOfSquaredWeights) { return 1.0f; }
public float coord(int overlap, int maxOverlap) { return 1.0f; }
public Similarity get(String field) {
- return this;
+ return new Similarity() {
+ @Override public float computeNorm(FieldInvertState state) { return state.getBoost(); }
+ @Override public float tf(float freq) { return freq; }
+ @Override public float sloppyFreq(int distance) { return 2.0f; }
+ @Override public float idf(int docFreq, int numDocs) { return 1.0f; }
+ @Override public IDFExplanation idfExplain(Collection<Term> terms, IndexSearcher searcher) throws IOException {
+ return new IDFExplanation() {
+ @Override
+ public float getIdf() {
+ return 1.0f;
+ }
+ @Override
+ public String explain() {
+ return "Inexplicable";
+ }
+ };
+ }
+ };
}
}
@@ -67,7 +68,7 @@ public class TestSimilarity extends Luce
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, store,
newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())
- .setSimilarityProvider(new SimpleSimilarity()));
+ .setSimilarityProvider(new SimpleSimilarityProvider()));
Document d1 = new Document();
d1.add(newField("field", "a c", Field.Store.YES, Field.Index.ANALYZED));
@@ -81,7 +82,7 @@ public class TestSimilarity extends Luce
writer.close();
IndexSearcher searcher = newSearcher(reader);
- searcher.setSimilarityProvider(new SimpleSimilarity());
+ searcher.setSimilarityProvider(new SimpleSimilarityProvider());
Term a = new Term("field", "a");
Term b = new Term("field", "b");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Fri Mar 25 14:00:42 2011
@@ -36,6 +36,8 @@ import org.apache.lucene.search.Explanat
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanNearQuery;
@@ -50,7 +52,7 @@ public class TestPayloadNearQuery extend
private IndexSearcher searcher;
private IndexReader reader;
private Directory directory;
- private BoostingSimilarity similarity = new BoostingSimilarity();
+ private BoostingSimilarityProvider similarityProvider = new BoostingSimilarityProvider();
private byte[] payload2 = new byte[]{2};
private byte[] payload4 = new byte[]{4};
@@ -105,7 +107,7 @@ public class TestPayloadNearQuery extend
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
- .setSimilarityProvider(similarity));
+ .setSimilarityProvider(similarityProvider));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
@@ -118,7 +120,7 @@ public class TestPayloadNearQuery extend
writer.close();
searcher = newSearcher(reader);
- searcher.setSimilarityProvider(similarity);
+ searcher.setSimilarityProvider(similarityProvider);
}
@Override
@@ -297,43 +299,57 @@ public class TestPayloadNearQuery extend
}
// must be static for weight serialization tests
- static class BoostingSimilarity extends DefaultSimilarity {
+ static class BoostingSimilarityProvider implements SimilarityProvider {
- @Override public float scorePayload(int docId, int start, int end, byte[] payload, int offset, int length) {
- //we know it is size 4 here, so ignore the offset/length
- return payload[offset];
- }
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- //Make everything else 1 so we see the effect of the payload
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @Override public float computeNorm(FieldInvertState state) {
- return state.getBoost();
- }
-
- @Override public float queryNorm(float sumOfSquaredWeights) {
+ public float queryNorm(float sumOfSquaredWeights) {
return 1.0f;
}
-
- @Override public float sloppyFreq(int distance) {
+
+ public float coord(int overlap, int maxOverlap) {
return 1.0f;
}
+
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+
+ @Override
+ public float scorePayload(int docId, int start, int end, byte[] payload, int offset, int length) {
+ //we know it is size 4 here, so ignore the offset/length
+ return payload[offset];
+ }
+
+ //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ //Make everything else 1 so we see the effect of the payload
+ //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ @Override
+ public float computeNorm(FieldInvertState state) {
+ return state.getBoost();
+ }
- @Override public float coord(int overlap, int maxOverlap) {
- return 1.0f;
- }
- @Override public float tf(float freq) {
- return 1.0f;
- }
- // idf used for phrase queries
- @Override public IDFExplanation idfExplain(Collection<Term> terms, IndexSearcher searcher) throws IOException {
- return new IDFExplanation() {
- @Override
- public float getIdf() {
+ @Override
+ public float sloppyFreq(int distance) {
+ return 1.0f;
+ }
+
+ @Override
+ public float tf(float freq) {
return 1.0f;
}
- @Override
- public String explain() {
- return "Inexplicable";
+
+ // idf used for phrase queries
+ @Override
+ public IDFExplanation idfExplain(Collection<Term> terms, IndexSearcher searcher) throws IOException {
+ return new IDFExplanation() {
+ @Override
+ public float getIdf() {
+ return 1.0f;
+ }
+
+ @Override
+ public String explain() {
+ return "Inexplicable";
+ }
+ };
}
};
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Fri Mar 25 14:00:42 2011
@@ -18,8 +18,11 @@ package org.apache.lucene.search.payload
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.English;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.search.Similarity;
+import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.CheckHits;
@@ -54,7 +57,7 @@ import java.io.IOException;
public class TestPayloadTermQuery extends LuceneTestCase {
private IndexSearcher searcher;
private IndexReader reader;
- private BoostingSimilarity similarity = new BoostingSimilarity();
+ private SimilarityProvider similarityProvider = new BoostingSimilarityProvider();
private byte[] payloadField = new byte[]{1};
private byte[] payloadMultiField1 = new byte[]{2};
private byte[] payloadMultiField2 = new byte[]{4};
@@ -110,7 +113,7 @@ public class TestPayloadTermQuery extend
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
- .setSimilarityProvider(similarity).setMergePolicy(newInOrderLogMergePolicy()));
+ .setSimilarityProvider(similarityProvider).setMergePolicy(newInOrderLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
@@ -125,7 +128,7 @@ public class TestPayloadTermQuery extend
writer.close();
searcher = newSearcher(reader);
- searcher.setSimilarityProvider(similarity);
+ searcher.setSimilarityProvider(similarityProvider);
}
@Override
@@ -220,7 +223,12 @@ public class TestPayloadTermQuery extend
new MaxPayloadFunction(), false);
IndexSearcher theSearcher = new IndexSearcher(directory, true);
- theSearcher.setSimilarityProvider(new FullSimilarity());
+ theSearcher.setSimilarityProvider(new DefaultSimilarityProvider() {
+ @Override
+ public Similarity get(String field) {
+ return new FullSimilarity();
+ }
+ });
TopDocs hits = searcher.search(query, null, 100);
assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("hits Size: " + hits.totalHits + " is not: " + 100, hits.totalHits == 100);
@@ -283,46 +291,49 @@ public class TestPayloadTermQuery extend
}
// must be static for weight serialization tests
- static class BoostingSimilarity extends DefaultSimilarity {
-
- // TODO: Remove warning after API has been finalized
- @Override
- public float scorePayload(int docId, int start, int end, byte[] payload, int offset, int length) {
- //we know it is size 4 here, so ignore the offset/length
- return payload[offset];
- }
+ static class BoostingSimilarityProvider implements SimilarityProvider {
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- //Make everything else 1 so we see the effect of the payload
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @Override
- public float computeNorm(FieldInvertState state) {
- return state.getBoost();
- }
-
- @Override
public float queryNorm(float sumOfSquaredWeights) {
return 1;
}
-
- @Override
- public float sloppyFreq(int distance) {
- return 1;
- }
-
- @Override
+
public float coord(int overlap, int maxOverlap) {
return 1;
}
- @Override
- public float idf(int docFreq, int numDocs) {
- return 1;
- }
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+
+ // TODO: Remove warning after API has been finalized
+ @Override
+ public float scorePayload(int docId, int start, int end, byte[] payload, int offset, int length) {
+ //we know it is size 4 here, so ignore the offset/length
+ return payload[offset];
+ }
- @Override
- public float tf(float freq) {
- return freq == 0 ? 0 : 1;
+ //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ //Make everything else 1 so we see the effect of the payload
+ //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ @Override
+ public float computeNorm(FieldInvertState state) {
+ return state.getBoost();
+ }
+
+ @Override
+ public float sloppyFreq(int distance) {
+ return 1;
+ }
+
+ @Override
+ public float idf(int docFreq, int numDocs) {
+ return 1;
+ }
+
+ @Override
+ public float tf(float freq) {
+ return freq == 0 ? 0 : 1;
+ }
+ };
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Fri Mar 25 14:00:42 2011
@@ -37,7 +37,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TermQuery;
@@ -50,7 +50,7 @@ import org.apache.lucene.util.LuceneTest
public class TestPayloadSpans extends LuceneTestCase {
private IndexSearcher searcher;
- private SimilarityProvider similarity = new DefaultSimilarity();
+ private SimilarityProvider similarity = new DefaultSimilarityProvider();
protected IndexReader indexReader;
private IndexReader closeIndexReader;
private Directory directory;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Fri Mar 25 14:00:42 2011
@@ -17,11 +17,13 @@ package org.apache.lucene.search.spans;
* limitations under the License.
*/
+import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.CheckHits;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Similarity;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.IndexSearcher;
@@ -410,10 +412,14 @@ public class TestSpans extends LuceneTes
for (int i = 0; i < leaves.length; i++) {
- final SimilarityProvider sim = new DefaultSimilarity() {
- @Override
- public float sloppyFreq(int distance) {
- return 0.0f;
+ final SimilarityProvider sim = new DefaultSimilarityProvider() {
+ public Similarity get(String field) {
+ return new DefaultSimilarity() {
+ @Override
+ public float sloppyFreq(int distance) {
+ return 0.0f;
+ }
+ };
}
};
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java?rev=1085374&r1=1085373&r2=1085374&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java Fri Mar 25 14:00:42 2011
@@ -16,9 +16,9 @@
*/
package org.apache.solr.schema;
-import org.apache.lucene.search.DefaultSimilarity;
+import org.apache.lucene.search.DefaultSimilarityProvider;
-public class MockConfigurableSimilarity extends DefaultSimilarity {
+public class MockConfigurableSimilarity extends DefaultSimilarityProvider {
private String passthrough;
public MockConfigurableSimilarity(String passthrough) {