mirror of
https://github.com/Z3Prover/z3
synced 2025-04-12 12:08:18 +00:00
work on incremental version
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
parent
d68ebeeb9f
commit
71c433908c
|
@ -2,4 +2,4 @@ BasedOnStyle: Google
|
||||||
IndentWidth: 4
|
IndentWidth: 4
|
||||||
ColumnLimit: 0
|
ColumnLimit: 0
|
||||||
NamespaceIndentation: All
|
NamespaceIndentation: All
|
||||||
BreakBeforeBraces: Stroustrup
|
BreakBeforeBraces: Attach
|
File diff suppressed because it is too large
Load diff
|
@ -66,12 +66,12 @@ enum class lp_status {
|
||||||
UNBOUNDED,
|
UNBOUNDED,
|
||||||
TENTATIVE_DUAL_UNBOUNDED,
|
TENTATIVE_DUAL_UNBOUNDED,
|
||||||
DUAL_UNBOUNDED,
|
DUAL_UNBOUNDED,
|
||||||
OPTIMAL,
|
|
||||||
FEASIBLE,
|
|
||||||
TIME_EXHAUSTED,
|
TIME_EXHAUSTED,
|
||||||
EMPTY,
|
EMPTY,
|
||||||
UNSTABLE,
|
UNSTABLE,
|
||||||
CANCELLED
|
CANCELLED,
|
||||||
|
FEASIBLE,
|
||||||
|
OPTIMAL
|
||||||
};
|
};
|
||||||
|
|
||||||
// when the ratio of the vector length to domain size to is greater than the return value we switch to solve_By_for_T_indexed_only
|
// when the ratio of the vector length to domain size to is greater than the return value we switch to solve_By_for_T_indexed_only
|
||||||
|
|
|
@ -1957,13 +1957,32 @@ public:
|
||||||
literal mk_literal(nla::ineq const& ineq) {
|
literal mk_literal(nla::ineq const& ineq) {
|
||||||
bool is_lower = true, pos = true, is_eq = false;
|
bool is_lower = true, pos = true, is_eq = false;
|
||||||
switch (ineq.cmp()) {
|
switch (ineq.cmp()) {
|
||||||
case lp::LE: is_lower = false; pos = false; break;
|
case lp::LE:
|
||||||
case lp::LT: is_lower = true; pos = true; break;
|
is_lower = false;
|
||||||
case lp::GE: is_lower = true; pos = false; break;
|
pos = false;
|
||||||
case lp::GT: is_lower = false; pos = true; break;
|
break;
|
||||||
case lp::EQ: is_eq = true; pos = false; break;
|
case lp::LT:
|
||||||
case lp::NE: is_eq = true; pos = true; break;
|
is_lower = true;
|
||||||
default: UNREACHABLE();
|
pos = true;
|
||||||
|
break;
|
||||||
|
case lp::GE:
|
||||||
|
is_lower = true;
|
||||||
|
pos = false;
|
||||||
|
break;
|
||||||
|
case lp::GT:
|
||||||
|
is_lower = false;
|
||||||
|
pos = true;
|
||||||
|
break;
|
||||||
|
case lp::EQ:
|
||||||
|
is_eq = true;
|
||||||
|
pos = false;
|
||||||
|
break;
|
||||||
|
case lp::NE:
|
||||||
|
is_eq = true;
|
||||||
|
pos = true;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
UNREACHABLE();
|
||||||
}
|
}
|
||||||
TRACE("arith", tout << "is_lower: " << is_lower << " pos " << pos << "\n";);
|
TRACE("arith", tout << "is_lower: " << is_lower << " pos " << pos << "\n";);
|
||||||
expr_ref atom(m);
|
expr_ref atom(m);
|
||||||
|
|
Loading…
Reference in a new issue