diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-10 13:39:22 -0500 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-10 13:39:22 -0500 |
| commit | 5d516b9adea62c30a861c17de10002254c4427d0 (patch) | |
| tree | 6eae83503a6a1ff802d7ff525224ab8eb989b599 | |
| parent | 26a40be70ba881d492c557b4a29b5c960324433b (diff) | |
| download | lingo-5d516b9adea62c30a861c17de10002254c4427d0.tar.gz lingo-5d516b9adea62c30a861c17de10002254c4427d0.tar.bz2 lingo-5d516b9adea62c30a861c17de10002254c4427d0.zip | |
Bottom red/blue should not return something with the same form
fixes #19
| -rw-r--r-- | lingo.cpp | 28 |
1 files changed, 24 insertions, 4 deletions
| diff --git a/lingo.cpp b/lingo.cpp index b903ea6..4c43d9c 100644 --- a/lingo.cpp +++ b/lingo.cpp | |||
| @@ -122,9 +122,19 @@ verbly::filter makeHintFilter(verbly::filter subfilter, Height height, Colour co | |||
| 122 | case kBottom: { | 122 | case kBottom: { |
| 123 | if (filter_direction == kTowardSolution) | 123 | if (filter_direction == kTowardSolution) |
| 124 | { | 124 | { |
| 125 | return (verbly::notion::partMeronyms %= subfilter); | 125 | return (verbly::notion::partMeronyms %= |
| 126 | verbly::filter("partMeronyms", false, | ||
| 127 | subfilter && verbly::filter( | ||
| 128 | verbly::form::id, | ||
| 129 | verbly::filter::comparison::field_does_not_equal, | ||
| 130 | verbly::form::id))); | ||
| 126 | } else { | 131 | } else { |
| 127 | return (verbly::notion::partHolonyms %= subfilter); | 132 | return (verbly::notion::partHolonyms %= |
| 133 | verbly::filter("partHolonyms", false, | ||
| 134 | subfilter && verbly::filter( | ||
| 135 | verbly::form::id, | ||
| 136 | verbly::filter::comparison::field_does_not_equal, | ||
| 137 | verbly::form::id))); | ||
| 128 | } | 138 | } |
| 129 | } | 139 | } |
| 130 | default: break; // Not supported yet. | 140 | default: break; // Not supported yet. |
| @@ -152,9 +162,19 @@ verbly::filter makeHintFilter(verbly::filter subfilter, Height height, Colour co | |||
| 152 | case kBottom: { | 162 | case kBottom: { |
| 153 | if (filter_direction == kTowardSolution) | 163 | if (filter_direction == kTowardSolution) |
| 154 | { | 164 | { |
| 155 | return (verbly::notion::partHolonyms %= subfilter); | 165 | return (verbly::notion::partHolonyms %= |
| 166 | verbly::filter("partHolonyms", false, | ||
| 167 | subfilter && verbly::filter( | ||
| 168 | verbly::form::id, | ||
| 169 | verbly::filter::comparison::field_does_not_equal, | ||
| 170 | verbly::form::id))); | ||
| 156 | } else { | 171 | } else { |
| 157 | return (verbly::notion::partMeronyms %= subfilter); | 172 | return (verbly::notion::partMeronyms %= |
| 173 | verbly::filter("partMeronyms", false, | ||
| 174 | subfilter && verbly::filter( | ||
| 175 | verbly::form::id, | ||
| 176 | verbly::filter::comparison::field_does_not_equal, | ||
| 177 | verbly::form::id))); | ||
| 158 | } | 178 | } |
| 159 | } | 179 | } |
| 160 | default: break; // Not supported yet. | 180 | default: break; // Not supported yet. |