diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-24 23:16:07 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-03-24 23:16:07 -0400 |
commit | eef5de613c75661e5d94baa086f6f2ddc26c7ed0 (patch) | |
tree | 180230f6a245c5bca94d894273f5d2b93ded3f04 /lib/word.h | |
parent | d5ee4e39e5b5b3b8daa85cd972802195ad35e965 (diff) | |
download | verbly-eef5de613c75661e5d94baa086f6f2ddc26c7ed0.tar.gz verbly-eef5de613c75661e5d94baa086f6f2ddc26c7ed0.tar.bz2 verbly-eef5de613c75661e5d94baa086f6f2ddc26c7ed0.zip |
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.
Diffstat (limited to 'lib/word.h')
-rw-r--r-- | lib/word.h | 13 |
1 files changed, 5 insertions, 8 deletions
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 @@ | |||
3 | 3 | ||
4 | namespace verbly { | 4 | namespace verbly { |
5 | 5 | ||
6 | class adjective_query; | ||
7 | class verb_query; | ||
8 | class adverb_query; | ||
9 | |||
10 | template <class T> | ||
11 | class query; | ||
12 | |||
13 | class word { | 6 | class word { |
14 | protected: | 7 | protected: |
15 | const data& _data; | 8 | const data* _data; |
16 | int _id; | 9 | int _id; |
10 | bool _valid = false; | ||
17 | 11 | ||
18 | std::list<std::list<std::string>> pronunciations; | 12 | std::list<std::list<std::string>> pronunciations; |
19 | 13 | ||
14 | word(); | ||
20 | word(const data& _data, int _id); | 15 | word(const data& _data, int _id); |
21 | 16 | ||
22 | friend class adjective_query; | 17 | friend class adjective_query; |
23 | friend class verb_query; | 18 | friend class verb_query; |
24 | friend class noun_query; | 19 | friend class noun_query; |
25 | friend class adverb_query; | 20 | friend class adverb_query; |
21 | friend class frame_query; | ||
22 | friend class preposition_query; | ||
26 | 23 | ||
27 | public: | 24 | public: |
28 | virtual std::string base_form() const = 0; | 25 | virtual std::string base_form() const = 0; |