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

LRA changes to rational

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-09 09:06:41 -07:00
parent d8c3b273d3
commit 42ea2d1ea5
1 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/util/rational.h
View file

@ -52,6 +52,9 @@ public:
rational(mpz const & z) { m().set(m_val, z); } rational(mpz const & z) { m().set(m_val, z); }
rational(double z) { UNREACHABLE(); }
explicit rational(char const * v) { m().set(m_val, v); } explicit rational(char const * v) { m().set(m_val, v); }
struct i64 {}; struct i64 {};
@ -127,6 +130,12 @@ public:
return *this; return *this;
} }
rational & operator=(int v) {
*this = rational(v);
return *this;
}
rational & operator=(double v) { UNREACHABLE(); return *this; }
friend inline rational numerator(rational const & r) { rational result; m().get_numerator(r.m_val, result.m_val); return result; } friend inline rational numerator(rational const & r) { rational result; m().get_numerator(r.m_val, result.m_val); return result; }
friend inline rational denominator(rational const & r) { rational result; m().get_denominator(r.m_val, result.m_val); return result; } friend inline rational denominator(rational const & r) { rational result; m().get_denominator(r.m_val, result.m_val); return result; }
@ -136,6 +145,11 @@ public:
return *this; return *this;
} }
rational & operator+=(int r) {
(*this) += rational(r);
return *this;
}
rational & operator-=(rational const & r) { rational & operator-=(rational const & r) {
m().sub(m_val, r.m_val, m_val); m().sub(m_val, r.m_val, m_val);
return *this; return *this;
@ -394,6 +408,7 @@ public:
return num_bits; return num_bits;
} }
}; };
inline bool operator!=(rational const & r1, rational const & r2) { inline bool operator!=(rational const & r1, rational const & r2) {
@ -404,6 +419,10 @@ inline bool operator>(rational const & r1, rational const & r2) {
return operator<(r2, r1); return operator<(r2, r1);
} }
inline bool operator<(rational const & r1, int r2) {
return r1 < rational(r2);
}
inline bool operator<=(rational const & r1, rational const & r2) { inline bool operator<=(rational const & r1, rational const & r2) {
return !operator>(r1, r2); return !operator>(r1, r2);
} }
@ -412,14 +431,43 @@ inline bool operator>=(rational const & r1, rational const & r2) {
return !operator<(r1, r2); return !operator<(r1, r2);
} }
inline bool operator>(rational const & a, int b) {
return a > rational(b);
}
inline bool operator!=(rational const & a, int b) {
return !(a == rational(b));
}
inline bool operator==(rational const & a, int b) {
return a == rational(b);
}
inline rational operator+(rational const & r1, rational const & r2) { inline rational operator+(rational const & r1, rational const & r2) {
return rational(r1) += r2; return rational(r1) += r2;
} }
inline rational operator+(int r1, rational const & r2) {
return rational(r1) + r2;
}
inline rational operator+(rational const & r1, int r2) {
return r1 + rational(r2);
}
inline rational operator-(rational const & r1, rational const & r2) { inline rational operator-(rational const & r1, rational const & r2) {
return rational(r1) -= r2; return rational(r1) -= r2;
} }
inline rational operator-(rational const & r1, int r2) {
return r1 - rational(r2);
}
inline rational operator-(int r1, rational const & r2) {
return rational(r1) - r2;
}
inline rational operator-(rational const & r) { inline rational operator-(rational const & r) {
rational result(r); rational result(r);
result.neg(); result.neg();
@ -430,10 +478,25 @@ inline rational operator*(rational const & r1, rational const & r2) {
return rational(r1) *= r2; return rational(r1) *= r2;
} }
inline rational operator*(rational const & r1, int r2) {
return r1 * rational(r2);
}
inline rational operator*(int r1, rational const & r2) {
return rational(r1) * r2;
}
inline rational operator/(rational const & r1, rational const & r2) { inline rational operator/(rational const & r1, rational const & r2) {
return rational(r1) /= r2; return rational(r1) /= r2;
} }
inline rational operator/(rational const & r1, int r2) {
return r1 / rational(r2);
}
inline rational operator/(int r1, rational const & r2) {
return rational(r1) / r2;
}
inline rational power(rational const & r, unsigned p) { inline rational power(rational const & r, unsigned p) {
return r.expt(p); return r.expt(p);
} }