Merge pull request #31011 from vespa-engine/marius/update-significance-model-fields

Update significance model field and logic from architect meeting

2 files changed, 17 insertions, 11 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/significance/model/en.json b/container-search/src/test/java/com/yahoo/search/significance/model/en.json
index 50bae5e3451..04010959a58 100644
--- a/container-search/src/test/java/com/yahoo/search/significance/model/en.json
+++ b/container-search/src/test/java/com/yahoo/search/significance/model/en.json
@@ -2,13 +2,17 @@
   "version" : "1.0",
   "id" : "test::1",
   "description" : "desc",
-  "corpus-size" : 10,
-  "language" : "en",
-  "word-count" : 4,
-  "frequencies" : {
-    "usa" : 2,
-    "hello": 3,
-    "world": 5,
-    "test": 2
+  "languages" : {
+    "en": {
+      "description" : "english model",
+      "document-count" : 10,
+      "language" : "en",
+      "document-frequencies" : {
+        "usa" : 2,
+        "hello": 3,
+        "world": 5,
+        "test": 2
+      }
+    }
   }
 }
diff --git a/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java b/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java
index 890db3abb51..ad39c49bc1b 100644
--- a/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java
+++ b/container-search/src/test/java/com/yahoo/search/significance/test/SignificanceSearcherTest.java
@@ -15,7 +15,9 @@ import com.yahoo.search.significance.SignificanceSearcher;
 import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 
 import static com.yahoo.test.JunitCompat.assertEquals;
@@ -30,10 +32,10 @@ public class SignificanceSearcherTest {
     SignificanceSearcher searcher;
 
     public SignificanceSearcherTest() {
-        HashMap<Language, Path> map = new HashMap<>();
-        map.put(Language.ENGLISH, Path.of("src/test/java/com/yahoo/search/significance/model/en.json"));
+        List<Path> models = new ArrayList<>();
+        models.add( Path.of("src/test/java/com/yahoo/search/significance/model/en.json"));
 
-        significanceModelRegistry = new DefaultSignificanceModelRegistry(map);
+        significanceModelRegistry = new DefaultSignificanceModelRegistry(models);
         searcher = new SignificanceSearcher(significanceModelRegistry);
     }