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
Improved "realops" tester
[ipdf/code.git]
/
src
/
rational.h
diff --git
a/src/rational.h
b/src/rational.h
index
6269ef1
..
e74567d
100644
(file)
--- a/
src/rational.h
+++ b/
src/rational.h
@@
-8,9
+8,17
@@
#include "common.h"
#include <cmath>
#include <cassert>
#include "common.h"
#include <cmath>
#include <cassert>
+#include "arbint.h"
namespace IPDF
{
namespace IPDF
{
+
+template <class T> T Tabs(const T & a)
+{
+ return llabs(a);
+}
+
+
/* Recursive version of GCD
template <class T>
/* Recursive version of GCD
template <class T>
@@
-65,7
+73,10
@@
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();
- CheckAccuracy(d, "Construct from double");
+ //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)
@@
-90,8
+101,8
@@
struct Rational
Q = T(1);
return;
}
Q = T(1);
return;
}
- T g = gcd(T
(llabs(P)),T(llabs(Q)
));
- Debug("Got gcd!");
+ T g = gcd(T
abs(P), Tabs(Q
));
+
//
Debug("Got gcd!");
P /= g;
Q /= g;
}
P /= g;
Q /= g;
}
@@
-112,7
+123,10
@@
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(),"+");
+ //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;
}
Rational operator-(const Rational & r) const
return result;
}
Rational operator-(const Rational & r) const
@@
-124,19
+138,19
@@
struct Rational
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);
- 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());
- }
+
//
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;
}
Rational operator/(const Rational & r) const
{
Rational result(P * r.Q, Q*r.P);
return result;
}
Rational operator/(const Rational & r) const
{
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());
- }
+
//
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;
}
return result;
}
@@
-155,10
+169,12
@@
struct Rational
double ToDouble() const {return (double)(P) / (double)(Q);}
bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
{
double ToDouble() const {return (double)(P) / (double)(Q);}
bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
{
- double result = fabs(ToDouble() - d) / d;
+ double result = fabs(ToDouble() - d);
+ if (d != 0e0) result /= d;
if (result > threshold)
{
Warn("(%s) : Rational %s (%f) is not close enough at representing %f (%f vs %f)", msg, Str().c_str(), ToDouble(), d, result, threshold);
if (result > threshold)
{
Warn("(%s) : Rational %s (%f) is not close enough at representing %f (%f vs %f)", msg, Str().c_str(), ToDouble(), d, result, threshold);
+ Backtrace();
return false;
}
return true;
return false;
}
return true;
@@
-166,7
+182,7
@@
struct Rational
std::string Str() const
{
std::stringstream s;
std::string Str() const
{
std::stringstream s;
- s <<
(int64_t)P << "/" << (int64_t)Q
;
+ s <<
int64_t(P) << "/" << int64_t(Q)
;
return s.str();
}
return s.str();
}
@@
-184,6
+200,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