Skip to content
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

Jump to bottom

Refactor core::resolver::sat #365

Merged
merged 2 commits into from
Jan 6, 2021
Merged

Refactor core::resolver::sat #365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efd0000
Refactor core::resolver::sat
ken-matsui Jan 6, 2021
1c4e0cc
Merge branch 'master' into refactor/sat
ken-matsui Jan 6, 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
12 changes: 4 additions & 8 deletions include/poac/core/resolver/sat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,19 +160,15 @@ namespace poac::core::resolver::sat {
const int i = maximum_literal_number_index(clauses);
// need to apply twice, once true, the other false
for (int j = 0; j < 2; ++j) {
// copy the formula before recursing
// copy the formula before recursive circulation
std::vector<int> new_literals = literals;

// if the number of literals with positive polarity are greater
if (calc_literal_polarity(clauses, i + 1) > 0) {
new_literals[i] = j; // positive
} else {
new_literals[i] = (j + 1) % 2; // negative
}
// cond ? positive : negative
new_literals[i] = calc_literal_polarity(clauses, i + 1) > 0 ? j : (j + 1) % 2;

// apply the change to all the clauses
if (
Status result = delete_set_literal(clauses, i, new_literals[i]);
if (Status result = delete_set_literal(clauses, i, new_literals[i]);
result == Status::satisfied
) {
return mitama::success(to_assignments(new_literals));
Expand Down