X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Frational.cc;h=a6f82d826e9185fdbab3250388d667d1cce46167;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b82a35e6677246d68cc6806dca4ea14d4280f945;hpb=f16ae90a5a8a756b6a341f78c432c8919d6ade8f;p=lilypond.git diff --git a/flower/rational.cc b/flower/rational.cc index b82a35e667..a6f82d826e 100644 --- a/flower/rational.cc +++ b/flower/rational.cc @@ -1,9 +1,20 @@ /* - rational.cc -- implement Rational + This file is part of LilyPond, the GNU music typesetter. - source file of the Flower Library + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2006 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "rational.hh" @@ -16,10 +27,11 @@ using namespace std; #include "string-convert.hh" #include "libc-extension.hh" -Rational::operator double () const +double +Rational::to_double () const { if (sign_ == -1 || sign_ == 1 || sign_ == 0) - return ((double)sign_) * num_ / den_; + return (double)sign_ * (double)num_ / (double)den_; if (sign_ == -2) return -HUGE_VAL; else if (sign_ == 2) @@ -30,11 +42,6 @@ Rational::operator double () const return 0.0; } -Rational::operator bool () const -{ - return sign_ && num_; -} - #ifdef STREAM_SUPPORT ostream & operator << (ostream &o, Rational r) @@ -44,10 +51,18 @@ operator << (ostream &o, Rational r) } #endif +Rational +Rational::abs () const +{ + return Rational (num_, den_); +} + Rational Rational::trunc_rat () const { - return Rational (num_ - (num_ % den_), den_); + if (is_infinity ()) + return *this; + return Rational ((num_ - (num_ % den_)) * sign_, den_); } Rational::Rational () @@ -56,37 +71,40 @@ Rational::Rational () num_ = den_ = 1; } -Rational::Rational (int n, int d) +Rational::Rational (I64 n, I64 d) { sign_ = ::sign (n) * ::sign (d); - num_ = abs (n); - den_ = abs (d); - normalise (); + num_ = ::abs (n); + den_ = ::abs (d); + normalize (); } -Rational::Rational (int n) +Rational::Rational (I64 n) { sign_ = ::sign (n); - num_ = abs (n); + num_ = ::abs (n); den_ = 1; } -static inline -int gcd (int a, int b) +Rational::Rational (U64 n) { - int t; - while ((t = a % b)) - { - a = b; - b = t; - } - return b; + sign_ = 1; + num_ = n; + den_ = 1; +} + +Rational::Rational (int n) +{ + sign_ = ::sign (n); + num_ = ::abs (n); + den_ = 1; } void Rational::set_infinite (int s) { sign_ = ::sign (s) * 2; + num_ = 1; } Rational @@ -113,8 +131,54 @@ Rational::mod_rat (Rational div) const return r; } +/* + copy & paste from scm_gcd (GUILE). + */ +static I64 +gcd (I64 u, I64 v) +{ + I64 result = 0; + if (u == 0) + result = v; + else if (v == 0) + result = u; + else + { + I64 k = 1; + I64 t; + /* Determine a common factor 2^k */ + while (!(1 & (u | v))) + { + k <<= 1; + u >>= 1; + v >>= 1; + } + /* Now, any factor 2^n can be eliminated */ + if (u & 1) + t = -v; + else + { + t = u; +b3: + t = t >> 1; + } + if (!(1 & t)) + goto b3; + if (t > 0) + u = t; + else + v = -t; + t = u - v; + if (t != 0) + goto b3; + result = u * k; + } + + return result; +} + void -Rational::normalise () +Rational::normalize () { if (!sign_) { @@ -133,7 +197,7 @@ Rational::normalise () } else { - int g = gcd (num_, den_); + I64 g = gcd (num_, den_); num_ /= g; den_ /= g; @@ -156,7 +220,7 @@ Rational::compare (Rational const &r, Rational const &s) return 0; else if (r.sign_ == 0) return 0; - return r.sign_ * ::sign (int (r.num_ * s.den_) - int (s.num_ * r.den_)); + return r.sign_ * ::sign ((I64) (r.num_ * s.den_) - (I64) (s.num_ * r.den_)); } int @@ -181,13 +245,13 @@ Rational::operator += (Rational r) *this = r; else { - int lcm = (den_ / gcd (r.den_, den_)) * r.den_; - int n = sign_ * num_ * (lcm / den_) + r.sign_ * r.num_ * (lcm / r.den_); - int d = lcm; + I64 lcm = (den_ / gcd (r.den_, den_)) * r.den_; + I64 n = sign_ * num_ * (lcm / den_) + r.sign_ * r.num_ * (lcm / r.den_); + I64 d = lcm; sign_ = ::sign (n) * ::sign (d); - num_ = abs (n); - den_ = abs (d); - normalise (); + num_ = ::abs (n); + den_ = ::abs (d); + normalize (); } return *this; } @@ -208,35 +272,35 @@ Rational::Rational (double x) const int FACT = 1 << 20; /* - Thanks to Afie for this too simple idea. + Thanks to Afie for this too simple idea. - do not blindly substitute by libg++ code, since that uses - arbitrary-size integers. The rationals would overflow too - easily. + do not blindly substitute by libg++ code, since that uses + arbitrary-size integers. The rationals would overflow too + easily. */ - num_ = (unsigned int) (mantissa * FACT); - den_ = (unsigned int) FACT; - normalise (); + num_ = (U64) (mantissa * FACT); + den_ = (U64) FACT; + normalize (); if (expt < 0) - den_ <<= -expt; + den_ <<= -expt; else - num_ <<= expt; - normalise (); + num_ <<= expt; + normalize (); } else { num_ = 0; den_ = 1; sign_ = 0; - normalise (); + normalize (); } } void Rational::invert () { - int r (num_); + I64 r (num_); num_ = den_; den_ = r; } @@ -254,8 +318,8 @@ Rational::operator *= (Rational r) num_ *= r.num_; den_ *= r.den_; - normalise (); - exit_func: + normalize (); +exit_func: return *this; } @@ -297,7 +361,7 @@ Rational::to_string () const int Rational::to_int () const { - return (int) num () / den (); + return (int) (num () / den ()); } int