From 5875473eb27870fbc721fc7163ae885647c9945a Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 5 Feb 2017 09:00:06 -0500 Subject: Updated verbly (flattened selrestrs) --- sentence.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sentence.h') diff --git a/sentence.h b/sentence.h index abf6860..ecdf946 100644 --- a/sentence.h +++ b/sentence.h @@ -16,11 +16,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