1 files changed, 6 insertions, 1 deletions

@@ -2,10 +2,12 @@
 #define GENERATOR_H_D5C6A724
 
 #include <filesystem>
+#include <map>
 #include <optional>
 #include <set>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 enum PuzzleType {
@@ -15,6 +17,8 @@ enum PuzzleType {
   kYellowMiddle = 3,
   kBlackTop = 4,
   kBlackMiddle = 5,
+  kBlackBottom = 6,
+  kDoubleBlackBottom = 7,
 };
 
 class generator {
@@ -107,7 +111,8 @@ class generator {
   std::unordered_map<std::string, size_t> anagram_set_by_sorted_letters_;
 
   std::vector<Word> words_;
-  std::unordered_map<std::string, size_t> word_by_base_;
+  std::unordered_map<std::string, std::vector<size_t>> words_by_base_;
+  std::map<std::pair<int, int>, size_t> word_by_wnid_and_wnum_;
 
   std::vector<std::vector<size_t>> synsets_;
   std::unordered_map<int, size_t> synset_by_wnid_;