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
now with fewer midnight-isms
[ipdf/code.git]
/
src
/
rational.h
diff --git
a/src/rational.h
b/src/rational.h
index
41cce09
..
6269ef1
100644
(file)
--- a/
src/rational.h
+++ b/
src/rational.h
@@
-16,9
+16,15
@@
namespace IPDF
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);
@@
-29,6
+35,8
@@
T gcd(const T & a, const T & b)
template <class T>
T gcd(const T & p, const T & q)
{
template <class T>
T gcd(const T & p, const T & q)
{
+
+
T g(1);
T big(p);
T small(q);
T g(1);
T big(p);
T small(q);
@@
-37,15
+45,18
@@
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
template <class T = int64_t>
struct Rational
@@
-69,17
+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;
}
- if (P ==
0
)
+ if (P ==
T(0)
)
{
{
- Q =
1
;
+ Q =
T(1)
;
return;
}
return;
}
- T g = gcd(llabs(P),llabs(Q));
+ T g = gcd(T(llabs(P)),T(llabs(Q)));
+ Debug("Got gcd!");
P /= g;
Q /= g;
}
P /= g;
Q /= g;
}
@@
-99,13
+111,13
@@
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);
+ 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;
}
@@
-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