diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java index 494fe6deabc..b343d336d1a 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java @@ -25,7 +25,6 @@ import org.apache.lucene.benchmark.quality.utils.SubmissionReport; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.store.Directory; import java.io.BufferedReader; @@ -75,8 +74,6 @@ public class TestQualityRun extends BenchmarkTestCase { Directory dir = newFSDirectory(getWorkDir().resolve("index")); IndexReader reader = DirectoryReader.open(dir); IndexSearcher searcher = new IndexSearcher(reader); - // TODO: adapt this test data to bm25 - searcher.setSimilarity(new ClassicSimilarity()); QualityQueryParser qqParser = new SimpleQQParser("title","body"); QualityBenchmark qrun = new QualityBenchmark(qqs, qqParser, searcher, docNameField); diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt index 13c2d77ca34..183a7f473e4 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/trecQRels.txt @@ -203,36 +203,36 @@ -5 0 doc169 1 -5 0 doc13181 1 -5 0 doc4350 1 -5 0 doc10242 1 -5 0 doc955 1 -5 0 doc5389 1 -5 0 doc17122 1 -5 0 doc17417 1 -5 0 doc12199 1 -5 0 doc6918 1 -5 0 doc3857 1 -5 0 doc2981 1 -5 0 doc10639 1 -5 0 doc10478 1 -5 0 doc8573 1 -5 0 doc9197 1 -5 0 doc9298 1 -5 0 doc2492 1 -5 0 doc10262 1 -5 0 doc5180 1 -5 0 doc11758 1 -5 0 doc4065 1 -5 0 doc9124 1 -5 0 doc11528 1 -5 0 doc18879 1 -5 0 doc17864 1 -5 0 doc3204 1 -5 0 doc12157 1 -5 0 doc4496 1 -5 0 doc20190 1 +5 0 doc13181 1 +5 0 doc169 1 +5 0 doc5389 1 +5 0 doc955 1 +5 0 doc8573 1 +5 0 doc10242 1 +5 0 doc4350 1 +5 0 doc17417 1 +5 0 doc11758 1 +5 0 doc9197 1 +5 0 doc10639 1 +5 0 doc3857 1 +5 0 doc10478 1 +5 0 doc10262 1 +5 0 doc2981 1 +5 0 doc3204 1 +5 0 doc17122 1 +5 0 doc17864 1 +5 0 doc9298 1 +5 0 doc4065 1 +5 0 doc2492 1 +5 0 doc18879 1 +5 0 doc12199 1 +5 0 doc5180 1 +5 0 doc11528 1 +5 0 doc20190 1 +5 0 doc6918 1 +5 0 doc4665 1 +5 0 doc10195 1 +5 0 doc3062 1 @@ -383,134 +383,135 @@ 10 0 fakedoc3 1 10 0 fakedoc4 1 -10 0 doc17218 0 -10 0 doc10270 0 -10 0 doc5958 0 -10 0 doc19943 0 -10 0 doc6510 1 -10 0 doc16087 1 -10 0 doc14893 1 -10 0 doc8933 1 -10 0 doc4354 1 -10 0 doc16729 1 -10 0 doc16761 1 -10 0 doc6964 1 -10 0 doc16743 1 -10 0 doc7357 1 -10 0 doc2534 1 -10 0 doc18321 1 -10 0 doc18497 1 -10 0 doc11214 1 -10 0 doc11819 1 -10 0 doc10818 1 -10 0 doc15769 1 -10 0 doc5348 1 -10 0 doc14948 1 -10 0 doc7891 1 -10 0 doc9897 1 -10 0 doc15559 1 -10 0 doc14935 1 -10 0 doc14954 1 -10 0 doc6621 1 -10 0 doc6930 1 - - -11 0 doc11943 1 -11 0 doc286 1 -11 0 doc1574 1 -11 0 doc17916 1 -11 0 doc17918 1 -11 0 doc19213 1 -11 0 doc9337 1 -11 0 doc8593 1 -11 0 doc8800 1 -11 0 doc18580 1 -11 0 doc209 1 -11 0 doc1893 1 -11 0 doc11189 1 -11 0 doc17702 1 -11 0 doc10180 1 -11 0 doc11869 1 -11 0 doc9705 1 -11 0 doc8715 1 -11 0 doc12753 1 -11 0 doc10195 1 -11 0 doc3552 1 -11 0 doc16030 1 -11 0 doc4623 1 -11 0 doc3188 1 -11 0 doc8735 1 -11 0 doc151 1 -11 0 doc5792 1 -11 0 doc5194 1 -11 0 doc3393 1 -11 0 doc19027 1 +10 0 doc16087 0 +10 0 doc19943 0 +10 0 doc5958 0 +10 0 doc6510 0 +10 0 doc4354 1 +10 0 doc17218 1 +10 0 doc6964 1 +10 0 doc10270 1 +10 0 doc18321 1 +10 0 doc14893 1 +10 0 doc16743 1 +10 0 doc7357 1 +10 0 doc2534 1 +10 0 doc18497 1 +10 0 doc16729 1 +10 0 doc16761 1 +10 0 doc8933 1 +10 0 doc15769 1 +10 0 doc14948 1 +10 0 doc10818 1 +10 0 doc11819 1 +10 0 doc7891 1 +10 0 doc14935 1 +10 0 doc14954 1 +10 0 doc9897 1 +10 0 doc6930 1 +10 0 doc7235 1 +10 0 doc15559 1 +10 0 doc6621 1 +10 0 doc11214 1 -12 0 doc18198 1 -12 0 doc2444 1 -12 0 doc4305 1 -12 0 doc6544 1 -12 0 doc11639 1 -12 0 doc10640 1 -12 0 doc12192 1 -12 0 doc128 1 -12 0 doc10760 1 -12 0 doc10881 1 -12 0 doc2698 1 -12 0 doc3552 1 -12 0 doc20524 1 -12 0 doc1884 1 -12 0 doc9187 1 -12 0 doc3131 1 -12 0 doc2911 1 -12 0 doc2589 1 -12 0 doc3747 1 -12 0 doc3813 1 -12 0 doc5222 1 -12 0 doc6023 1 -12 0 doc6624 1 -12 0 doc7655 1 -12 0 doc9205 1 -12 0 doc12062 1 -12 0 doc15504 1 -12 0 doc13625 1 -12 0 doc18704 1 -12 0 doc2277 1 +11 0 doc11943 1 +11 0 doc9705 1 +11 0 doc286 1 +11 0 doc17916 1 +11 0 doc17918 1 +11 0 doc1574 1 +11 0 doc10180 1 +11 0 doc1893 1 +11 0 doc11189 1 +11 0 doc8593 1 +11 0 doc3188 1 +11 0 doc8800 1 +11 0 doc9337 1 +11 0 doc19213 1 +11 0 doc8735 1 +11 0 doc5194 1 +11 0 doc3552 1 +11 0 doc16030 1 +11 0 doc10195 1 +11 0 doc17702 1 +11 0 doc209 1 +11 0 doc11869 1 +11 0 doc5008 1 +11 0 doc5792 1 +11 0 doc1990 1 +11 0 doc3393 1 +11 0 doc19027 1 +11 0 doc18580 1 +11 0 doc8715 1 +11 0 doc12753 1 -13 0 doc4948 1 -13 0 doc21565 1 -13 0 doc17135 1 -13 0 doc1866 1 -13 0 doc13989 1 -13 0 doc5605 1 -13 0 doc13431 1 -13 0 doc2100 1 -13 0 doc16347 1 -13 0 doc16894 1 -13 0 doc6764 1 -13 0 doc8554 1 -13 0 doc8695 1 -13 0 doc8977 1 -13 0 doc19478 1 -13 0 doc14595 1 -13 0 doc2408 1 -13 0 doc2592 1 -13 0 doc10947 1 -13 0 doc15794 1 -13 0 doc5236 1 -13 0 doc14847 1 -13 0 doc3980 1 -13 0 doc1844 1 -13 0 doc42 1 -13 0 doc7783 1 -13 0 doc4557 1 -13 0 doc16423 1 -13 0 doc17170 1 -13 0 doc5822 1 +12 0 doc10640 1 +12 0 doc6544 1 +12 0 doc4305 1 +12 0 doc10760 1 +12 0 doc18198 1 +12 0 doc10881 1 +12 0 doc128 1 +12 0 doc12192 1 +12 0 doc2444 1 +12 0 doc11639 1 +12 0 doc2911 1 +12 0 doc1884 1 +12 0 doc2698 1 +12 0 doc3552 1 +12 0 doc18704 1 +12 0 doc7652 1 +12 0 doc9187 1 +12 0 doc3131 1 +12 0 doc2277 1 +12 0 doc2589 1 +12 0 doc3747 1 +12 0 doc3813 1 +12 0 doc5222 1 +12 0 doc6023 1 +12 0 doc6624 1 +12 0 doc7655 1 +12 0 doc9205 1 +12 0 doc12062 1 +12 0 doc15504 1 +12 0 doc16329 1 + + + +13 0 doc16347 1 +13 0 doc1866 1 +13 0 doc13431 1 +13 0 doc4948 1 +13 0 doc13989 1 +13 0 doc21565 1 +13 0 doc8554 1 +13 0 doc8695 1 +13 0 doc6764 1 +13 0 doc2408 1 +13 0 doc5605 1 +13 0 doc42 1 +13 0 doc15794 1 +13 0 doc17135 1 +13 0 doc14847 1 +13 0 doc3980 1 +13 0 doc2592 1 +13 0 doc5967 1 +13 0 doc2100 1 +13 0 doc10947 1 +13 0 doc4557 1 +13 0 doc2492 1 +13 0 doc7783 1 +13 0 doc8025 1 +13 0 doc355 1 +13 0 doc17170 1 +13 0 doc14595 1 +13 0 doc16894 1 +13 0 doc5822 1 +13 0 doc11088 1 @@ -586,36 +587,31 @@ 16 0 fakedoc3 1 16 0 fakedoc4 1 -16 0 doc4043 1 -16 0 doc14985 1 -16 0 doc15370 1 -16 0 doc15426 1 -16 0 doc1702 1 -16 0 doc3062 1 -16 0 doc16134 1 -16 0 doc15037 1 -16 0 doc8224 1 -16 0 doc5044 1 -16 0 doc8545 1 -16 0 doc7228 1 -16 0 doc12686 1 -16 0 doc16609 1 -16 0 doc13161 1 -16 0 doc3446 1 -16 0 doc16493 1 -16 0 doc19297 1 -16 0 doc13619 1 -16 0 doc3281 1 -16 0 doc15499 1 -16 0 doc7373 1 -16 0 doc9064 1 -16 0 doc1710 1 -16 0 doc15411 1 -16 0 doc10890 1 -16 0 doc3166 1 -16 0 doc17894 1 -16 0 doc4560 1 -16 0 doc12766 1 +16 0 doc4043 1 +16 0 doc15370 1 +16 0 doc15426 1 +16 0 doc1702 1 +16 0 doc14985 1 +16 0 doc3446 1 +16 0 doc16609 1 +16 0 doc16134 1 +16 0 doc3062 1 +16 0 doc8224 1 +16 0 doc16493 1 +16 0 doc15037 1 +16 0 doc12686 1 +16 0 doc1710 1 +16 0 doc19032 1 +16 0 doc8545 1 +16 0 doc5044 1 +16 0 doc17894 1 +16 0 doc7228 1 +16 0 doc7373 1 +16 0 doc9064 1 +16 0 doc13161 1 +16 0 doc3166 1 +16 0 doc19297 1 +16 0 doc15499 1 # --- m==1: precision_at_n and avg_precision are hurt, by unmarking relevant docs @@ -691,33 +687,29 @@ 18 0 doc15375 1 -19 0 doc5267 1 -19 0 doc2310 1 -19 0 doc11435 1 -19 0 doc15666 1 -19 0 doc12733 1 -19 0 doc7925 1 -19 0 doc2444 1 -19 0 doc4900 1 -19 0 doc10803 1 -19 0 doc8869 1 -19 0 doc5051 1 -19 0 doc9163 1 -19 0 doc529 1 -19 0 doc19546 1 -19 0 doc18561 1 -19 0 doc10634 1 -19 0 doc3979 1 -19 0 doc8833 1 -19 0 doc7652 1 -19 0 doc4804 1 -19 0 doc12616 1 -19 0 doc8419 1 -19 0 doc9431 1 -19 0 doc16235 1 -19 0 doc732 1 -19 0 doc2515 1 -19 0 doc7194 1 -19 0 doc16301 1 -19 0 doc4494 1 -19 0 doc4496 1 + +19 0 doc2310 1 +19 0 doc5267 1 +19 0 doc15666 1 +19 0 doc10803 1 +19 0 doc4900 1 +19 0 doc11435 1 +19 0 doc7925 1 +19 0 doc7652 1 +19 0 doc18561 1 +19 0 doc12733 1 +19 0 doc10634 1 +19 0 doc19546 1 +19 0 doc7194 1 +19 0 doc529 1 +19 0 doc9163 1 +19 0 doc8869 1 +19 0 doc2444 1 +19 0 doc5605 1 +19 0 doc5051 1 +19 0 doc10881 1 +19 0 doc4496 1 +19 0 doc3979 1 +19 0 doc8419 1 +19 0 doc9431 1 +19 0 doc16235 1