mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

Adjusted rlimit increments in theory_arith to avoid non-termination issues

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2017-06-25 22:19:42 +01:00
parent ffbf19d944
commit c395516058
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/smt/theory_arith_core.h
View file

@ -1984,7 +1984,7 @@ namespace smt {
a_kj = r2[it->m_row_idx].m_coeff; a_kj = r2[it->m_row_idx].m_coeff;
a_kj.neg(); a_kj.neg();
add_row(it->m_row_id, a_kj, r_id, apply_gcd_test); add_row(it->m_row_id, a_kj, r_id, apply_gcd_test);
get_manager().limit().inc(r1_sz + r2.size()); get_manager().limit().inc((r1_sz + r2.size()) * (a_kj.storage_size()));
} }
} }
else { else {

4
src/util/mpq.h
View file

@ -176,7 +176,7 @@ public:
static bool is_small(mpz const & a) { return mpz_manager<SYNCH>::is_small(a); } static bool is_small(mpz const & a) { return mpz_manager<SYNCH>::is_small(a); }
static bool is_small(mpq const & a) { return is_small(a.m_num) && is_small(a.m_den); } static bool is_small(mpq const & a) { return is_small(a.m_num) && is_small(a.m_den); }
static mpq mk_q(int v) { return mpq(v); } static mpq mk_q(int v) { return mpq(v); }
@ -786,6 +786,8 @@ public:
unsigned bitsize(mpz const & a) { return mpz_manager<SYNCH>::bitsize(a); } unsigned bitsize(mpz const & a) { return mpz_manager<SYNCH>::bitsize(a); }
unsigned bitsize(mpq const & a) { return is_int(a) ? bitsize(a.m_num) : bitsize(a.m_num) + bitsize(a.m_den); } unsigned bitsize(mpq const & a) { return is_int(a) ? bitsize(a.m_num) : bitsize(a.m_num) + bitsize(a.m_den); }
unsigned storage_size(mpz const & a) { return mpz_manager<SYNCH>::size_info(a); }
unsigned storage_size(mpq const & a) { return mpz_manager<SYNCH>::size_info(a.m_num) + mpz_manager<SYNCH>::size_info(a.m_den); }
/** /**
\brief Return true if the number is a perfect square, and \brief Return true if the number is a perfect square, and

4
src/util/mpz.h
View file

@ -316,11 +316,11 @@ class mpz_manager {
void big_rem(mpz const & a, mpz const & b, mpz & c); void big_rem(mpz const & a, mpz const & b, mpz & c);
int big_compare(mpz const & a, mpz const & b); int big_compare(mpz const & a, mpz const & b);
public:
unsigned size_info(mpz const & a); unsigned size_info(mpz const & a);
struct sz_lt; struct sz_lt;
public:
static bool precise() { return true; } static bool precise() { return true; }
static bool field() { return false; } static bool field() { return false; }

2
src/util/rational.h
View file

@ -68,6 +68,8 @@ public:
mpq const & to_mpq() const { return m_val; } mpq const & to_mpq() const { return m_val; }
unsigned bitsize() const { return m().bitsize(m_val); } unsigned bitsize() const { return m().bitsize(m_val); }
unsigned storage_size() const { return m().storage_size(m_val); }
void reset() { m().reset(m_val); } void reset() { m().reset(m_val); }