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
Nope.avi
[ipdf/code.git]
/
src
/
rational.h
diff --git
a/src/rational.h
b/src/rational.h
index
e74567d
..
0fa5d99
100644
(file)
--- a/
src/rational.h
+++ b/
src/rational.h
@@
-9,15
+9,19
@@
#include <cmath>
#include <cassert>
#include "arbint.h"
#include <cmath>
#include <cassert>
#include "arbint.h"
+#include "gmpint.h"
+#include <climits>
+#include <values.h>
namespace IPDF
{
template <class T> T Tabs(const T & a)
{
namespace IPDF
{
template <class T> T Tabs(const T & a)
{
- return
ll
abs(a);
+ return abs(a);
}
}
-
+template <> Arbint Tabs(const Arbint & a);
+template <> Gmpint Tabs(const Gmpint & a);
/* Recursive version of GCD
/* Recursive version of GCD
@@
-73,11
+77,9
@@
struct Rational
Rational(double d=0) : P(d*1e6), Q(1e6) // Possibly the worst thing ever...
{
Simplify();
Rational(double d=0) : P(d*1e6), Q(1e6) // Possibly the worst thing ever...
{
Simplify();
- //if (!CheckAccuracy(d, "Construct from double"))
- {
- //Fatal("Bwah bwah :(");
- }
}
}
+
+
Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
{
Rational(const T & _P, const T & _Q) : P(_P), Q(_Q)
{
@@
-101,6
+103,11
@@
struct Rational
Q = T(1);
return;
}
Q = T(1);
return;
}
+ if (P == Q)
+ {
+ P = Q = T(1);
+ return;
+ }
T g = gcd(Tabs(P), Tabs(Q));
//Debug("Got gcd!");
P /= g;
T g = gcd(Tabs(P), Tabs(Q));
//Debug("Got gcd!");
P /= g;
@@
-132,7
+139,7
@@
struct Rational
Rational operator-(const Rational & r) const
{
Rational result = (r.P == T(0)) ? Rational(P,Q) : Rational(P*r.Q - r.P*Q, Q*r.Q);
Rational operator-(const Rational & r) const
{
Rational result = (r.P == T(0)) ? Rational(P,Q) : Rational(P*r.Q - r.P*Q, Q*r.Q);
- result.CheckAccuracy(ToDouble() - r.ToDouble(),"-");
+
//
result.CheckAccuracy(ToDouble() - r.ToDouble(),"-");
return result;
}
Rational operator*(const Rational & r) const
return result;
}
Rational operator*(const Rational & r) const
@@
-160,13
+167,32
@@
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) const {return Rational(ToDouble()*r.ToDouble());}
//Rational operator/(const Rational & r) const {return Rational(ToDouble()/r.ToDouble());}
- Rational & operator=(const Rational & r) {P = r.P; Q = r.Q; return *this;}
+ 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 & 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()));
+ }
- double ToDouble() const {return (double)(P) / (double)(Q);}
+ int64_t ToInt64() const
+ {
+ return (int64_t)ToDouble();
+ }
+
+ double ToDouble() const
+ {
+ 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
{
double result = fabs(ToDouble() - d);
bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
{
double result = fabs(ToDouble() - d);
@@
-190,17
+216,13
@@
struct Rational
T Q;
};
T Q;
};
-inline Rational<int64_t> pow(const Rational<int64_t> & a, const Rational<int64_t> & b)
+
+template <class P>
+Rational<P> Abs(const Rational<P> & 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<int64_t>(P, Q);
+ return Rational<P>(Tabs(a.P), a.Q);
}
}
-
-
-
}
#endif //_RATIONAL_H
}
#endif //_RATIONAL_H
UCC
git Repository :: git.ucc.asn.au