mirror of
https://github.com/Z3Prover/z3
synced 2025-04-23 17:15:31 +00:00
roll back add_var api
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson
parent
4fa38b5aa2
commit
1d51c5689e
6 changed files with 122 additions and 138 deletions
|
|
@ -2682,8 +2682,7 @@ void test_term() {
|
|||
|
||||
vector<std::pair<mpq, var_index>> term_one;
|
||||
term_one.push_back(std::make_pair(mpq(1), one));
|
||||
explanation e;
|
||||
solver.add_constraint(term_one, lconstraint_kind::EQ, mpq(0), e);
|
||||
solver.add_constraint(term_one, lconstraint_kind::EQ, mpq(0));
|
||||
|
||||
vector<std::pair<mpq, var_index>> term_ls;
|
||||
term_ls.push_back(std::pair<mpq, var_index>(mpq(1), x));
|
||||
|
|
@ -2695,13 +2694,13 @@ void test_term() {
|
|||
ls.push_back(std::pair<mpq, var_index>(mpq(1), x));
|
||||
ls.push_back(std::pair<mpq, var_index>(mpq(1), y));
|
||||
ls.push_back(std::pair<mpq, var_index>(mpq(1), z));
|
||||
|
||||
solver.add_constraint(ls, lconstraint_kind::EQ, mpq(0), e);
|
||||
|
||||
solver.add_constraint(ls, lconstraint_kind::EQ, mpq(0));
|
||||
ls.clear();
|
||||
ls.push_back(std::pair<mpq, var_index>(mpq(1), x));
|
||||
solver.add_constraint(ls, lconstraint_kind::LT, mpq(0), e);
|
||||
solver.add_constraint(ls, lconstraint_kind::LT, mpq(0));
|
||||
ls.push_back(std::pair<mpq, var_index>(mpq(2), y));
|
||||
solver.add_constraint(ls, lconstraint_kind::GT, mpq(0), e);
|
||||
solver.add_constraint(ls, lconstraint_kind::GT, mpq(0));
|
||||
auto status = solver.solve();
|
||||
std::cout << lp_status_to_string(status) << std::endl;
|
||||
std::unordered_map<var_index, mpq> model;
|
||||
|
|
@ -2718,7 +2717,6 @@ void test_term() {
|
|||
|
||||
void test_evidence_for_total_inf_simple(argument_parser & args_parser) {
|
||||
lar_solver solver;
|
||||
explanation e;
|
||||
var_index x = solver.add_var(0, false);
|
||||
var_index y = solver.add_var(1, false);
|
||||
solver.add_var_bound(x, LE, mpq(-1));
|
||||
|
|
@ -2727,11 +2725,10 @@ void test_evidence_for_total_inf_simple(argument_parser & args_parser) {
|
|||
|
||||
ls.push_back(std::pair<mpq, var_index>(mpq(1), x));
|
||||
ls.push_back(std::pair<mpq, var_index>(mpq(1), y));
|
||||
|
||||
solver.add_constraint(ls, GE, mpq(1), e);
|
||||
solver.add_constraint(ls, GE, mpq(1));
|
||||
ls.pop_back();
|
||||
ls.push_back(std::pair<mpq, var_index>(- mpq(1), y));
|
||||
solver.add_constraint(ls, lconstraint_kind::GE, mpq(0), e);
|
||||
solver.add_constraint(ls, lconstraint_kind::GE, mpq(0));
|
||||
auto status = solver.solve();
|
||||
std::cout << lp_status_to_string(status) << std::endl;
|
||||
std::unordered_map<var_index, mpq> model;
|
||||
|
|
@ -2775,7 +2772,7 @@ void test_bound_propagation_one_small_sample1() {
|
|||
coeffs.push_back(std::pair<mpq, var_index>(mpq(-1), c));
|
||||
ls.add_constraint(coeffs, LE, zero_of_type<mpq>());
|
||||
vector<implied_bound> ev;
|
||||
ls.add_var_bound(a, LE, mpq(1), e);
|
||||
ls.add_var_bound(a, LE, mpq(1));
|
||||
ls.solve();
|
||||
my_bound_propagator bp(ls);
|
||||
ls.propagate_bounds_for_touched_rows(bp);
|
||||
|
|
@ -2829,7 +2826,7 @@ void test_bound_propagation_one_row() {
|
|||
explanation e;
|
||||
ls.add_constraint(c, EQ, one_of_type<mpq>(), e);
|
||||
vector<implied_bound> ev;
|
||||
ls.add_var_bound(x0, LE, mpq(1), e);
|
||||
ls.add_var_bound(x0, LE, mpq(1));
|
||||
ls.solve();
|
||||
my_bound_propagator bp(ls);
|
||||
ls.propagate_bounds_for_touched_rows(bp);
|
||||
|
|
@ -2844,9 +2841,9 @@ void test_bound_propagation_one_row_with_bounded_vars() {
|
|||
explanation e;
|
||||
ls.add_constraint(c, EQ, one_of_type<mpq>(), e);
|
||||
vector<implied_bound> ev;
|
||||
ls.add_var_bound(x0, GE, mpq(-3), e);
|
||||
ls.add_var_bound(x0, LE, mpq(3), e);
|
||||
ls.add_var_bound(x0, LE, mpq(1), e);
|
||||
ls.add_var_bound(x0, GE, mpq(-3));
|
||||
ls.add_var_bound(x0, LE, mpq(3));
|
||||
ls.add_var_bound(x0, LE, mpq(1));
|
||||
ls.solve();
|
||||
my_bound_propagator bp(ls);
|
||||
ls.propagate_bounds_for_touched_rows(bp);
|
||||
|
|
@ -2861,7 +2858,7 @@ void test_bound_propagation_one_row_mixed() {
|
|||
explanation e;
|
||||
ls.add_constraint(c, EQ, one_of_type<mpq>(), e);
|
||||
vector<implied_bound> ev;
|
||||
ls.add_var_bound(x1, LE, mpq(1), e);
|
||||
ls.add_var_bound(x1, LE, mpq(1));
|
||||
ls.solve();
|
||||
my_bound_propagator bp(ls);
|
||||
ls.propagate_bounds_for_touched_rows(bp);
|
||||
|
|
@ -2876,16 +2873,15 @@ void test_bound_propagation_two_rows() {
|
|||
c.push_back(std::pair<mpq, var_index>(mpq(1), x));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(2), y));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(3), z));
|
||||
explanation e;
|
||||
ls.add_constraint(c, GE, one_of_type<mpq>(), e);
|
||||
ls.add_constraint(c, GE, one_of_type<mpq>());
|
||||
c.clear();
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(3), x));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(2), y));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(y), z));
|
||||
ls.add_constraint(c, GE, one_of_type<mpq>(), e);
|
||||
ls.add_var_bound(x, LE, mpq(2), e);
|
||||
ls.add_constraint(c, GE, one_of_type<mpq>());
|
||||
ls.add_var_bound(x, LE, mpq(2));
|
||||
vector<implied_bound> ev;
|
||||
ls.add_var_bound(y, LE, mpq(1), e);
|
||||
ls.add_var_bound(y, LE, mpq(1));
|
||||
ls.solve();
|
||||
my_bound_propagator bp(ls);
|
||||
ls.propagate_bounds_for_touched_rows(bp);
|
||||
|
|
@ -2898,15 +2894,14 @@ void test_total_case_u() {
|
|||
unsigned y = ls.add_var(1, false);
|
||||
unsigned z = ls.add_var(2, false);
|
||||
vector<std::pair<mpq, var_index>> c;
|
||||
explanation e;
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(1), x));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(2), y));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(3), z));
|
||||
ls.add_constraint(c, LE, one_of_type<mpq>(), e);
|
||||
ls.add_var_bound(x, GE, zero_of_type<mpq>(), e);
|
||||
ls.add_var_bound(y, GE, zero_of_type<mpq>(), e);
|
||||
ls.add_constraint(c, LE, one_of_type<mpq>());
|
||||
ls.add_var_bound(x, GE, zero_of_type<mpq>());
|
||||
ls.add_var_bound(y, GE, zero_of_type<mpq>());
|
||||
vector<implied_bound> ev;
|
||||
ls.add_var_bound(z, GE, zero_of_type<mpq>(), e);
|
||||
ls.add_var_bound(z, GE, zero_of_type<mpq>());
|
||||
ls.solve();
|
||||
my_bound_propagator bp(ls);
|
||||
ls.propagate_bounds_for_touched_rows(bp);
|
||||
|
|
@ -2925,16 +2920,15 @@ void test_total_case_l(){
|
|||
unsigned y = ls.add_var(1, false);
|
||||
unsigned z = ls.add_var(2, false);
|
||||
vector<std::pair<mpq, var_index>> c;
|
||||
explanation e;
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(1), x));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(2), y));
|
||||
c.push_back(std::pair<mpq, var_index>(mpq(3), z));
|
||||
ls.add_constraint(c, GE, one_of_type<mpq>(), e);
|
||||
ls.add_var_bound(x, LE, one_of_type<mpq>(), e);
|
||||
ls.add_var_bound(y, LE, one_of_type<mpq>(), e);
|
||||
ls.add_constraint(c, GE, one_of_type<mpq>());
|
||||
ls.add_var_bound(x, LE, one_of_type<mpq>());
|
||||
ls.add_var_bound(y, LE, one_of_type<mpq>());
|
||||
ls.settings().presolve_with_double_solver_for_lar = true;
|
||||
vector<implied_bound> ev;
|
||||
ls.add_var_bound(z, LE, zero_of_type<mpq>(), e);
|
||||
ls.add_var_bound(z, LE, zero_of_type<mpq>());
|
||||
ls.solve();
|
||||
my_bound_propagator bp(ls);
|
||||
ls.propagate_bounds_for_touched_rows(bp);
|
||||
|
|
@ -3516,9 +3510,8 @@ void test_maximize_term() {
|
|||
term_ls.push_back(std::pair<mpq, var_index>(mpq(2), y));
|
||||
|
||||
unsigned term_2x_pl_2y = solver.add_term(term_ls);
|
||||
explanation e;
|
||||
solver.add_var_bound(term_x_min_y, LE, zero_of_type<mpq>(), e);
|
||||
solver.add_var_bound(term_2x_pl_2y, LE, mpq(5), e);
|
||||
solver.add_var_bound(term_x_min_y, LE, zero_of_type<mpq>());
|
||||
solver.add_var_bound(term_2x_pl_2y, LE, mpq(5));
|
||||
solver.find_feasible_solution();
|
||||
lp_assert(solver.get_status() == lp_status::OPTIMAL);
|
||||
solver.print_constraints(std::cout);
|
||||
|
|
|
|||
|
|
@ -386,17 +386,17 @@ namespace lp {
|
|||
return ret;
|
||||
}
|
||||
|
||||
void add_constraint_to_solver(lar_solver * solver, formula_constraint & fc, explanation& e) {
|
||||
void add_constraint_to_solver(lar_solver * solver, formula_constraint & fc) {
|
||||
vector<std::pair<mpq, var_index>> ls;
|
||||
for (auto & it : fc.m_coeffs) {
|
||||
ls.push_back(std::make_pair(it.first, solver->add_var(register_name(it.second), false)));
|
||||
}
|
||||
solver->add_constraint(ls, fc.m_kind, fc.m_right_side, e);
|
||||
solver->add_constraint(ls, fc.m_kind, fc.m_right_side);
|
||||
}
|
||||
explanation e;
|
||||
|
||||
void fill_lar_solver(lar_solver * solver) {
|
||||
for (formula_constraint & fc : m_constraints)
|
||||
add_constraint_to_solver(solver, fc, e);
|
||||
add_constraint_to_solver(solver, fc);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue