Skip to content

Excluding merged inits #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
okofish merged 3 commits into from
Mar 12, 2021
Merged

Excluding merged inits #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b77a34
Add an EvaluationParameters option to include/exclude inits that merg…
okofish Mar 3, 2021
c37acf4
Update PostTagSearcher.rangeOfTagStates test to set includeMergedStat…
okofish Mar 12, 2021
bdecc67
Merge master into feature/exclude-merged-states
okofish Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libPostTagSystem/PostTagSearcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
1 change: 1 addition & 0 deletions libPostTagSystem/PostTagSearcher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions libPostTagSystem/test/PostTagSearcher_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down