From 83920acda89b086f9484fdd2907f819451c0610f Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 5 Feb 2017 09:24:03 -0500 Subject: Updated verbly (flattened selrestrs) --- sentence.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sentence.h') diff --git a/sentence.h b/sentence.h index abf6860..02674cf 100644 --- a/sentence.h +++ b/sentence.h @@ -4,6 +4,7 @@ #include #include #include +#include class sentence { public: @@ -16,11 +17,9 @@ public: private: - verbly::filter parseSelrestrs(verbly::selrestr selrestr) const; + bool chooseSelrestr(std::set selrestrs, std::set choices) const; - bool requiresSelrestr(std::string restriction, verbly::selrestr selrestr) const; - - verbly::word generateStandardNoun(std::string role, verbly::selrestr selrestrs) const; + verbly::word generateStandardNoun(std::string role, std::set selrestrs) const; verbly::token generateStandardNounPhrase( const verbly::word& noun, -- cgit 1.4.1