Avoid second search

src/main/java/io/github/gravetii/dictionary/Dictionary.java

@@ -44,14 +44,11 @@ public static void main(String[] args) {
     Dictionary dictionary = new Dictionary();
     System.out.println(dictionary.search("mask"));
     System.out.println(dictionary.search("silhouette"));
-    System.out.println(dictionary.prefix("silhou"));
+    System.out.println(dictionary.search("silhou"));
+    System.out.println(dictionary.search("ioklgmm"));
   }
 
   public int search(String word) {
     return this.trie.search(word);
   }
-
-  public boolean prefix(String word) {
-    return this.trie.prefix(word);
-  }
 }

src/main/java/io/github/gravetii/dictionary/Trie.java

@@ -10,9 +10,9 @@ public class Trie {
   }
 
   /**
-   * Add a new word from the English dictionary to this trie.
+   * Add a new word to this trie.
    *
-   * @param word the word to add.
+   * @param word the word to add
    */
   public void insert(String word) {
     TrieNode node = root;
@@ -30,38 +30,21 @@ public void insert(String word) {
   }
 
   /**
-   * Find if the given word belongs in the trie by returning its score.
+   * Search for the given word in the trie and return its score.
    *
-   * @param word the input word.
-   * @return the score of the word if it's valid, 0 otherwise.
+   * @param word the input word
+   * @return the score of the word: > 0 if the word exists, = 0 if the word exists as a prefix, < 0
+   *     if the word doesn't exist
    */
   public int search(String word) {
     TrieNode node = root;
     for (char ch : word.toCharArray()) {
       int idx = ch - 'a';
       TrieNode[] children = node.getChildren();
-      if (children[idx] == null) return 0;
+      if (children[idx] == null) return -1;
       node = children[idx];
     }
 
-    return node != null ? node.getScore() : 0;
-  }
-
-  /**
-   * Find if the given word is a prefix of some other word in the trie.
-   *
-   * @param word the input word.
-   * @return true if the word is a prefix of some other word, false otherwise.
-   */
-  public boolean prefix(String word) {
-    TrieNode node = root;
-    for (char ch : word.toCharArray()) {
-      int idx = ch - 'a';
-      TrieNode[] children = node.getChildren();
-      if (children[idx] == null) return false;
-      node = children[idx];
-    }
-
-    return node != null;
+    return node != null ? node.getScore() : -1;
   }
 }

src/main/java/io/github/gravetii/game/GameSolver.java

@@ -3,7 +3,6 @@
 import io.github.gravetii.dictionary.Dictionary;
 import io.github.gravetii.model.GridPoint;
 import io.github.gravetii.model.GridUnit;
-import io.github.gravetii.util.Utils;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -21,11 +20,6 @@ public GameSolver(GridUnit[][] grid, Dictionary dictionary) {
     this.dictionary = dictionary;
   }
 
-  private int validate(String word) {
-    if (word.length() < MIN_WORD_LENGTH) return 0;
-    return this.dictionary.search(word);
-  }
-
   public GameResult solve() {
     for (int i=0;i<4;++i) {
       for (int j=0;j<4;++j) {
@@ -44,15 +38,14 @@ private void crawl(GridPoint point, String prefix, List<GridPoint> seq, boolean[
     GridUnit unit = grid[point.x][point.y];
     visited[point.x][point.y] = true;
     String word = prefix + unit.getLetter();
-    if (this.dictionary.prefix(word)) {
-      seq.add(point);
-      int score = this.validate(word);
-      if (score > 0) this.result.put(word, score, seq);
-      for (GridPoint n: point.getNeighbors()) {
-        if (!visited[n.x][n.y]) {
-          this.crawl(n, word, new LinkedList<>(seq), visited);
-          visited[n.x][n.y] = false;
-        }
+    int score = this.dictionary.search(word);
+    if (score < 0) return;
+    seq.add(point);
+    if (score > 0 && word.length() >= MIN_WORD_LENGTH) this.result.put(word, score, seq);
+    for (GridPoint n: point.getNeighbors()) {
+      if (!visited[n.x][n.y]) {
+        this.crawl(n, word, new LinkedList<>(seq), visited);
+        visited[n.x][n.y] = false;
       }
     }
   }