honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

function_score: fix explanation, [ was missing

This commit is contained in:
Britta Weber 2014-08-13 09:51:10 +02:00
parent feefc41127
commit 9bebccba0c
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
View File

@ -381,6 +381,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
protected String getDistanceString(int docId) { protected String getDistanceString(int docId) {
StringBuilder values = new StringBuilder(mode.name()); StringBuilder values = new StringBuilder(mode.name());
values.append("[");
doubleValues.setDocument(docId); doubleValues.setDocument(docId);
final int num = doubleValues.count(); final int num = doubleValues.count();
if (num > 0) { if (num > 0) {

30
src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java
View File

@ -45,6 +45,7 @@ import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException;
import static org.elasticsearch.client.Requests.indexRequest; import static org.elasticsearch.client.Requests.indexRequest;
import static org.elasticsearch.client.Requests.searchRequest; import static org.elasticsearch.client.Requests.searchRequest;
@ -938,4 +939,33 @@ public class DecayFunctionScoreTests extends ElasticsearchIntegrationTest {
assertTrue(failure.getMessage().contains("function must not be null")); assertTrue(failure.getMessage().contains("function must not be null"));
} }
} }
@Test
public void testExplainString() throws IOException, ExecutionException, InterruptedException {
assertAcked(prepareCreate("test").addMapping(
"type1",
jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("test").field("type", "string")
.endObject().startObject("num").field("type", "double").endObject().endObject().endObject().endObject()));
ensureYellow();
client().prepareIndex().setType("type1").setId("1").setIndex("test")
.setSource(jsonBuilder().startObject().field("test", "value").array("num", 0.5, 0.7).endObject()).get();
refresh();
SearchResponse response = client().search(
searchRequest().searchType(SearchType.QUERY_THEN_FETCH).source(
searchSource().explain(true)
.query(functionScoreQuery(termQuery("test", "value"))
.add(gaussDecayFunction("num", 1.0, 5.0).setOffset(1.0))
.add(linearDecayFunction("num", 1.0, 5.0).setOffset(1.0))
.add(exponentialDecayFunction("num", 1.0, 5.0).setOffset(1.0))
.boostMode(CombineFunction.REPLACE.getName())))).get();
String explanation = response.getHits().getAt(0).getExplanation().toString();
assertThat(explanation, containsString(" 1.0 = -exp(-0.5*pow(MIN[Math.max(Math.abs(0.5(=doc value) - 1.0(=origin))) - 1.0(=offset), 0), Math.max(Math.abs(0.7(=doc value) - 1.0(=origin))) - 1.0(=offset), 0)],2.0)/18.033688011112044)"));
assertThat(explanation, containsString("1.0 = max(0.0, ((10.0 - MIN[Math.max(Math.abs(0.5(=doc value) - 1.0(=origin))) - 1.0(=offset), 0), Math.max(Math.abs(0.7(=doc value) - 1.0(=origin))) - 1.0(=offset), 0)])/10.0)"));
assertThat(explanation, containsString("1.0 = exp(- MIN[Math.max(Math.abs(0.5(=doc value) - 1.0(=origin))) - 1.0(=offset), 0), Math.max(Math.abs(0.7(=doc value) - 1.0(=origin))) - 1.0(=offset), 0)] * 0.13862943611198905)"));
}
} }