git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This might help: divide an arbint by a uint64
[ipdf/code.git]
/
src
/
rational.h
diff --git
a/src/rational.h
b/src/rational.h
index
b3709ad
..
6269ef1
100644
(file)
--- a/
src/rational.h
+++ b/
src/rational.h
@@
-12,24
+12,31
@@
namespace IPDF
{
namespace IPDF
{
-/** Greatest Common Divisor - Euclid's algorithm **/
-
+/* Recursive version of GCD
template <class T>
T gcd(const T & a, const T & b)
{
template <class T>
T gcd(const T & a, const T & b)
{
- if (a == 1 || a == 0) return 1;
- if (b == 0) return a;
- if (b == a) return a;
+ Debug("Called on %li/%li", int64_t(a), int64_t(b));
+ if (a == T(1) || a == T(0)) return T(1);
+ if (b == T(0)) return a;
+ if (b == a)
+ {
+ Debug("Equal!");
+ return a;
+ }
+ Debug("Not equal!");
if (a > b) return gcd(a-b,b);
return gcd(a, b-a);
}
if (a > b) return gcd(a-b,b);
return gcd(a, b-a);
}
+*/
-/*
+/*
* Greatest Common Divisor of p and q **/
template <class T>
T gcd(const T & p, const T & q)
{
template <class T>
T gcd(const T & p, const T & q)
{
- Debug("p/q = %
+
+
T g(1);
T big(p);
T small(q);
T g(1);
T big(p);
T small(q);
@@
-38,24
+45,27
@@
T gcd(const T & p, const T & q)
big = q;
small = p;
}
big = q;
small = p;
}
- if (small ==
0
)
+ if (small ==
T(0)
)
return g;
return g;
- while ((g = big % small) >
0
)
+ while ((g = big % small) >
T(0)
)
{
{
+ //Debug("big = %li, small = %li", int64_t(big), int64_t(small));
big = small;
small = g;
big = small;
small = g;
+ //Debug("Loop %u", ++count);
}
return small;
}
return small;
-}
-*/
+}
+
+
template <class T = int64_t>
struct Rational
{
/** Construct from a double.**/
template <class T = int64_t>
struct Rational
{
/** Construct from a double.**/
- Rational(double d
= 0) : P(d*1e3), Q(1e3
) // Possibly the worst thing ever...
+ Rational(double d
=0) : P(d*1e6), Q(1e6
) // Possibly the worst thing ever...
{
Simplify();
{
Simplify();
-
//
CheckAccuracy(d, "Construct from double");
+ CheckAccuracy(d, "Construct from double");
}
Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
}
Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
@@
-70,13
+80,18
@@
struct Rational
void Simplify()
{
void Simplify()
{
- if (Q <
0
)
+ if (Q <
T(0)
)
{
{
- P =
(P < 0) ? -P :
P;
+ P =
-
P;
Q = -Q;
}
Q = -Q;
}
-
- T g = gcd(llabs(P),llabs(Q));
+ if (P == T(0))
+ {
+ Q = T(1);
+ return;
+ }
+ T g = gcd(T(llabs(P)),T(llabs(Q)));
+ Debug("Got gcd!");
P /= g;
Q /= g;
}
P /= g;
Q /= g;
}
@@
-94,22
+109,18
@@
struct Rational
bool operator>=(const Rational & r) const {return *this == r || *this > r;}
bool operator!=(const Rational & r) const {return !(*this == r);}
bool operator>=(const Rational & r) const {return *this == r || *this > r;}
bool operator!=(const Rational & r) const {return !(*this == r);}
-
-
- /*
Rational operator+(const Rational & r) const
{
Rational operator+(const Rational & r) const
{
- Rational result = (r.P ==
0
) ? Rational(P,Q) : Rational(P*r.Q + r.P*Q, Q*r.Q);
+ Rational result = (r.P ==
T(0)
) ? Rational(P,Q) : Rational(P*r.Q + r.P*Q, Q*r.Q);
result.CheckAccuracy(ToDouble() + r.ToDouble(),"+");
return result;
}
Rational operator-(const Rational & r) const
{
result.CheckAccuracy(ToDouble() + r.ToDouble(),"+");
return result;
}
Rational operator-(const Rational & r) const
{
- Rational result = (r.P ==
0
) ? Rational(P,Q) : Rational(P*r.Q - r.P*Q, Q*r.Q);
+ Rational result = (r.P ==
T(0)
) ? Rational(P,Q) : Rational(P*r.Q - r.P*Q, Q*r.Q);
result.CheckAccuracy(ToDouble() - r.ToDouble(),"-");
return result;
}
result.CheckAccuracy(ToDouble() - r.ToDouble(),"-");
return result;
}
- */
Rational operator*(const Rational & r) const
{
Rational result(P * r.P, Q * r.Q);
Rational operator*(const Rational & r) const
{
Rational result(P * r.P, Q * r.Q);
@@
-121,16
+132,17
@@
struct Rational
}
Rational operator/(const Rational & r) const
{
}
Rational operator/(const Rational & r) const
{
- Rational result
= (r.P == 0) ? Rational(P,Q) : Rational(P*r.Q + r.P*Q, Q*r.Q
);
- if (!result.CheckAccuracy(ToDouble() / r.ToDouble(),"
*
"))
+ Rational result
(P * r.Q, Q*r.P
);
+ if (!result.CheckAccuracy(ToDouble() / r.ToDouble(),"
/
"))
{
Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
}
return result;
}
{
Debug("This is %s (%f) and r is %s (%f)", Str().c_str(), ToDouble(), r.Str().c_str(), r.ToDouble());
}
return result;
}
- Rational operator+(const Rational & r) const {return Rational(ToDouble()+r.ToDouble());}
- Rational operator-(const Rational & r) const {return Rational(ToDouble()-r.ToDouble());}
+ /** To cheat, use these **/
+ //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) const {return Rational(ToDouble()*r.ToDouble());}
//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) const {return Rational(ToDouble()/r.ToDouble());}
@@
-141,7
+153,7
@@
struct Rational
Rational & operator/=(const Rational & r) {this->operator=(*this/r); return *this;}
double ToDouble() const {return (double)(P) / (double)(Q);}
Rational & operator/=(const Rational & r) {this->operator=(*this/r); return *this;}
double ToDouble() const {return (double)(P) / (double)(Q);}
- bool CheckAccuracy(double d, const char * msg, double threshold = 1e-
6
) const
+ bool CheckAccuracy(double d, const char * msg, double threshold = 1e-
3
) const
{
double result = fabs(ToDouble() - d) / d;
if (result > threshold)
{
double result = fabs(ToDouble() - d) / d;
if (result > threshold)
@@
-171,6
+183,7
@@
inline Rational<int64_t> pow(const Rational<int64_t> & a, const Rational<int64_t
}
}
+
}
#endif //_RATIONAL_H
}
#endif //_RATIONAL_H
UCC
git Repository :: git.ucc.asn.au