X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;h=b01950533ad6810653c724f8924f68d4f982690c;hp=6bc5aec2edd6ec7edeffef62e64915c8e38b2306;hb=da646c739f87bf28c5a7af2bc180b93b3444321b;hpb=e8e6ff92ef0978cbec24dd69a85dbf1bd81681ad diff --git a/src/rational.h b/src/rational.h index 6bc5aec..b019505 100644 --- a/src/rational.h +++ b/src/rational.h @@ -10,6 +10,8 @@ #include #include "arbint.h" #include "gmpint.h" +#include +#include namespace IPDF { @@ -162,7 +164,7 @@ 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;} @@ -171,7 +173,13 @@ struct Rational double ToDouble() const { - return (double)P/(double)Q; + T num = P, denom = Q; + while (Tabs(num) > T(DBL_MAX)) + { + num /= T(16); + denom /= T(16); + } + return ((double)(num))/((double)(denom)); } bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const { @@ -196,13 +204,6 @@ struct Rational T Q; }; -inline Rational pow(const Rational & a, const Rational & b) -{ - //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); -}