diff options
author | MariusArhaug <mariusarhaug@hotmail.com> | 2024-05-23 14:55:24 +0200 |
---|---|---|
committer | MariusArhaug <mariusarhaug@hotmail.com> | 2024-05-23 14:59:01 +0200 |
commit | 3c280b7b800653b422ae5fb9049aa2eabaa4998f (patch) | |
tree | ab0bdb6a5f0d9607c4f4bbb98b0ff7e0ab691f38 /vespaclient-java/src/main/java/com/yahoo/vespasignificance | |
parent | 2b08f380d52c7c5b5e5678f5f582fb93647c2529 (diff) |
Update document frequency from hashmap to treemap
Diffstat (limited to 'vespaclient-java/src/main/java/com/yahoo/vespasignificance')
-rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java index e27158da3cb..7972a70cd10 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespasignificance/SignificanceModelGenerator.java @@ -38,7 +38,9 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; +import java.util.Map; import java.util.Set; +import java.util.TreeMap; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -49,7 +51,8 @@ public class SignificanceModelGenerator { private final ClientParameters clientParameters; private final Tokenizer tokenizer; - private final HashMap<String, Long> documentFrequency = new HashMap<>(); + private final TreeMap<String, Long> documentFrequency = new TreeMap<>(); + private final Language language; private final ObjectMapper objectMapper; private final static JsonFactory parserFactory = new JsonFactory(); @@ -110,10 +113,9 @@ public class SignificanceModelGenerator { put(clientParameters.language, new DocumentFrequencyFile(DOC_FREQ_DESCRIPTION, pageCount, getFinalDocumentFrequency())); }}; - modelFile = new SignificanceModelFile(VERSION, ID, SIGNIFICANCE_DESCRIPTION, languages); + modelFile = new SignificanceModelFile(VERSION, ID, SIGNIFICANCE_DESCRIPTION + clientParameters.inputFile, languages); } try { - //objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); ObjectWriter writer = objectMapper.writerWithDefaultPrettyPrinter(); writer.writeValue(new File(clientParameters.outputFile), modelFile); } catch (IOException e) { @@ -139,9 +141,14 @@ public class SignificanceModelGenerator { } } - public HashMap<String, Long> getFinalDocumentFrequency() { + public Map<String, Long> getFinalDocumentFrequency() { return documentFrequency.entrySet().stream() .filter(k -> k.getValue() > 1) - .collect(HashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll); + .collect(Collectors.toMap( + Map.Entry::getKey, + Map.Entry::getValue, + (e1, e2) -> e1, + TreeMap::new + )); } } |