compile fixes

languagetool-org · Jun 15, 2015 · ca03480 · ca03480
1 parent ca661d0
commit ca03480
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/languagetool-standalone/src/main/java/org/languagetool/dev/HomophoneOccurrenceDumper.java b/languagetool-standalone/src/main/java/org/languagetool/dev/HomophoneOccurrenceDumper.java
@@ -31,10 +31,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
+import java.util.*;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 
 /**
  * Dump the occurrences of homophone 3grams to STDOUT. Useful to have a more
@@ -83,7 +80,7 @@ private void run(String confusionSetPath) throws IOException {
     System.err.println("Loading confusion sets from " + confusionSetPath + ", minimum occurrence: " + MIN_COUNT);
     ConfusionSetLoader confusionSetLoader = new ConfusionSetLoader();
     InputStream inputStream = JLanguageTool.getDataBroker().getFromResourceDirAsStream(confusionSetPath);
-    Map<String,ConfusionSet> map = confusionSetLoader.loadConfusionSet(inputStream);
+    Map<String,List<ConfusionSet>> map = confusionSetLoader.loadConfusionSet(inputStream);
     Set<String> confusionTerms = map.keySet();
     dumpOccurrences(confusionTerms);
   }

diff --git a/languagetool-standalone/src/main/java/org/languagetool/dev/RuleCreator.java b/languagetool-standalone/src/main/java/org/languagetool/dev/RuleCreator.java
@@ -56,21 +56,24 @@ public RuleCreator(float minErrorProb) {
   private void run(File homophoneOccurrences, String homophonePath) throws IOException {
     ConfusionSetLoader confusionSetLoader = new ConfusionSetLoader();
     InputStream inputStream = JLanguageTool.getDataBroker().getFromResourceDirAsStream(homophonePath);
-    Map<String,ConfusionSet> confusionSetMap = confusionSetLoader.loadConfusionSet(inputStream);
+    Map<String,List<ConfusionSet>> confusionSetMap = confusionSetLoader.loadConfusionSet(inputStream);
     initMaps(homophoneOccurrences);
     int groupCount = 0;
     if (XML_MODE) {
       System.out.println("<rules lang='en'>\n");
       System.out.println("<category name='Auto-generated rules'>\n");
     }
-    for (Map.Entry<String, ConfusionSet> entry : confusionSetMap.entrySet()) {
+    for (Map.Entry<String, List<ConfusionSet>> entry : confusionSetMap.entrySet()) {
       System.err.println(" === " + entry + " === ");
+      if (entry.getValue().size() > 1) {
+        System.err.println("WARN: will use only first pair of " + entry.getValue().size() + ": " + entry.getValue().get(0));
+      }
       List<OccurrenceInfo> infos = occurrenceInfos.get(entry.getKey());
       if (infos == null) {
         System.err.println("Could not find occurrence infos for '" + entry.getKey() + "', skipping");
         continue;
       }
-      Set cleanSet = new HashSet<>(entry.getValue().getSet());
+      Set cleanSet = new HashSet<>(entry.getValue().get(0).getSet());
       cleanSet.remove(entry.getKey());
       String name = StringUtils.join(cleanSet, "/") + " -> " + entry.getKey();
       if (XML_MODE) {
@@ -79,7 +82,7 @@ private void run(File homophoneOccurrences, String homophonePath) throws IOExcep
       groupCount++;
       for (OccurrenceInfo occurrenceInfo : infos) {
         String[] parts = occurrenceInfo.ngram.split(" ");
-        for (ConfusionString variant : entry.getValue().getSet()) {
+        for (ConfusionString variant : entry.getValue().get(0).getSet()) {
           if (variant.getString().equals(entry.getKey())) {
             continue;
           }