Added top yellow triviality check for swapped stressed phonemes

2 files changed, 21 insertions, 0 deletions

@@ -18,6 +18,7 @@
 #include <map>
 #include <array>
 #include <Magick++.h>
+#include <cctype>
 #include "imagenet.h"
 
 #define ENABLE_BOT
@@ -73,6 +74,10 @@ enum FilterDirection {
   kTowardQuestion
 };
 
+bool isDigitWrapper(unsigned char ch) {
+  return std::isdigit(ch);
+}
+
 verbly::filter makeHintFilter(verbly::filter subfilter, Height height, Colour colour, FilterDirection filter_direction)
 {
   switch (colour) {
@@ -495,6 +500,22 @@ private:
           return true;
         }
       }
+    } else if (height == kTop && colour == kYellow) {
+      std::set<std::string> hint_stressless;
+      for (const verbly::pronunciation& pronunciation : clue.getPronunciations()) {
+        std::string stressed = hatkirby::implode(pronunciation.getPhonemes(), " ");
+        std::string stressless;
+        std::remove_copy_if(stressed.begin(), stressed.end(), std::back_inserter(stressless), &isDigitWrapper);
+        hint_stressless.insert(stressless);
+      }
+      for (const verbly::pronunciation& pronunciation : solution.getPronunciations()) {
+        std::string stressed = hatkirby::implode(pronunciation.getPhonemes(), " ");
+        std::string stressless;
+        std::remove_copy_if(stressed.begin(), stressed.end(), std::back_inserter(stressless), &isDigitWrapper);
+        if (hint_stressless.count(stressless)) {
+          return true;
+        }
+      }
     }
     return false;
   }
-Subproject c66c279fb65328c5a5f5d8ca6e0df035fc5c555
+Subproject 1e30651c96912e5475f1ceb46972ec4e2fa54b1