Excluding merged inits (#25)

* Add an EvaluationParameters option to include/exclude inits that merged with another init (exclude by default)

* Update PostTagSearcher.rangeOfTagStates test to set includeMergedStates = true

Author: okofish

libPostTagSystem/PostTagSearcher.cpp

@@ -84,7 +84,8 @@ class PostTagSearcher::Implementation {
         default:
           result.conclusionReason = ConclusionReason::InvalidInput;
       }
-      if (result.conclusionReason != ConclusionReason::NotEvaluated || parameters.includeUnevaluatedStates) {
+      if ((result.conclusionReason != ConclusionReason::NotEvaluated || parameters.includeUnevaluatedStates) &&
+          (result.conclusionReason != ConclusionReason::MergedWithAnotherInit || parameters.includeMergedStates)) {
         results.push_back(result);
       }
     }

libPostTagSystem/PostTagSearcher.hpp

@@ -52,6 +52,7 @@ class PostTagSearcher {
     int64_t groupTimeConstraintNs = std::numeric_limits<int64_t>::max();
     Checkpoints checkpoints = {};
     bool includeUnevaluatedStates = false;
+    bool includeMergedStates = false;
   };
 
   // The functions below use two tries. One for the input checkpoints which is shared among all of them. The other trie

libPostTagSystem/test/PostTagSearcher_test.cpp

@@ -58,9 +58,12 @@ void compareResults(const TagState& init,
 
 TEST(PostTagSearcher, rangeOfTagStates) {
   PostTagSearcher searcher;
-  const auto result = searcher.evaluateRange({{0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1}, 0},
-                                             {{0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0}, 1},
-                                             PostTagSearcher::EvaluationParameters());
+
+  PostTagSearcher::EvaluationParameters evalParams;
+  evalParams.includeMergedStates = true;
+
+  const auto result = searcher.evaluateRange(
+      {{0, 0, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1}, 0}, {{0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0}, 1}, evalParams);
   ASSERT_EQ(result.size(), 106);
 
   compareResults(TagState({0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1}, 0), result[48]);