michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add operator<(mpq, double) to mpq

Browse source
This commit is contained in:
Soonho Kong 2013-08-14 13:45:29 -07:00
parent 5a38480cf7
commit 43b25a0231
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/tests/interval/mpfp_interval.cpp
View file

@ -142,8 +142,8 @@ static void mpfp_interval_inf1() {
cout << i1 << " * " << ozero_pinf << " = " << i1 * ozero_pinf << endl; cout << i1 << " * " << ozero_pinf << " = " << i1 * ozero_pinf << endl;
cout << i1 << " * " << czero_ninf << " = " << i1 * czero_ninf << endl; cout << i1 << " * " << czero_ninf << " = " << i1 * czero_ninf << endl;
cout << i1 << " * " << czero_pinf << " = " << i1 * czero_pinf << endl; cout << i1 << " * " << czero_pinf << " = " << i1 * czero_pinf << endl;
lean_assert(i1 * ozero_ninf != ozero_ninf); lean_assert(ozero_ninf * i1 == ozero_ninf); lean_assert(i1 * ozero_ninf == ozero_ninf); lean_assert(ozero_ninf * i1 == ozero_ninf);
lean_assert(i1 * ozero_pinf != ozero_pinf); lean_assert(ozero_pinf * i1 == ozero_pinf); lean_assert(i1 * ozero_pinf == ozero_pinf); lean_assert(ozero_pinf * i1 == ozero_pinf);
lean_assert(i1 * czero_ninf == czero_ninf); lean_assert(czero_ninf * i1 == czero_ninf); lean_assert(i1 * czero_ninf == czero_ninf); lean_assert(czero_ninf * i1 == czero_ninf);
lean_assert(i1 * czero_pinf == czero_pinf); lean_assert(czero_pinf * i1 == czero_pinf); lean_assert(i1 * czero_pinf == czero_pinf); lean_assert(czero_pinf * i1 == czero_pinf);

9
src/util/numerics/mpq.h
View file

@ -71,38 +71,47 @@ public:
friend int cmp(mpq const & a, mpz const & b); friend int cmp(mpq const & a, mpz const & b);
friend int cmp(mpq const & a, unsigned b) { return mpq_cmp_ui(a.m_val, b, 1); } friend int cmp(mpq const & a, unsigned b) { return mpq_cmp_ui(a.m_val, b, 1); }
friend int cmp(mpq const & a, int b) { return mpq_cmp_si(a.m_val, b, 1); } friend int cmp(mpq const & a, int b) { return mpq_cmp_si(a.m_val, b, 1); }
friend int cmp(mpq const & a, double b) { return a.get_double() - b; }
friend bool operator<(mpq const & a, mpq const & b) { return cmp(a, b) < 0; } friend bool operator<(mpq const & a, mpq const & b) { return cmp(a, b) < 0; }
friend bool operator<(mpq const & a, mpz const & b) { return cmp(a, b) < 0; } friend bool operator<(mpq const & a, mpz const & b) { return cmp(a, b) < 0; }
friend bool operator<(mpq const & a, unsigned b) { return cmp(a, b) < 0; } friend bool operator<(mpq const & a, unsigned b) { return cmp(a, b) < 0; }
friend bool operator<(mpq const & a, int b) { return cmp(a, b) < 0; } friend bool operator<(mpq const & a, int b) { return cmp(a, b) < 0; }
friend bool operator<(mpq const & a, double b) { return cmp(a, b) < 0; }
friend bool operator<(mpz const & a, mpq const & b) { return cmp(b, a) > 0; } friend bool operator<(mpz const & a, mpq const & b) { return cmp(b, a) > 0; }
friend bool operator<(unsigned a, mpq const & b) { return cmp(b, a) > 0; } friend bool operator<(unsigned a, mpq const & b) { return cmp(b, a) > 0; }
friend bool operator<(int a, mpq const & b) { return cmp(b, a) > 0; } friend bool operator<(int a, mpq const & b) { return cmp(b, a) > 0; }
friend bool operator<(double a, mpq const & b) { return cmp(b, a) > 0; }
friend bool operator>(mpq const & a, mpq const & b) { return cmp(a, b) > 0; } friend bool operator>(mpq const & a, mpq const & b) { return cmp(a, b) > 0; }
friend bool operator>(mpq const & a, mpz const & b) { return cmp(a, b) > 0; } friend bool operator>(mpq const & a, mpz const & b) { return cmp(a, b) > 0; }
friend bool operator>(mpq const & a, unsigned b) { return cmp(a, b) > 0; } friend bool operator>(mpq const & a, unsigned b) { return cmp(a, b) > 0; }
friend bool operator>(mpq const & a, int b) { return cmp(a, b) > 0; } friend bool operator>(mpq const & a, int b) { return cmp(a, b) > 0; }
friend bool operator>(mpq const & a, double b) { return cmp(a, b) > 0; }
friend bool operator>(mpz const & a, mpq const & b) { return cmp(b, a) < 0; } friend bool operator>(mpz const & a, mpq const & b) { return cmp(b, a) < 0; }
friend bool operator>(unsigned a, mpq const & b) { return cmp(b, a) < 0; } friend bool operator>(unsigned a, mpq const & b) { return cmp(b, a) < 0; }
friend bool operator>(int a, mpq const & b) { return cmp(b, a) < 0; } friend bool operator>(int a, mpq const & b) { return cmp(b, a) < 0; }
friend bool operator>(double a, mpq const & b) { return cmp(b, a) < 0; }
friend bool operator<=(mpq const & a, mpq const & b) { return cmp(a, b) <= 0; } friend bool operator<=(mpq const & a, mpq const & b) { return cmp(a, b) <= 0; }
friend bool operator<=(mpq const & a, mpz const & b) { return cmp(a, b) <= 0; } friend bool operator<=(mpq const & a, mpz const & b) { return cmp(a, b) <= 0; }
friend bool operator<=(mpq const & a, unsigned b) { return cmp(a, b) <= 0; } friend bool operator<=(mpq const & a, unsigned b) { return cmp(a, b) <= 0; }
friend bool operator<=(mpq const & a, int b) { return cmp(a, b) <= 0; } friend bool operator<=(mpq const & a, int b) { return cmp(a, b) <= 0; }
friend bool operator<=(mpq const & a, double b) { return cmp(a, b) <= 0; }
friend bool operator<=(mpz const & a, mpq const & b) { return cmp(b, a) >= 0; } friend bool operator<=(mpz const & a, mpq const & b) { return cmp(b, a) >= 0; }
friend bool operator<=(unsigned a, mpq const & b) { return cmp(b, a) >= 0; } friend bool operator<=(unsigned a, mpq const & b) { return cmp(b, a) >= 0; }
friend bool operator<=(int a, mpq const & b) { return cmp(b, a) >= 0; } friend bool operator<=(int a, mpq const & b) { return cmp(b, a) >= 0; }
friend bool operator<=(double a, mpq const & b) { return cmp(b, a) >= 0; }
friend bool operator>=(mpq const & a, mpq const & b) { return cmp(a, b) >= 0; } friend bool operator>=(mpq const & a, mpq const & b) { return cmp(a, b) >= 0; }
friend bool operator>=(mpq const & a, mpz const & b) { return cmp(a, b) >= 0; } friend bool operator>=(mpq const & a, mpz const & b) { return cmp(a, b) >= 0; }
friend bool operator>=(mpq const & a, unsigned b) { return cmp(a, b) >= 0; } friend bool operator>=(mpq const & a, unsigned b) { return cmp(a, b) >= 0; }
friend bool operator>=(mpq const & a, int b) { return cmp(a, b) >= 0; } friend bool operator>=(mpq const & a, int b) { return cmp(a, b) >= 0; }
friend bool operator>=(mpq const & a, double b) { return cmp(a, b) >= 0; }
friend bool operator>=(mpz const & a, mpq const & b) { return cmp(b, a) <= 0; } friend bool operator>=(mpz const & a, mpq const & b) { return cmp(b, a) <= 0; }
friend bool operator>=(unsigned a, mpq const & b) { return cmp(b, a) <= 0; } friend bool operator>=(unsigned a, mpq const & b) { return cmp(b, a) <= 0; }
friend bool operator>=(int a, mpq const & b) { return cmp(b, a) <= 0; } friend bool operator>=(int a, mpq const & b) { return cmp(b, a) <= 0; }
friend bool operator>=(double a, mpq const & b) { return cmp(b, a) <= 0; }
friend bool operator==(mpq const & a, mpq const & b) { return mpq_equal(a.m_val, b.m_val) != 0; } friend bool operator==(mpq const & a, mpq const & b) { return mpq_equal(a.m_val, b.m_val) != 0; }
friend bool operator==(mpq const & a, mpz const & b) { return a.is_integer() && mpz_cmp(mpq_numref(a.m_val), zval(b)) == 0; } friend bool operator==(mpq const & a, mpz const & b) { return a.is_integer() && mpz_cmp(mpq_numref(a.m_val), zval(b)) == 0; }