fixed to pass tests #409

dhowe · Apr 18, 2017 · a0c39c9 · a0c39c9
1 parent 2afed3a
commit a0c39c9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/java/rita/RiLexicon.java b/java/rita/RiLexicon.java
@@ -188,13 +188,19 @@ public String randomWord(int syllableCount) {
    */
   public String randomWord(String pos, int syllableCount) {
 
-    boolean pluralize = pos.equals("nns");
+    boolean pluralize = false;
 
-    if (pos.equals("v")) pos = "vb";
-    if (pos.equals("r")) pos = "rb";
-    if (pos.equals("a")) pos = "jj";
-    if (pos.equals("n") || pos.equals("nns")) 
-      pos = "nn";
+    if (pos != null) {
+      pluralize = pos.equals("nns");
+      if (pos.equals("v"))
+	pos = "vb";
+      if (pos.equals("r"))
+	pos = "rb";
+      if (pos.equals("a"))
+	pos = "jj";
+      if (pos.equals("n") || pos.equals("nns"))
+	pos = "nn";
+    }
 
     Iterator<String> it = getIterator(pos);
 

diff --git a/java/rita/test/RiLexiconTest.java b/java/rita/test/RiLexiconTest.java
@@ -211,7 +211,6 @@ public void testLexicalData() {
   @Test
   public void testRandomWord() {
 
-
     RiLexicon lex = new RiLexicon();
 
     String result = lex.randomWord();
-Original file line number
+Diff line change
@@ Expand Up / @@ -211,7 +211,6 @@ public void testLexicalData() { @@
       @Test
       public void testRandomWord() {
         RiLexicon lex = new RiLexicon();
         String result = lex.randomWord();
@@ Expand Down @@