X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=0fa5d9910f3b7fa8136717bc971c5a7b6f23487a;hp=61a38ab76e305edf9caf45cb0eece53f57d06165;hb=888817a67a9d840be66b52811b01eb77f10ff3e6;hpb=b02dcbab39b8c28b9baa41436842ca9fe4ae7ffd diff --git a/src/rational.h b/src/rational.h index 61a38ab..0fa5d99 100644 --- a/src/rational.h +++ b/src/rational.h @@ -9,6 +9,9 @@ #include #include #include "arbint.h" +#include "gmpint.h" +#include +#include namespace IPDF { @@ -18,6 +21,7 @@ template T Tabs(const T & a) return abs(a); } template <> Arbint Tabs(const Arbint & a); +template <> Gmpint Tabs(const Gmpint & a); /* Recursive version of GCD @@ -74,6 +78,8 @@ struct Rational { Simplify(); } + + Rational(const T & _P, const T & _Q) : P(_P), Q(_Q) { @@ -161,16 +167,31 @@ struct Rational //Rational operator*(const Rational & r) const {return Rational(ToDouble()*r.ToDouble());} //Rational operator/(const Rational & r) const {return Rational(ToDouble()/r.ToDouble());} - Rational operator-() const {Rational r(*this); r.P = -r.P;} + Rational operator-() const {Rational r(*this); r.P = -r.P; return r;} Rational & operator=(const Rational & r) {P = r.P; Q = r.Q; Simplify(); return *this;} Rational & operator+=(const Rational & r) {this->operator=(*this+r); return *this;} Rational & operator-=(const Rational & r) {this->operator=(*this-r); return *this;} Rational & operator*=(const Rational & r) {this->operator=(*this*r); return *this;} Rational & operator/=(const Rational & r) {this->operator=(*this/r); return *this;} + Rational Sqrt() const + { + return Rational(sqrt(ToDouble())); + } + + int64_t ToInt64() const + { + return (int64_t)ToDouble(); + } double ToDouble() const { - return (double)P/(double)Q; + T num = P, denom = Q; + while (Tabs(num) > T(1e10)) + { + num /= T(16); + denom /= T(16); + } + return ((double)(num))/((double)(denom)); } bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const { @@ -195,17 +216,13 @@ struct Rational T Q; }; -inline Rational pow(const Rational & a, const Rational & b) + +template +Rational

Abs(const Rational

& a) { - //TODO:Implement properly - int64_t P = std::pow((double)a.P, b.ToDouble()); - int64_t Q = std::pow((double)a.Q, b.ToDouble()); - return Rational(P, Q); + return Rational

(Tabs(a.P), a.Q); } - - - } #endif //_RATIONAL_H