rm dicId arg from lexicon.wordIds

WorksApplications · Nov 27, 2024 · d6a65d9 · d6a65d9
1 parent 32920ec
commit d6a65d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/src/main/java/com/worksap/nlp/sudachi/dictionary/DoubleArrayLexicon.java b/src/main/java/com/worksap/nlp/sudachi/dictionary/DoubleArrayLexicon.java
@@ -150,18 +150,16 @@ public int size() {
         return description.getNumTotalEntries();
     }
 
-    public Iterator<Integer> wordIds(int dic) {
-        return new WordIdItr(dic);
+    public Iterator<Integer> wordIds() {
+        return new WordIdItr();
     }
 
     private class WordIdItr implements Iterator<Integer> {
-        int dictId;
         Iterator<Ints> iterator;
         Ints ints;
         int index;
 
-        WordIdItr(int dic) {
-            dictId = dic;
+        WordIdItr() {
             this.iterator = getWordIdTable().wordIds();
             index = 0;
         }
@@ -183,8 +181,7 @@ public Integer next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
-            int rawWordId = ints.get(index++);
-            return WordId.make(dictId, rawWordId);
+            return ints.get(index++);
         }
     }
 

diff --git a/src/main/java/com/worksap/nlp/sudachi/dictionary/Lexicon.java b/src/main/java/com/worksap/nlp/sudachi/dictionary/Lexicon.java
@@ -82,10 +82,9 @@ public interface Lexicon {
     WordInfoList wordInfos(int dic);
 
     /**
-     * Iterates over all word ids in the specified dictionary.
+     * Iterates over all word ids in the dictionary.
      * 
-     * Returned word ids are not sorted. Dictionary part of returned ids are filled
-     * by the given dicId.
+     * Returned word ids are not sorted.
      */
-    Iterator<Integer> wordIds(int dic);
+    Iterator<Integer> wordIds();
 }
diff --git a/src/main/java/com/worksap/nlp/sudachi/dictionary/LexiconSet.java b/src/main/java/com/worksap/nlp/sudachi/dictionary/LexiconSet.java
@@ -171,16 +171,6 @@ public WordInfoList wordInfos(int dic) {
     }
 
     @Override
-    public Iterator<Integer> wordIds(int dic) {
-        return lexicons.get(dic).wordIds(dic);
-    }
-
-    /**
-     * Iterates over all word ids in all lexicons.
-     * 
-     * Returned word ids are not sorted. Dictionary part of returned ids are filled
-     * by the proper dict-ids.
-     */
     public Iterator<Integer> wordIds() {
         return new WordIdItr();
     }
@@ -191,7 +181,7 @@ private class WordIdItr implements Iterator<Integer> {
 
         WordIdItr() {
             this.dictId = 0;
-            this.iterator = wordIds(this.dictId);
+            this.iterator = lexicons.get(dictId).wordIds();
         }
 
         @Override
@@ -202,7 +192,7 @@ public boolean hasNext() {
                     return false;
                 }
                 dictId = nextDictId;
-                iterator = wordIds(nextDictId);
+                iterator = lexicons.get(nextDictId).wordIds();
             }
             return true;
         }
@@ -212,7 +202,8 @@ public Integer next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
-            return iterator.next();
+            int innerWordId = iterator.next();
+            return WordId.make(dictId, innerWordId);
         }
     }
 }