|
@@ -40,7 +40,7 @@ import java.util.ArrayList;
|
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
-import static org.elasticsearch.index.rankeval.EvaluationMetric.filterUnknownDocuments;
|
|
|
|
|
|
|
+import static org.elasticsearch.index.rankeval.EvaluationMetric.filterUnratedDocuments;
|
|
|
import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode;
|
|
import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode;
|
|
|
import static org.elasticsearch.test.XContentTestUtils.insertRandomFields;
|
|
import static org.elasticsearch.test.XContentTestUtils.insertRandomFields;
|
|
|
import static org.hamcrest.CoreMatchers.containsString;
|
|
import static org.hamcrest.CoreMatchers.containsString;
|
|
@@ -128,7 +128,7 @@ public class DiscountedCumulativeGainTests extends ESTestCase {
|
|
|
DiscountedCumulativeGain dcg = new DiscountedCumulativeGain();
|
|
DiscountedCumulativeGain dcg = new DiscountedCumulativeGain();
|
|
|
EvalQueryQuality result = dcg.evaluate("id", hits, rated);
|
|
EvalQueryQuality result = dcg.evaluate("id", hits, rated);
|
|
|
assertEquals(12.779642067948913, result.getQualityLevel(), DELTA);
|
|
assertEquals(12.779642067948913, result.getQualityLevel(), DELTA);
|
|
|
- assertEquals(2, filterUnknownDocuments(result.getHitsAndRatings()).size());
|
|
|
|
|
|
|
+ assertEquals(2, filterUnratedDocuments(result.getHitsAndRatings()).size());
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* Check with normalization: to get the maximal possible dcg, sort documents by
|
|
* Check with normalization: to get the maximal possible dcg, sort documents by
|
|
@@ -185,7 +185,7 @@ public class DiscountedCumulativeGainTests extends ESTestCase {
|
|
|
DiscountedCumulativeGain dcg = new DiscountedCumulativeGain();
|
|
DiscountedCumulativeGain dcg = new DiscountedCumulativeGain();
|
|
|
EvalQueryQuality result = dcg.evaluate("id", hits, ratedDocs);
|
|
EvalQueryQuality result = dcg.evaluate("id", hits, ratedDocs);
|
|
|
assertEquals(12.392789260714371, result.getQualityLevel(), DELTA);
|
|
assertEquals(12.392789260714371, result.getQualityLevel(), DELTA);
|
|
|
- assertEquals(1, filterUnknownDocuments(result.getHitsAndRatings()).size());
|
|
|
|
|
|
|
+ assertEquals(1, filterUnratedDocuments(result.getHitsAndRatings()).size());
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* Check with normalization: to get the maximal possible dcg, sort documents by
|
|
* Check with normalization: to get the maximal possible dcg, sort documents by
|
|
@@ -224,13 +224,13 @@ public class DiscountedCumulativeGainTests extends ESTestCase {
|
|
|
DiscountedCumulativeGain dcg = new DiscountedCumulativeGain();
|
|
DiscountedCumulativeGain dcg = new DiscountedCumulativeGain();
|
|
|
EvalQueryQuality result = dcg.evaluate("id", hits, ratedDocs);
|
|
EvalQueryQuality result = dcg.evaluate("id", hits, ratedDocs);
|
|
|
assertEquals(0.0d, result.getQualityLevel(), DELTA);
|
|
assertEquals(0.0d, result.getQualityLevel(), DELTA);
|
|
|
- assertEquals(0, filterUnknownDocuments(result.getHitsAndRatings()).size());
|
|
|
|
|
|
|
+ assertEquals(0, filterUnratedDocuments(result.getHitsAndRatings()).size());
|
|
|
|
|
|
|
|
// also check normalized
|
|
// also check normalized
|
|
|
dcg = new DiscountedCumulativeGain(true, null, 10);
|
|
dcg = new DiscountedCumulativeGain(true, null, 10);
|
|
|
result = dcg.evaluate("id", hits, ratedDocs);
|
|
result = dcg.evaluate("id", hits, ratedDocs);
|
|
|
assertEquals(0.0d, result.getQualityLevel(), DELTA);
|
|
assertEquals(0.0d, result.getQualityLevel(), DELTA);
|
|
|
- assertEquals(0, filterUnknownDocuments(result.getHitsAndRatings()).size());
|
|
|
|
|
|
|
+ assertEquals(0, filterUnratedDocuments(result.getHitsAndRatings()).size());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public void testParseFromXContent() throws IOException {
|
|
public void testParseFromXContent() throws IOException {
|