Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[LUCENE-8343] introduced weight 0 check and positional coefficient scaling + tests

This commit is contained in:
Alessandro Benedetti 2018-06-01 12:52:41 +01:00
parent 1d33130fcb
commit e83e8ee1a4
2 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
View File

@ -224,8 +224,11 @@ public class BlendedInfixSuggester extends AnalyzingInfixSuggester {
} else { } else {
coefficient = createCoefficient(searcher, fd.doc, matchedTokens, prefixToken); coefficient = createCoefficient(searcher, fd.doc, matchedTokens, prefixToken);
} }
if (weight == 0) {
long score = (long) (weight * coefficient); weight = 1;
}
long scaledCoefficient = (long) (coefficient * 10);
long score = weight * scaledCoefficient;
LookupResult result; LookupResult result;
if (doHighlight) { if (doHighlight) {

79
lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
View File

@ -44,22 +44,44 @@ public class BlendedInfixSuggesterTest extends LuceneTestCase {
* of the matching term. * of the matching term.
*/ */
public void testBlendedSort() throws IOException { public void testBlendedSort() throws IOException {
BytesRef payload = new BytesRef("star"); BytesRef payload = new BytesRef("star");
Input keys[] = new Input[]{ Input keys[] = new Input[]{
new Input("star wars: episode v - the empire strikes back", 8, payload) new Input("star wars: episode v - the empire strikes back", 8, payload)
}; };
BlendedInfixSuggester suggester = getBlendedInfixSuggester(keys);
Path tempDir = createTempDir("BlendedInfixSuggesterTest"); assertSuggestionsRanking(payload, suggester);
}
Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET); /**
BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a, * Test to validate the suggestions ranking according to the position coefficient,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS, * even if the weight associated to the suggestion is unitary.
BlendedInfixSuggester.BlenderType.POSITION_LINEAR, */
BlendedInfixSuggester.DEFAULT_NUM_FACTOR, false); public void testBlendedSort_fieldWeightUnitary_shouldRankSuggestionsByPositionMatch() throws IOException {
suggester.build(new InputArrayIterator(keys)); BytesRef payload = new BytesRef("star");
Input keys[] = new Input[]{
new Input("star wars: episode v - the empire strikes back", 1, payload)
};
BlendedInfixSuggester suggester = getBlendedInfixSuggester(keys);
assertSuggestionsRanking(payload, suggester);
}
/**
* Test to validate the suggestions ranking according to the position coefficient,
* even if the weight associated to the suggestion is zero.
*/
public void testBlendedSort_fieldWeightZero_shouldRankSuggestionsByPositionMatch() throws IOException {
BytesRef payload = new BytesRef("star");
Input keys[] = new Input[]{
new Input("star wars: episode v - the empire strikes back", 0, payload)
};
BlendedInfixSuggester suggester = getBlendedInfixSuggester(keys);
assertSuggestionsRanking(payload, suggester);
}
private void assertSuggestionsRanking(BytesRef payload, BlendedInfixSuggester suggester) throws IOException {
// we query for star wars and check that the weight // we query for star wars and check that the weight
// is smaller when we search for tokens that are far from the beginning // is smaller when we search for tokens that are far from the beginning
@ -78,6 +100,18 @@ public class BlendedInfixSuggesterTest extends LuceneTestCase {
suggester.close(); suggester.close();
} }
private BlendedInfixSuggester getBlendedInfixSuggester(Input[] keys) throws IOException {
Path tempDir = createTempDir("BlendedInfixSuggesterTest");
Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_LINEAR,
BlendedInfixSuggester.DEFAULT_NUM_FACTOR, false);
suggester.build(new InputArrayIterator(keys));
return suggester;
}
/** /**
* Verify the different flavours of the blender types * Verify the different flavours of the blender types
*/ */
@ -97,9 +131,9 @@ public class BlendedInfixSuggesterTest extends LuceneTestCase {
BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a); BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a);
suggester.build(new InputArrayIterator(keys)); suggester.build(new InputArrayIterator(keys));
assertEquals(w, getInResults(suggester, "top", pl, 1)); assertEquals(10 * w, getInResults(suggester, "top", pl, 1));
assertEquals((int) (w * (1 - 0.10 * 2)), getInResults(suggester, "the", pl, 1)); assertEquals(w * (long) (10 * (1 - 0.10 * 2)), getInResults(suggester, "the", pl, 1));
assertEquals((int) (w * (1 - 0.10 * 3)), getInResults(suggester, "lake", pl, 1)); assertEquals(w * (long) (10 * (1 - 0.10 * 3)), getInResults(suggester, "lake", pl, 1));
suggester.close(); suggester.close();
@ -109,9 +143,9 @@ public class BlendedInfixSuggesterTest extends LuceneTestCase {
BlendedInfixSuggester.BlenderType.POSITION_RECIPROCAL, 1, false); BlendedInfixSuggester.BlenderType.POSITION_RECIPROCAL, 1, false);
suggester.build(new InputArrayIterator(keys)); suggester.build(new InputArrayIterator(keys));
assertEquals(w, getInResults(suggester, "top", pl, 1)); assertEquals(10 * w, getInResults(suggester, "top", pl, 1));
assertEquals((int) (w * 1 / (1 + 2)), getInResults(suggester, "the", pl, 1)); assertEquals(w * (long) (10 * 1 / (1 + 2)), getInResults(suggester, "the", pl, 1));
assertEquals((int) (w * 1 / (1 + 3)), getInResults(suggester, "lake", pl, 1)); assertEquals(w * (long) (10 * 1 / (1 + 3)), getInResults(suggester, "lake", pl, 1));
suggester.close(); suggester.close();
// BlenderType.EXPONENTIAL_RECIPROCAL is using 1/(pow(1+p, exponent)) * w where w is weight and p the position of the word // BlenderType.EXPONENTIAL_RECIPROCAL is using 1/(pow(1+p, exponent)) * w where w is weight and p the position of the word
@ -121,9 +155,9 @@ public class BlendedInfixSuggesterTest extends LuceneTestCase {
suggester.build(new InputArrayIterator(keys)); suggester.build(new InputArrayIterator(keys));
assertEquals(w, getInResults(suggester, "top", pl, 1)); assertEquals(10 * w, getInResults(suggester, "top", pl, 1));
assertEquals((int) (w * 1 / (Math.pow(1 + 2, 4.0))), getInResults(suggester, "the", pl, 1)); assertEquals(w * (long) (10 * 1 / (Math.pow(1 + 2, 4.0))), getInResults(suggester, "the", pl, 1));
assertEquals((int) (w * 1 / (Math.pow(1 + 3, 4.0))), getInResults(suggester, "lake", pl, 1)); assertEquals(w * (long) (10 * 1 / (Math.pow(1 + 3, 4.0))), getInResults(suggester, "lake", pl, 1));
suggester.close(); suggester.close();
} }
@ -195,14 +229,7 @@ public class BlendedInfixSuggesterTest extends LuceneTestCase {
new Input("top of the lake", 8, payload) new Input("top of the lake", 8, payload)
}; };
Path tempDir = createTempDir("BlendedInfixSuggesterTest"); BlendedInfixSuggester suggester = getBlendedInfixSuggester(keys);
Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
BlendedInfixSuggester.BlenderType.POSITION_LINEAR,
BlendedInfixSuggester.DEFAULT_NUM_FACTOR, false);
suggester.build(new InputArrayIterator(keys));
getInResults(suggester, "of ", payload, 1); getInResults(suggester, "of ", payload, 1);
getInResults(suggester, "the ", payload, 1); getInResults(suggester, "the ", payload, 1);