Clear up

Author: artkpv

.gitignore

@@ -0,0 +1,6 @@
+slides
+*.class
+*.zip
+*.pdf
+*.txt
+DrJava.lnk

checkstyle-algs4.bat

@@ -8,44 +8,75 @@
 import java.lang.StringBuilder;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.HashSet;
 import java.util.Stack;
 import edu.princeton.cs.algs4.StdOut;
 import edu.princeton.cs.algs4.Queue;
 import edu.princeton.cs.algs4.In;
 import edu.princeton.cs.algs4.TrieST;
 
-//import java.util.HashMap;
 //import java.util.Arrays;
 
 public class BoggleSolver
 {
     private TrieST<String> dictionaryTrie;
+    private String[] mydictionary;
 
     // Initializes the data structure using the given array of strings as the dictionary.
     // (You can assume each word in the dictionary contains only the uppercase letters A through Z.)
     public BoggleSolver(String[] dictionary) {
-        trace("constructing BoggleSolver");
+        mydictionary = new String[dictionary.length];
+        for(int i = 0; i < dictionary.length; i++)
+            mydictionary[i] = dictionary[i];
+    }
+
+    private void construct_trie(BoggleBoard board) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < board.rows(); i++) {
+            for (int j = 0; j < board.cols(); j++) {
+                char c = board.getLetter(i, j);
+                sb.append(c);
+                if(c == 'Q')
+                    sb.append('U');
+            }
+        }
+        String validChars = sb.toString();
+
         dictionaryTrie = new TrieST<String>();
 
-        for(String w : dictionary) 
-            dictionaryTrie.put(w, w);
+        // add only those words that has the chars:
+        boolean isAllChars;
+        for(String w : mydictionary) {
+            isAllChars = true;
+            for(int i = 0; i < w.length(); i++) {
+                if(validChars.indexOf(w.charAt(i)) == -1)  {
+                    isAllChars = false;
+                    break;
+                }
+            }
+            if(isAllChars)
+                dictionaryTrie.put(w, w);
+        }
     }
 
     // Returns the set of all valid words in the given Boggle board, as an Iterable.
     public Iterable<String> getAllValidWords(BoggleBoard board) {
-        trace("gets words for board " + board.rows() + "x" + board.cols());
-        ArrayList<String> words = new ArrayList<String>();
+        construct_trie(board);
+
+        trace("gets words for board " + board.rows() + "x" + board.cols() + " \n");
+        // walk cell by cell
+        HashSet<String> words = new HashSet<String>();
         for(int i = 0; i < board.rows(); i++){
             for(int j = 0; j < board.cols(); j++){
                 Stack<Point> path = new Stack<Point>();
                 Point p = new Point(i, j);
                 path.push(p);
                 StringBuilder wordBuilder = new StringBuilder();
                 append(wordBuilder, board, p);
-                walk(board, path, words, wordBuilder);
+                walk(board, path, words, wordBuilder, null);
             }
         }
-        trace("found " + words.size() + " words");
+        trace("found " + words.size() + " words\n");
         return words;
     }
 
@@ -63,8 +94,12 @@ private void remove(StringBuilder sb, BoggleBoard board, Point p) {
             sb.deleteCharAt(sb.length() - 1); // 'U' was removed
     }
 
-
-    private void walk(BoggleBoard board, Stack<Point> path, ArrayList<String> found, StringBuilder wordBuilder) {
+    private void walk(
+            BoggleBoard board,
+            Stack<Point> path,
+            HashSet<String> found,
+            StringBuilder wordBuilder,
+            Iterable<String> keys) {
         Point v = path.peek();
         for(Point p : getAdj(board, v)) {
             if(path.contains(p))
@@ -74,21 +109,26 @@ private void walk(BoggleBoard board, Stack<Point> path, ArrayList<String> found,
             append(wordBuilder, board, p);
             String current = wordBuilder.toString();
 
-            if(current.length() < 3) {
-                walk(board, path, found, wordBuilder);
+
+            if(path.size() < 3 && current.length() < 3) {
+                walk(board, path, found, wordBuilder, keys);
             }
             else {
-                Iterable<String> keys = dictionaryTrie.keysWithPrefix(current);
+                if(path.size() == 3 || current.length() == 3 || keys == null) // reinit 
+                    keys = dictionaryTrie.keysWithPrefix(current);
                 int left = 0;
+                trace(" walking " + current + ", keys: ");
                 for(String k : keys) {
-                    if(k == current)
-                        if(!found.contains(current))
-                            found.add(current);
-                    else
+                    trace(k + " ");
+                    if(k.equals(current)) {
+                        found.add(current);
+                    }
+                    else if(k.startsWith(current))
                         left++;
                 }
+                trace("; " + left + " left\n");
                 if(left > 0)
-                    walk(board, path, found, wordBuilder);
+                    walk(board, path, found, wordBuilder, keys);
             }
 
             path.pop();
@@ -113,16 +153,13 @@ private Iterable<Point> getAdj(BoggleBoard board, Point p) {
     // Returns the score of the given word if it is in the dictionary, zero otherwise.
     // (You can assume the word contains only the uppercase letters A through Z.)
     public int scoreOf(String w) {
-        if(dictionaryTrie.contains(w)) {
-            int l = w.length();
-            if(l < 3) return 0;
-            if(l < 5) return 1;
-            if(l == 5) return 2;
-            if(l == 6) return 3;
-            if(l == 7) return 5;
-            if(l > 7) return 11;
-        }
-        return 0;
+        int l = w.length();
+        if(l < 3) return 0;
+        if(l < 5) return 1;
+        if(l == 5) return 2;
+        if(l == 6) return 3;
+        if(l == 7) return 5;
+        return 11;
     }
 
     public static void main(String[] args)
@@ -164,6 +201,6 @@ public int hashCode() {
     }
 
     private void trace(String msg) {
-        //StdOut.println(msg);
+        //StdOut.print(msg);
     }
 }

checkstyle-algs4.ps1

@@ -1 +1,2 @@
 burrows
+.idea