mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 11:55:51 +00:00
Code Activity

na

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-04-14 22:03:28 -07:00
parent 034132d245
commit 9a2b7677bf
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/math/polysat/solver.cpp
View file

@ -220,9 +220,9 @@ namespace polysat {
return false;
}
// one variable remains unassigned.
// at most one variable remains unassigned.
auto other_var = vars[1 - idx];
SASSERT(!is_assigned(other_var));
// SASSERT(!is_assigned(other_var));
// Detect and apply unit propagation.
@ -364,12 +364,14 @@ namespace polysat {
void solver::set_conflict(constraint& c) {
SASSERT(m_conflict.empty());
TRACE("polysat", tout << "conflict " << c << "\n";);
m_conflict.push_back(&c);
}
void solver::set_conflict(pvar v) {
SASSERT(m_conflict.empty());
m_conflict.append(m_cjust[v]);
TRACE("polysat", tout << "conflict "; for (auto* c : m_conflict) tout << *c << "\n";);
if (m_cjust[v].empty())
m_conflict.push_back(nullptr);
}