Added Axiomatic F2Exp and F2Log back to Anserini (castorini#529)

JDIQ Regression slightly changed only for wt10g.
kevinros · Dec 20, 2018 · 26fbb39 · 26fbb39
1 parent 6a3d1b3
commit 26fbb39
Showing 6 changed files with 502 additions and 5 deletions.
diff --git a/docs/experiments-jdiq2018.md b/docs/experiments-jdiq2018.md
@@ -64,7 +64,7 @@ topics.core17.txt                       | 0.2052    | 0.2005    | 0.2019    | 0.
 #### wt10g
 MAP                                     | BM25      | F2EXP     | PL2       | QL        | F2LOG     | SPL       |
 :---------------------------------------|-----------|-----------|-----------|-----------|-----------|-----------|
-topics.451-550.txt                      | 0.2005    | 0.1996    | 0.1880    | 0.2021    | 0.1938    | 0.1704    |
+topics.451-550.txt                      | 0.2005    | 0.2002    | 0.1880    | 0.2021    | 0.1946    | 0.1704    |
 
 
 #### gov2

diff --git a/src/main/java/io/anserini/search/SearchCollection.java b/src/main/java/io/anserini/search/SearchCollection.java
@@ -29,6 +29,8 @@
 import io.anserini.rerank.lib.ScoreTiesAdjusterReranker;
 import io.anserini.search.query.BagOfWordsQueryGenerator;
 import io.anserini.search.query.SdmQueryGenerator;
+import io.anserini.search.similarity.F2ExpSimilarity;
+import io.anserini.search.similarity.F2LogSimilarity;
 import io.anserini.search.similarity.TaggedSimilarity;
 import io.anserini.search.topicreader.NewsBackgroundLinkingTopicReader;
 import io.anserini.search.topicreader.TopicReader;
@@ -237,11 +239,11 @@ public List<TaggedSimilarity> constructSimiliries() {
       }
     } else if (args.f2exp) {
       for (String s : args.f2exp_s) {
-        similarities.add(new TaggedSimilarity(new AxiomaticF2EXP(Float.valueOf(s)), "s:"+s));
+        similarities.add(new TaggedSimilarity(new F2ExpSimilarity(Float.valueOf(s)), "s:"+s));
       }
     } else if (args.f2log) {
       for (String s : args.f2log_s) {
-        similarities.add(new TaggedSimilarity(new AxiomaticF2LOG(Float.valueOf(s)), "s:"+s));
+        similarities.add(new TaggedSimilarity(new F2LogSimilarity(Float.valueOf(s)), "s:"+s));
       }
     } else {
       throw new IllegalArgumentException("Error: Must specify scoring model!");