Fixed verb query returning words with no valid verbs

Also updated verbly for query time improvements.

2 files changed, 16 insertions, 10 deletions

@@ -57,24 +57,30 @@ int main(int argc, char** argv)
   std::uniform_int_distribution<int> emojidist(0, emojis.size()-1);
   std::bernoulli_distribution continuedist(1.0/2.0);
 
-  verbly::query<verbly::form> verbQuery = database.forms(
+  verbly::filter nounFilter =
+    (verbly::notion::partOfSpeech == verbly::part_of_speech::noun)
+    && (verbly::form::proper == false)
+    // Blacklist ethnic slurs
+    && !(verbly::word::usageDomains %= (verbly::notion::wnid == 106718862));
+
+  verbly::query<verbly::word> verbQuery = database.words(
     (verbly::notion::partOfSpeech == verbly::part_of_speech::verb)
-    && (verbly::pronunciation::rhymes));
+    && (verbly::pronunciation::rhymes %= nounFilter));
 
   for (;;)
   {
     std::cout << "Generating tweet..." << std::endl;
 
-    verbly::form verb = verbQuery.first();
+    verbly::word verb = verbQuery.first();
+
+    verbly::word noun = database.words(
+      (verbly::pronunciation::rhymes %= verb)
+      && nounFilter).first();
 
-    verbly::form noun = database.forms(
-      (verbly::notion::partOfSpeech == verbly::part_of_speech::noun)
-      && (verbly::pronunciation::rhymes %= verb)
-      && (verbly::form::proper == false)
-      && (verbly::form::id != verb.getId())
-      && !(verbly::word::usageDomains %= (verbly::notion::wnid == 106718862))).first();
+    verbly::token utter;
+    utter << "god" << verb << "this" << noun;
 
-    std::string exclamation = "god " + verb.getText() + " this " + noun.getText();
+    std::string exclamation = utter.compile();
 
     std::string emojibef;
     std::string emojiaft;
-Subproject f1f67e62cebb4144f0599196263cd93b41fa972
+Subproject a354b1f864523e9def80aa1b3a561bce6bdb05a