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, 61 deletions

@@ -12,6 +12,7 @@ namespace verbly {
       friend class adverb_query;
       
     public:
+      adverb();
       adverb(const data& _data, int _id);
       
       std::string base_form() const;
@@ -29,67 +30,6 @@ namespace verbly {
       adverb_query& not_derived_from(const word& _w);
   };
   
-  class adverb_query {
-    public:
-      adverb_query(const data& _data);
-      
-      adverb_query& limit(int _limit);
-      adverb_query& random(bool _random);
-      adverb_query& except(const adverb& _word);
-      adverb_query& rhymes_with(const word& _word);
-      adverb_query& has_pronunciation(bool _has_prn);
-      
-      adverb_query& requires_comparative_form(bool _arg);
-      adverb_query& requires_superlative_form(bool _arg);
-      
-      adverb_query& has_antonyms(bool _arg);
-      adverb_query& antonym_of(const adverb& _adv);
-      adverb_query& not_antonym_of(const adverb& _adv);
-      
-      adverb_query& has_synonyms(bool _arg);
-      adverb_query& synonym_of(const adverb& _adv);
-      adverb_query& not_synonym_of(const adverb& _adv);
-      
-      adverb_query& is_mannernymic(bool _arg);
-      adverb_query& mannernym_of(const adjective& _adj);
-      
-      adverb_query& derived_from(const word& _w);
-      adverb_query& not_derived_from(const word& _w);
-      
-      std::list<adverb> run() const;
-      
-      const static int unlimited = -1;
-      
-    private:
-      const data& _data;
-      int _limit = unlimited;
-      bool _random = false;
-      std::list<std::string> _rhymes;
-      std::list<adverb> _except;
-      bool _has_prn = false;
-      
-      bool _requires_comparative_form = false;
-      bool _requires_superlative_form = false;
-      
-      bool _has_antonyms = false;
-      std::list<adverb> _antonym_of;
-      std::list<adverb> _not_antonym_of;
-      
-      bool _has_synonyms = false;
-      std::list<adverb> _synonym_of;
-      std::list<adverb> _not_synonym_of;
-      
-      bool _is_mannernymic = false;
-      std::list<adjective> _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: ADVERB_H_86F8302F */