diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-04-17 13:46:53 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2016-04-17 13:46:53 -0400 |
| commit | 62287325587649ee62188522a1cb429c53edff72 (patch) | |
| tree | 354a36777b638c7079cc6836ce530aff2c9ad3ab | |
| parent | ada595af96411dc18298389cbe1d13ccda3a2b0a (diff) | |
| download | wordplay-62287325587649ee62188522a1cb429c53edff72.tar.gz wordplay-62287325587649ee62188522a1cb429c53edff72.tar.bz2 wordplay-62287325587649ee62188522a1cb429c53edff72.zip | |
Updated verbly and fixed perfect rhyming
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| m--------- | vendor/verbly | 0 | ||||
| -rw-r--r-- | wordplay.cpp | 8 |
3 files changed, 5 insertions, 5 deletions
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ef9832..a10537e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | cmake_minimum_required (VERSION 2.6) | 1 | cmake_minimum_required (VERSION 3.1) |
| 2 | project (wordplay) | 2 | project (wordplay) |
| 3 | 3 | ||
| 4 | find_package(PkgConfig) | 4 | find_package(PkgConfig) |
| diff --git a/vendor/verbly b/vendor/verbly | |||
| Subproject d5ee4e39e5b5b3b8daa85cd972802195ad35e96 | Subproject 04338f2b040fee5142904c062e0e38c83660103 | ||
| diff --git a/wordplay.cpp b/wordplay.cpp index 0d48e3e..8beb225 100644 --- a/wordplay.cpp +++ b/wordplay.cpp | |||
| @@ -24,7 +24,7 @@ int main(int argc, char** argv) | |||
| 24 | for (;;) | 24 | for (;;) |
| 25 | { | 25 | { |
| 26 | // Generate the most amazing jokes you've ever heard | 26 | // Generate the most amazing jokes you've ever heard |
| 27 | auto adjq = database.adjectives().has_pronunciation(true).has_synonyms(true).random(true).limit(1).run(); | 27 | auto adjq = database.adjectives().has_rhyming_noun().has_synonyms().random().limit(1).run(); |
| 28 | if (adjq.empty()) | 28 | if (adjq.empty()) |
| 29 | { | 29 | { |
| 30 | continue; | 30 | continue; |
| @@ -32,7 +32,7 @@ int main(int argc, char** argv) | |||
| 32 | 32 | ||
| 33 | verbly::adjective rhmadj = adjq.front(); | 33 | verbly::adjective rhmadj = adjq.front(); |
| 34 | 34 | ||
| 35 | auto nounq = database.nouns().rhymes_with(rhmadj).not_derived_from(rhmadj).is_hyponym(true).random(true).limit(1).run(); | 35 | auto nounq = database.nouns().rhymes_with(rhmadj).is_hyponym().random().limit(1).run(); |
| 36 | if (nounq.empty()) | 36 | if (nounq.empty()) |
| 37 | { | 37 | { |
| 38 | continue; | 38 | continue; |
| @@ -40,7 +40,7 @@ int main(int argc, char** argv) | |||
| 40 | 40 | ||
| 41 | verbly::noun rhmnoun = nounq.front(); | 41 | verbly::noun rhmnoun = nounq.front(); |
| 42 | 42 | ||
| 43 | auto hypq = database.nouns().hypernym_of(rhmnoun).random(true).limit(1).run(); | 43 | auto hypq = database.nouns().hypernym_of(rhmnoun).random().limit(1).run(); |
| 44 | if (hypq.empty()) | 44 | if (hypq.empty()) |
| 45 | { | 45 | { |
| 46 | continue; | 46 | continue; |
| @@ -48,7 +48,7 @@ int main(int argc, char** argv) | |||
| 48 | 48 | ||
| 49 | verbly::noun hyp = hypq.front(); | 49 | verbly::noun hyp = hypq.front(); |
| 50 | 50 | ||
| 51 | auto synq = database.adjectives().synonym_of(rhmadj).random(true).limit(1).run(); | 51 | auto synq = database.adjectives().synonym_of(rhmadj).random().limit(1).run(); |
| 52 | if (synq.empty()) | 52 | if (synq.empty()) |
| 53 | { | 53 | { |
| 54 | continue; | 54 | continue; |