Removed some trivial puzzles

2 files changed, 14 insertions, 1 deletions

@@ -3,7 +3,7 @@ project (generator)
 
 add_subdirectory(vendor/fmt)
 
-include_directories(../vendor/hkutil vendor/fmt/include)
+include_directories(vendor/hkutil vendor/fmt/include)
 
 add_executable(generator generator.cpp main.cpp)
 set_property(TARGET generator PROPERTY CXX_STANDARD 17)
@@ -374,6 +374,10 @@ void generator::run() {
         for (size_t f_id2 : all_forms) {
           if (f_id1 != f_id2) {
             Form& form = forms_.at(f_id1);
+            Form& form2 = forms_.at(f_id2);
+            if (form.anagram_set_id == form2.anagram_set_id) {
+              continue;
+            }
             form.puzzles[kYellowTop].insert(f_id2);
           }
         }
@@ -427,6 +431,9 @@ void generator::run() {
         for (size_t f_id1 : pronunciation.form_ids) {
           for (size_t f_id2 : all_forms) {
             Form& form = forms_.at(f_id1);
+            if (form.reverse_form_id == f_id2) {
+              continue;
+            }
             form.puzzles[kBlackTop].insert(f_id2);
           }
         }
@@ -573,6 +580,12 @@ void generator::run() {
                   for (size_t mero_form_id : merophone.form_ids) {
                     Form& mero_form = forms_.at(mero_form_id);
 
+                    if (holo_form.text.find(mero_form.text) !=
+                        std::string::npos) {
+                      // We don't want top puzzles that are also middle puzzles.
+                      continue;
+                    }
+
                     bool word_overlap = false;
                     for (size_t holo_word_id : holo_form.word_ids) {
                       for (size_t mero_word_id : mero_form.word_ids) {