mirror of
https://github.com/Z3Prover/z3
synced 2025-04-29 03:45:51 +00:00
moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
61dbb6168e
commit
32b6b2da44
41 changed files with 55 additions and 280 deletions
|
@ -39,7 +39,6 @@ namespace opt {
|
|||
maxsat_context& c, vector<rational> const& ws, expr_ref_vector const& soft):
|
||||
m(c.get_manager()),
|
||||
m_c(c),
|
||||
m_cancel(false),
|
||||
m_soft(soft),
|
||||
m_weights(ws),
|
||||
m_assertions(m) {
|
||||
|
@ -150,7 +149,7 @@ namespace opt {
|
|||
|
||||
|
||||
maxsmt::maxsmt(maxsat_context& c):
|
||||
m(c.get_manager()), m_c(c), m_cancel(false),
|
||||
m(c.get_manager()), m_c(c),
|
||||
m_soft_constraints(m), m_answer(m) {}
|
||||
|
||||
lbool maxsmt::operator()() {
|
||||
|
@ -274,13 +273,6 @@ namespace opt {
|
|||
}
|
||||
}
|
||||
|
||||
void maxsmt::set_cancel(bool f) {
|
||||
m_cancel = f;
|
||||
|
||||
if (m_msolver) {
|
||||
m_msolver->set_cancel(f);
|
||||
}
|
||||
}
|
||||
|
||||
bool maxsmt::is_maxsat_problem(vector<rational> const& ws) const {
|
||||
for (unsigned i = 0; i < ws.size(); ++i) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue