Added verb frames

In addition:
- Added prepositions.
- Rewrote a lot of the query interface. It now, for a lot of relationships, supports nested AND, OR, and NOT logic.
- Rewrote the token class. It is now a union-like class instead of being polymorphic, which means smart pointers are no longer necessary.
- Querying with regards to word derivation has been temporarily removed.
- Sentinel values are now supported for all word types.
- The VerbNet data retrieved from http://verbs.colorado.edu/~mpalmer/projects/verbnet/downloads.html was found to not be perfectly satisfactory in some regards, especially regarding adjective phrases. A patch file is now included in the repository describing the changes made to the VerbNet v3.2 download for the canonical verbly datafile.

1 files changed, 1 insertions, 93 deletions

@@ -25,6 +25,7 @@ namespace verbly {
       friend class adjective_query;
       
     public:
+      adjective();
       adjective(const data& _data, int _id);
       
       std::string base_form() const;
@@ -45,99 +46,6 @@ namespace verbly {
       noun_query attributes() const;
   };
   
-  class adjective_query {
-    public:
-      adjective_query(const data& _data);
-      
-      adjective_query& limit(int _limit);
-      adjective_query& random(bool _random);
-      adjective_query& except(const adjective& _word);
-      adjective_query& rhymes_with(const word& _word);
-      adjective_query& has_pronunciation(bool _has_prn);
-      
-      adjective_query& requires_comparative_form(bool req);
-      adjective_query& requires_superlative_form(bool req);
-      adjective_query& position(adjective::positioning pos);
-      
-      adjective_query& is_variant(bool _is_variant);
-      adjective_query& variant_of(const noun& _noun);
-      adjective_query& not_variant_of(const noun& _noun);
-      
-      adjective_query& has_antonyms(bool _is_antonymic);
-      adjective_query& antonym_of(const adjective& _adj);
-      adjective_query& not_antonym_of(const adjective& _adj);
-      
-      adjective_query& has_synonyms(bool _is_synonymic);
-      adjective_query& synonym_of(const adjective& _adj);
-      adjective_query& not_synonym_of(const adjective& _adj);
-      
-      adjective_query& is_generalization(bool _is_generalization);
-      adjective_query& generalization_of(const adjective& _adj);
-      adjective_query& not_generalization_of(const adjective& _adj);
-      
-      adjective_query& is_specification(bool _is_specification);
-      adjective_query& specification_of(const adjective& _adj);
-      adjective_query& not_specification_of(const adjective& _adj);
-      
-      adjective_query& is_pertainymic(bool _is_pertainymic);
-      adjective_query& pertainym_of(const noun& _noun);
-      
-      adjective_query& is_mannernymic(bool _is_mannernymic);
-      adjective_query& anti_mannernym_of(const adverb& _adv);
-      
-      adjective_query& derived_from(const word& _w);
-      adjective_query& not_derived_from(const word& _w);
-      
-      std::list<adjective> run() const;
-      
-      const static int unlimited = -1;
-
-    protected:
-      const data& _data;
-      int _limit = unlimited;
-      bool _random = false;
-      std::list<std::string> _rhymes;
-      std::list<adjective> _except;
-      bool _has_prn = false;
-      
-      bool _requires_comparative_form = false;
-      bool _requires_superlative_form = false;
-      adjective::positioning _position = adjective::positioning::undefined;
-      
-      bool _is_variant = false;
-      std::list<noun> _variant_of;
-      std::list<noun> _not_variant_of;
-      
-      bool _is_antonymic = false;
-      std::list<adjective> _antonym_of;
-      std::list<adjective> _not_antonym_of;
-      
-      bool _is_synonymic = false;
-      std::list<adjective> _synonym_of;
-      std::list<adjective> _not_synonym_of;
-      
-      bool _is_generalization = false;
-      std::list<adjective> _generalization_of;
-      std::list<adjective> _not_generalization_of;
-      
-      bool _is_specification = false;
-      std::list<adjective> _specification_of;
-      std::list<adjective> _not_specification_of;
-      
-      bool _is_pertainymic = false;
-      std::list<noun> _pertainym_of;
-      
-      bool _is_mannernymic = false;
-      std::list<adverb> _anti_mannernym_of;
-      
-      std::list<adjective> _derived_from_adjective;
-      std::list<adjective> _not_derived_from_adjective;
-      std::list<adverb> _derived_from_adverb;
-      std::list<adverb> _not_derived_from_adverb;
-      std::list<noun> _derived_from_noun;
-      std::list<noun> _not_derived_from_noun;
-  };
-  
 };
 
 #endif /* end of include guard: ADJECTIVE_H_87B3FB75 */