From eef5de613c75661e5d94baa086f6f2ddc26c7ed0 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 24 Mar 2016 23:16:07 -0400 Subject: 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. --- lib/word.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'lib/word.h') diff --git a/lib/word.h b/lib/word.h index db3242a..dc6fac8 100644 --- a/lib/word.h +++ b/lib/word.h @@ -3,26 +3,23 @@ namespace verbly { - class adjective_query; - class verb_query; - class adverb_query; - - template - class query; - class word { protected: - const data& _data; + const data* _data; int _id; + bool _valid = false; std::list> pronunciations; + word(); word(const data& _data, int _id); friend class adjective_query; friend class verb_query; friend class noun_query; friend class adverb_query; + friend class frame_query; + friend class preposition_query; public: virtual std::string base_form() const = 0; -- cgit 1.4.1