Improved verbalization of predicate relations

Author: dlutz2

resources/data/phrases.txt

@@ -1,7 +1,7 @@
 #normal form	Alternate surface forms	Token Type
 
 # ---- subtype/equivalence/inverse predicates
-is	is a type of	IS
+is	is a type of,implies	IS
 same as	the same as,also known as,equivalent to,identical to	SAME_AS
 the inverse of		INVERSE_OF
 

src/org/opensextant/howler/abstraction/Vocabulary.java

@@ -69,6 +69,7 @@ public class Vocabulary {
 
   /* ------- parts of predicate expressions ------- */
   public static final GenericWord IS_AUX = new GenericWord("is", "VB");
+  public static final GenericWord IMPLIES = new GenericWord("implies", "VB");  
   public static final GenericWord DOES_AUX = new GenericWord("does", "VB");
   public static final GenericWord HAS_AUX = new GenericWord("has", "VB");
   public static final GenericWord INVERSE_OF = new GenericWord("the inverse of", "ZZ");

src/org/opensextant/howler/text/ToText.java

@@ -515,15 +515,7 @@ private List<Word> convert(PredicateType type, boolean negative, boolean inverse
 
     if (type.equals(PredicateType.IS)) {
 
-      if (wt.equals(WordType.DATA_PREDICATE)) {
-        wrds.add(Vocabulary.IS_Data);
-      }
-      if (wt.equals(WordType.OBJECT_PREDICATE)) {
-        wrds.add(Vocabulary.IS_Object);
-      }
-      if (wt.equals(WordType.ANNOTATION_PREDICATE)) {
-        wrds.add(Vocabulary.IS_Annotation);
-      }
+      wrds.add(Vocabulary.IMPLIES);
 
       if (negative) {
         wrds.add(Negative.NOT);