allow_top_expansion

When this flag is unset (which is in most cases), top clues must be distinct from middle clues.

also we forgot to have the common word filter lol

1 files changed, 3 insertions, 2 deletions

@@ -56,6 +56,7 @@ struct GenerateOptions {
   std::string copy_hidden; // supported by single mid white
   bool force_two_words = false;
   bool must_be_broad = false; // the solution must also be gettable by bottom white/red/blue. supported by single and double
+  bool allow_top_expansion = false; // this disables the triviality check that top puzzles can't also apply to middle
 };
 
 class Wanderlust {
@@ -197,7 +198,7 @@ public:
 
 private:
 
-  verbly::filter MakeHintFilter(verbly::filter subfilter, Height height, Colour colour, FilterDirection filter_direction);
+  verbly::filter MakeHintFilter(verbly::filter subfilter, Height height, Colour colour, FilterDirection filter_direction) const;
 
   bool GenerateSinglePanelImpl(std::string name, Height height, Colour colour, GenerateOptions options);
 
@@ -215,7 +216,7 @@ private:
 
   verbly::filter GetWordFilter(FilterDirection direction, GenerateOptions options) const;
 
-  bool IsClueTrivial(Height height, Colour colour, const verbly::form& clue, const verbly::form& solution) const;
+  bool IsClueTrivial(Height height, Colour colour, const verbly::form& clue, const verbly::form& solution, GenerateOptions options = {}) const;
 
   unsigned int seed_;
   std::mt19937 rng_;