build.gradle

@@ -25,6 +25,7 @@ dependencies {
 
 test {
     useJUnitPlatform()
+    maxHeapSize = "4096m"
 }
 
 java {

src/main/java/chat/UMessageServerConnection.java

 package chat;
 
+import javax.swing.*;
 import java.io.*;
 import java.net.Socket;
 import java.net.UnknownHostException;
@@ -72,12 +73,12 @@ public class UMessageServerConnection extends Thread {
         try {
             cmd = cmd.trim();
             switch (cmd) {
-            case "MAIN":
-                m_channel(UMessageServerConnection.CHAT_CHANNEL, text);
-                break;
-            default:
-                String[] parts = text.split(" ", 2);
-                cmd = parts[0].trim();
+                case "MAIN":
+                    m_channel(UMessageServerConnection.CHAT_CHANNEL, text);
+                    break;
+                default:
+                    String[] parts = text.split(" ", 2);
+                    cmd = parts[0].trim();
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -112,34 +113,52 @@ public class UMessageServerConnection extends Thread {
             while ((line = this.in.readLine()) != null) {
                 if (line.startsWith("PING")) {
                     write("PONG", line.substring(5));
-                }
-                else if (line.startsWith(":umessage")) {
+                } else if (line.split(" ")[1].trim().equals("353")) {
                     int code = Integer.parseInt(line.split(" ")[1]);
                     switch (code) {
-                    // List of users...
-                    case IRCCodes.RplNamReply:
-                        String[] names = line.split(":")[2].split(" ");
-                        this.main.window.addUsers(names);
-                        break;
+                        // List of users...
+                        case IRCCodes.RplNamReply:
+                            String[] names = line.split(":")[2].split(" ");
+                            SwingUtilities.invokeLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                    main.window.addUsers(names);
+                                }
+                            });
+                            break;
                     }
-                }
-                else {
+                } else {
                     String cmd = line.split(" ")[1];
+                    final String[] lineParts = line.split(":");
                     switch (cmd) {
-                    case "PART":
-                        this.main.window.removeUser(line.split(":")[1].split("!")[0]);
-                        break;
-                    case "JOIN":
-                        this.main.window.addUser(line.split(":")[1].split("!")[0]);
-                        break;
-                    case "PRIVMSG":
-                        if (!line.split(" ")[2].equals(this.username)) {
-                            return;
-                        }
-                        String[] lineParts = line.split(":");
-                        this.main.window.gotMessage(lineParts[1].split("!")[0],
-                                lineParts[2]);
-                        break;
+                        case "QUIT":
+                            SwingUtilities.invokeLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                    main.window.removeUser(lineParts[1].split("!")[0]);
+                                }
+                            });
+                            break;
+                        case "JOIN":
+                            SwingUtilities.invokeLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                    main.window.addUser(lineParts[1].split("!")[0]);
+                                }
+                            });
+                            break;
+                        case "PRIVMSG":
+                            if (!line.split(" ")[2].equals(this.username)) {
+                                return;
+                            }
+                            SwingUtilities.invokeLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                    main.window.gotMessage(lineParts[1].split("!")[0],
+                                            lineParts[2]);
+                                }
+                            });
+                            break;
                     }
                 }
             }

src/main/java/chat/uMessage.java

@@ -18,11 +18,17 @@ import java.util.function.Supplier;
 
 public class uMessage {
     private static final int N = 3;
-    private static final String CORPUS = "eggs.txt";
+    private static final String CORPUS = "corpus/eggs.txt";
+    // Use .binarySearchTreeConstructor(); if you want to test things since it is an implementation we provide and is guaranteed to work
+    // Other examples:
+    // .trieConstructor(NGram.class);
+    // .trieConstructor(AlphabeticString.class);
+    // .hashtableConstructor(NGramTester.avlTreeConstructor());
+    // .hashtableConstructor(NGramTester.binarySearchTreeConstructor());
     private static final Supplier<Dictionary<NGram, Dictionary<AlphabeticString, Integer>>> NEW_OUTER = NGramTester
-            .trieConstructor(NGram.class);
+            .binarySearchTreeConstructor();
     private static final Supplier<Dictionary<AlphabeticString, Integer>> NEW_INNER = NGramTester
-            .trieConstructor(AlphabeticString.class);
+            .binarySearchTreeConstructor();
 
     /*
      *

src/main/java/cse332/datastructures/trees/BinarySearchTree.java

@@ -16,6 +16,7 @@ import java.util.Iterator;
 public class BinarySearchTree<K extends Comparable<? super K>, V>
         extends ComparableDictionary<K, V> {
     // The root of the BST. Root is null if and only if the tree is empty.
+    // This MUST be used as your root for any class that extends this
     protected BSTNode root;
 
     /**

src/main/java/datastructures/dictionaries/AVLTree.java

@@ -18,12 +18,12 @@ import cse332.datastructures.trees.BinarySearchTree;
  * the references used to access the instance).  Such masking will
  * lead to highly perplexing and erroneous behavior. Instead,
  * continue using the existing BSTNode children array.
- * 4. If this class has redundant methods, your score will be heavily
- * penalized.
- * 5. Cast children array to AVLNode whenever necessary in your
- * AVLTree. This will result a lot of casts, so we recommend you make
- * private methods that encapsulate those casts.
+ * 4. Ensure that the class does not have redundant methods
+ * 5. Cast a BSTNode to an AVLNode whenever necessary in your AVLTree.
+ * This will result a lot of casts, so we recommend you make private methods
+ * that encapsulate those casts.
  * 6. Do NOT override the toString method. It is used for grading.
+ * 7. The internal structure of your AVLTree (from this.root to the leaves) must be correct
  */
 
 public class AVLTree<K extends Comparable<? super K>, V> extends BinarySearchTree<K, V> {

src/main/java/datastructures/dictionaries/ChainingHashTable.java

@@ -9,23 +9,24 @@ import java.util.Iterator;
 import java.util.function.Supplier;
 
 /**
- * 1. You must implement a generic chaining hashtable. You may not
- * restrict the size of the input domain (i.e., it must accept
- * any key) or the number of inputs (i.e., it must grow as necessary).
- * 3. Your HashTable should rehash as appropriate (use load factor as
- * shown in class!).
- * 5. HashTable should be able to resize its capacity to prime numbers for more
- * than 200,000 elements. After more than 200,000 elements, it should
- * continue to resize using some other mechanism.
- * 6. We suggest you hard code some prime numbers. You can use this
- * list: http://primes.utm.edu/lists/small/100000.txt
- * NOTE: Do NOT copy the whole list!
- * 7. When implementing your iterator, you should NOT copy every item to another
- * dictionary/list and return that dictionary/list's iterator.
+ * - You must implement a generic chaining hashtable. You may not
+ *   restrict the size of the input domain (i.e., it must accept
+ *   any key) or the number of inputs (i.e., it must grow as necessary).
+ *
+ * - ChainingHashTable should rehash as appropriate (use load factor as shown in lecture!).
+ *
+ * - ChainingHashTable must resize its capacity into prime numbers via given PRIME_SIZES list.
+ *   Past this, it should continue to resize using some other mechanism (primes not necessary).
+ *
+ * - When implementing your iterator, you should NOT copy every item to another
+ *   dictionary/list and return that dictionary/list's iterator.
  */
 public class ChainingHashTable<K, V> extends DeletelessDictionary<K, V> {
     private Supplier<Dictionary<K, V>> newChain;
 
+    static final int[] PRIME_SIZES =
+            {11, 23, 47, 97, 193, 389, 773, 1549, 3089, 6173, 12347, 24697, 49393, 98779, 197573, 395147};
+
     public ChainingHashTable(Supplier<Dictionary<K, V>> newChain) {
         this.newChain = newChain;
     }
@@ -44,4 +45,13 @@ public class ChainingHashTable<K, V> extends DeletelessDictionary<K, V> {
     public Iterator<Item<K, V>> iterator() {
         throw new NotYetImplementedException();
     }
+
+    /**
+     * Temporary fix so that you can debug on IntelliJ properly despite a broken iterator
+     * Remove to see proper String representation (inherited from Dictionary)
+     */
+    @Override
+    public String toString() {
+        return "ChainingHashTable String representation goes here.";
+    }
 }

src/main/java/datastructures/dictionaries/MoveToFrontList.java

@@ -9,9 +9,9 @@ import java.util.Iterator;
 /**
  * 1. The list is typically not sorted.
  * 2. Add new items to the front of the list.
- * 3. Whenever find is called on an item, move it to the front of the
- * list. This means you remove the node from its current position
- * and make it the first node in the list.
+ * 3. Whenever find or insert is called on an existing key, move it
+ * to the front of the list. This means you remove the node from its
+ * current position and make it the first node in the list.
  * 4. You need to implement an iterator. The iterator SHOULD NOT move
  * elements to the front.  The iterator should return elements in
  * the order they are stored in the list, starting with the first

src/main/java/datastructures/worklists/CircularArrayFIFOQueue.java

@@ -3,18 +3,11 @@ package datastructures.worklists;
 import cse332.exceptions.NotYetImplementedException;
 import cse332.interfaces.worklists.FixedSizeFIFOWorkList;
 
-import java.util.NoSuchElementException;
-
 /**
  * See cse332/interfaces/worklists/FixedSizeFIFOWorkList.java
  * for method specifications.
  */
-public class CircularArrayFIFOQueue<E extends Comparable<E>> extends FixedSizeFIFOWorkList<E> {
-
-    private E[] queue;
-    private int front;
-    private int size;
-
+public class CircularArrayFIFOQueue<E> extends FixedSizeFIFOWorkList<E> {
     public CircularArrayFIFOQueue(int capacity) {
         super(capacity);
         throw new NotYetImplementedException();
@@ -57,17 +50,31 @@ public class CircularArrayFIFOQueue<E extends Comparable<E>> extends FixedSizeFI
 
     @Override
     public int compareTo(FixedSizeFIFOWorkList<E> other) {
+        // You will implement this method in project 2. Leave this method unchanged for project 1.
         throw new NotYetImplementedException();
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public boolean equals(Object obj) {
-        throw new NotYetImplementedException();
+        // You will finish implementing this method in project 2. Leave this method unchanged for project 1.
+        if (this == obj) {
+            return true;
+        } else if (!(obj instanceof FixedSizeFIFOWorkList<?>)) {
+            return false;
+        } else {
+            // Uncomment the line below for p2 when you implement equals
+            // FixedSizeFIFOWorkList<E> other = (FixedSizeFIFOWorkList<E>) obj;
+
+            // Your code goes here
+
+            throw new NotYetImplementedException();
+        }
     }
 
     @Override
     public int hashCode() {
+        // You will implement this method in project 2. Leave this method unchanged for project 1.
         throw new NotYetImplementedException();
     }
 }

src/main/java/p2/clients/NGramTester.java

@@ -36,7 +36,7 @@ public class NGramTester {
 
     public static void main(String[] args) {
         try {
-            WordSuggestor suggestions = new WordSuggestor("eggs.txt", 2, -1,
+            WordSuggestor suggestions = new WordSuggestor("corpus/eggs.txt", 2, -1,
                     NGramTester.trieConstructor(NGram.class),
                     NGramTester.trieConstructor(AlphabeticString.class));
             System.out.println(suggestions);

src/main/java/p2/sorts/TopKSort.java

@@ -9,6 +9,7 @@ public class TopKSort {
         sort(array, k, (x, y) -> x.compareTo(y));
     }
 
+
     public static <E> void sort(E[] array, int k, Comparator<E> comparator) {
         throw new NotYetImplementedException();
     }

src/main/java/p2/wordcorrector/AutocompleteTrie.java

@@ -21,21 +21,19 @@ public class AutocompleteTrie extends HashTrieMap<Character, AlphabeticString, I
             }
         }
 
-        String result = key;
+        StringBuilder result = new StringBuilder(key);
 
         while (current.pointers.size() == 1) {
             if (current.value != null) {
                 return null;
             }
-            result += current.pointers.keySet().iterator().next();
+            result.append(current.pointers.keySet().iterator().next());
             current = current.pointers.values().iterator().next();
         }
 
-        // Switch this to return null to only complete if we're at the end of
-        // the word
         if (current.pointers.size() != 0) {
-            return result;
+            return result.toString();
         }
-        return result;
+        return result.toString();
     }
 }
\ No newline at end of file

src/main/java/p2/wordcorrector/SpellingCorrector.java

@@ -17,7 +17,7 @@ public class SpellingCorrector {
         this.dictionary = new AutocompleteTrie();
         Scanner dict;
         try {
-            dict = new Scanner(new File("dictionary2.txt"));
+            dict = new Scanner(new File("./corpus/dictionary2.txt"));
         } catch (FileNotFoundException e) {
             throw new RuntimeException(
                     "Couldn't read dictionary file for spelling correction and autocompletion.");

src/main/java/p2/wordsuggestor/NGramToNextChoicesMap.java

@@ -7,6 +7,8 @@ import cse332.misc.LargeValueFirstItemComparator;
 import cse332.sorts.InsertionSort;
 import cse332.types.AlphabeticString;
 import cse332.types.NGram;
+import p2.sorts.QuickSort;
+import p2.sorts.TopKSort;
 
 import java.util.Comparator;
 import java.util.Iterator;
@@ -73,10 +75,16 @@ public class NGramToNextChoicesMap {
 
         Comparator<Item<String, Integer>> comp = new LargeValueFirstItemComparator<String, Integer>();
         if (k < 0) {
-            InsertionSort.sort(afterNGrams, comp);
+            QuickSort.sort(afterNGrams, comp);
         } else {
-            // You must fix this line toward the end of the project
-            throw new NotYetImplementedException();
+            Comparator<Item<String, Integer>> revComp = (o1, o2) -> comp.compare(o2, o1);
+            TopKSort.sort(afterNGrams, k, revComp);
+            int cutoff = Math.min(k, afterNGrams.length);
+            for (int i = 0; i < cutoff / 2; i++) {
+                Item<String, Integer> temp = afterNGrams[i];
+                afterNGrams[i] = afterNGrams[cutoff - i - 1];
+                afterNGrams[cutoff - i - 1] = temp;
+            }
         }
 
         String[] nextWords = new String[k < 0 ? afterNGrams.length : k];