Add quadtree back to the Makefile

[ipdf/code.git] / src / rational.h

diff --git a/src/rational.h b/src/rational.h
index bbd4c30..0fa5d99 100644 (file)
--- a/src/rational.h
+++ b/src/rational.h
@@ -10,6 +10,8 @@
 #include <cassert>
 #include "arbint.h"
 #include "gmpint.h"
 #include <cassert>
 #include "arbint.h"
 #include "gmpint.h"

+#include <climits>
+#include <values.h>

 
 namespace IPDF
 {
 
 namespace IPDF
 {


@@ -21,6 +23,7 @@ template <class T> T Tabs(const T & a)
 template <> Arbint Tabs(const Arbint & a);
 template <> Gmpint Tabs(const Gmpint & a);
 
 template <> Arbint Tabs(const Arbint & a);
 template <> Gmpint Tabs(const Gmpint & a);
 

+

 /* Recursive version  of GCD
 template <class T>
 T gcd(const T & a, const T & b)
 /* Recursive version  of GCD
 template <class T>
 T gcd(const T & a, const T & b)


@@ -75,6 +78,8 @@ struct Rational
        {
                Simplify();
        }
        {
                Simplify();
        }

+       
+

 
        Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
        {
 
        Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
        {


@@ -168,10 +173,25 @@ struct Rational
        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 & 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 
        {
 
        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
        {
        }
        bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
        {


@@ -197,8 +217,11 @@ struct Rational
 };
 
 
 };
 
 

-
-
+template <class P>
+Rational<P> Abs(const Rational<P> & a)
+{
+       return Rational<P>(Tabs(a.P), a.Q);
+}

 
 }
 
 
 }