From 20bbb6c47e0d371f2e076752a9fe9565439e464c Mon Sep 17 00:00:00 2001 From: Matthew Slowe Date: Sat, 21 Nov 2015 19:24:24 +0000 Subject: [PATCH] working! --- main.java | 8 ++--- uk/org/mafoo/wordbubbles/Cell.java | 11 +++--- uk/org/mafoo/wordbubbles/Prison.java | 24 +++++++++----- uk/org/mafoo/wordbubbles/WordList.java | 46 +++----------------------- 4 files changed, 31 insertions(+), 58 deletions(-) diff --git a/main.java b/main.java index aca65e9..39cc794 100644 --- a/main.java +++ b/main.java @@ -5,7 +5,7 @@ import uk.org.mafoo.wordbubbles.*; class main { public static void main(String[] args) throws IOException { - WordList words = WordList.loadWordListFromFile(args[0]); + Lexicon words = Lexicon.loadLexiconFromFile(args[0]); System.out.println(words); // String[] testwords = new String[]{"test", "amit", "ppp", "zebra"}; // for (String w : testwords) { @@ -42,10 +42,10 @@ class main { Prison prison = new Prison(grid); System.out.println(prison); - ArrayList found = prison.search(words); - for ( String w : found ) { + ArrayList> found = prison.search(words); + for ( LinkedHashSet w : found ) { if(hunted != null) { - if( hunted.containsKey(new Integer(w.length())) ) { + if( hunted.containsKey(new Integer(w.size())) ) { System.out.println(w); } } else { diff --git a/uk/org/mafoo/wordbubbles/Cell.java b/uk/org/mafoo/wordbubbles/Cell.java index 5b0e900..6bc879f 100644 --- a/uk/org/mafoo/wordbubbles/Cell.java +++ b/uk/org/mafoo/wordbubbles/Cell.java @@ -2,21 +2,24 @@ package uk.org.mafoo.wordbubbles; import java.util.*; -class Cell { +public class Cell { protected final char inmate; - protected final int x, y; + protected int x = -1; + protected int y = -1; protected Cell (final char c, final int in_x, final int in_y) { if(c >= 'a' && c <= 'z') { inmate = c; x = in_x; y = in_y; - } else - throw new RuntimeException("Unable to create a cell with no inmate"); + } else throw new RuntimeException("Unable to create a cell with no inmate"); } public String toString() { return "" + inmate; } + public String toStringVerbose() { + return "" + inmate + "@" + x + "," + y; + } } \ No newline at end of file diff --git a/uk/org/mafoo/wordbubbles/Prison.java b/uk/org/mafoo/wordbubbles/Prison.java index 9c8209b..f03f7e4 100644 --- a/uk/org/mafoo/wordbubbles/Prison.java +++ b/uk/org/mafoo/wordbubbles/Prison.java @@ -56,8 +56,8 @@ public class Prison { return cells.get(x).get(y); } - public ArrayList search(WordList words) { - ArrayList found = new ArrayList(); + public ArrayList> search(Lexicon words) { + ArrayList> found = new ArrayList>(); // System.out.println("Started hunting"); for (int i=0; i(), "", words, found); + rabbithole(cells.get(i).get(j), new LinkedHashSet(), "", words, found); } catch (ImpossibleException e) { } @@ -75,28 +75,36 @@ public class Prison { return found; } - private void rabbithole(Cell c, HashMap visited, String embryo, WordList words, ArrayList found) throws ImpossibleException { + private void rabbithole( + Cell c, + LinkedHashSet visited, + String embryo, + Lexicon words, + ArrayList> found + ) throws ImpossibleException { // System.out.println("At " + c.x + "," + c.y); embryo += c.inmate; + visited.add(c); if(words.checkWord(embryo)) { - found.add(embryo); + found.add(new LinkedHashSet(visited)); // System.out.println("Found a word: " + embryo); } if(words.checkPrefix(embryo)) { // Then it's worth carrying on // System.out.println("Found valid embryo: " + embryo); - visited.put(c, true); + for (Cell next : getNeighbours(c)) { - if(visited.containsKey(next)) { + if(visited.contains(next)) { continue; } else { rabbithole(next, visited, embryo, words, found); } } - visited.remove(c); } + + visited.remove(c); } } \ No newline at end of file diff --git a/uk/org/mafoo/wordbubbles/WordList.java b/uk/org/mafoo/wordbubbles/WordList.java index 34bdaa8..47c079f 100644 --- a/uk/org/mafoo/wordbubbles/WordList.java +++ b/uk/org/mafoo/wordbubbles/WordList.java @@ -1,52 +1,14 @@ package uk.org.mafoo.wordbubbles; import java.util.*; -import java.io.*; public class WordList { + ArrayList> list = new ArrayList>(); - HashMap words = new HashMap(); - HashMap prefixes = new HashMap(); - static final int maxwordlength = 9; - - public WordList (ArrayList wordlist) { - for (String word : wordlist) { - if(word.length() > maxwordlength) continue; - word = word.toLowerCase(); - words.put(word, true); - char[] word_a = word.toCharArray(); - String prefix = ""; - for(int i=0; i " + words.containsKey(word)); - return words.containsKey(word); - } - - public boolean checkPrefix(String prefix) { - // System.out.println("Checking prefix: " + prefix + " -> " + prefixes.containsKey(prefix)); - return prefixes.containsKey(prefix); - } - - public static WordList loadWordListFromFile(String file) throws FileNotFoundException, IOException { - FileReader fr = new FileReader(file); - BufferedReader br = new BufferedReader(fr); - String s; - ArrayList strings = new ArrayList(); - while((s = br.readLine()) != null) { - if(s.length() <= maxwordlength) - strings.add(s); - } - fr.close(); - return new WordList(strings); - } - - public String toString() { - return "WordList object with " + words.size() + " words and " + prefixes.size() + " word prefixes"; + public boolean add(E e) { + } } \ No newline at end of file