X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frational.h;fp=src%2Frational.h;h=6269ef181c3c6ad7a7126ab17f743a077487448f;hp=ce1a7670557737d725de5fd3515da7eb4e1d87b5;hb=a7da45c62d5a0604785479f5dfeb1c2a65d0f9de;hpb=3ab3475a54c82cb9f5e0b1dbb88035f341b92d49 diff --git a/src/rational.h b/src/rational.h index ce1a767..6269ef1 100644 --- a/src/rational.h +++ b/src/rational.h @@ -16,9 +16,15 @@ namespace IPDF template 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); @@ -29,6 +35,8 @@ T gcd(const T & a, const T & b) template T gcd(const T & p, const T & q) { + + T g(1); T big(p); T small(q); @@ -41,11 +49,14 @@ T gcd(const T & p, const T & q) return g; while ((g = big % small) > T(0)) { + //Debug("big = %li, small = %li", int64_t(big), int64_t(small)); big = small; small = g; + //Debug("Loop %u", ++count); } return small; -} +} + template struct Rational @@ -80,6 +91,7 @@ struct Rational return; } T g = gcd(T(llabs(P)),T(llabs(Q))); + Debug("Got gcd!"); P /= g; Q /= g; }