X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Frational.cc;h=7fe157c5429cf28b61799688cee71977d82e0197;hb=c1d5bb448321d688185e0c6b798575d4c325ae80;hp=cf99657acbfd6081f1bd0963c734594ece3fbf57;hpb=59ed0cee2aae58a3f0483f21261c68aee406fa10;p=lilypond.git diff --git a/flower/rational.cc b/flower/rational.cc index cf99657acb..7fe157c542 100644 --- a/flower/rational.cc +++ b/flower/rational.cc @@ -1,42 +1,69 @@ /* - rational.cc -- implement Rational - - source file of the Flower Library + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--1998 Han-Wen Nienhuys + Copyright (C) 1997--2011 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 + #include "rational.hh" -#include "string.hh" -#include "string-convert.hh" + +#include +#include +#include +using namespace std; + +#include "string-convert.hh" #include "libc-extension.hh" -Rational::operator bool () const +double +Rational::to_double () const { - return sign_; -} + if (sign_ == -1 || sign_ == 1 || sign_ == 0) + return (double)sign_ * (double)num_ / (double)den_; + if (sign_ == -2) + return -HUGE_VAL; + else if (sign_ == 2) + return HUGE_VAL; + else + assert (false); -Rational::operator int () const -{ - return sign_ * num_ / den_; + return 0.0; } -Rational::operator double () const -{ - return (double)sign_ * num_ / den_; -} +#ifdef STREAM_SUPPORT ostream & operator << (ostream &o, Rational r) { - o << r.str (); + o << r.string (); return o; } +#endif Rational -Rational::truncated () const +Rational::abs () const { - return Rational(num_ - (num_ % den_), den_); + return Rational (num_, den_); +} + +Rational +Rational::trunc_rat () const +{ + if (is_infinity()) + return *this; + return Rational ((num_ - (num_ % den_)) * sign_, den_); } Rational::Rational () @@ -45,83 +72,147 @@ 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 (Rational const &r) +Rational::Rational (I64 n) { - copy (r); + sign_ = ::sign (n); + num_ = ::abs (n); + den_ = 1; } -static -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; } -static -int lcm (int a, int b) +Rational::Rational (int n) { - return abs (a*b / gcd (a,b)); + sign_ = ::sign (n); + num_ = ::abs (n); + den_ = 1; } + void Rational::set_infinite (int s) { - sign_ = ::sign (s) * 2; + sign_ = ::sign (s) * 2; + num_ = 1; } Rational Rational::operator - () const { - Rational r(*this); + Rational r (*this); r.negate (); return r; } +Rational +Rational::div_rat (Rational div) const +{ + Rational r (*this); + r /= div; + return r.trunc_rat (); +} + +Rational +Rational::mod_rat (Rational div) const +{ + Rational r (*this); + r = (r / div - r.div_rat (div)) * div; + 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_) { den_ = 1; num_ = 0; - return ; } - if (!den_) - sign_ = 2; - if (!num_) - sign_ = 0; - - int g = gcd (num_ , den_); + else if (!den_) + { + sign_ = 2; + num_ = 1; + } + else if (!num_) + { + sign_ = 0; + den_ = 1; + } + else + { + I64 g = gcd (num_, den_); - num_ /= g; - den_ /= g; + num_ /= g; + den_ /= g; + } } - int Rational::sign () const { return ::sign (sign_); } -bool -Rational::infty_b () const -{ - return abs (sign_) > 1; -} - int Rational::compare (Rational const &r, Rational const &s) { @@ -129,44 +220,50 @@ Rational::compare (Rational const &r, Rational const &s) return -1; else if (r.sign_ > s.sign_) return 1; - else if (r.infty_b ()) + else if (r.is_infinity ()) return 0; - - return (r - s).sign (); + else if (r.sign_ == 0) + return 0; + return r.sign_ * ::sign ((I64) (r.num_ * s.den_) - (I64) (s.num_ * r.den_)); } int compare (Rational const &r, Rational const &s) { - return Rational::compare (r, s ); + return Rational::compare (r, s); +} + +Rational & +Rational::operator %= (Rational r) +{ + *this = mod_rat (r); + return *this; } Rational & Rational::operator += (Rational r) { - if (infty_b ()) + if (is_infinity ()) ; - else if (r.infty_b ()) - { - *this = r; - } - else + else if (r.is_infinity ()) + *this = r; + else { - int n = sign_ * num_ *r.den_ + r.sign_ * den_ * r.num_; - int d = den_ * r.den_; - sign_ = ::sign (n) * ::sign(d); - num_ = abs (n); - den_ = abs (d); - normalise (); + 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); + normalize (); } return *this; } - /* copied from libg++ 2.8.0 - */ -Rational::Rational(double x) +*/ +Rational::Rational (double x) { if (x != 0.0) { @@ -174,37 +271,41 @@ Rational::Rational(double x) x *= sign_; int expt; - double mantissa = frexp(x, &expt); + double mantissa = frexp (x, &expt); const int FACT = 1 << 20; /* - FIXME - - SHOULD TEST THIS - - suck me gently with a vacuum cleaner. Thanks to Afie for this wierd idea. - */ - num_ = (unsigned int) (mantissa * FACT); - den_ = (unsigned int) FACT; - normalise (); - num_ <<= expt; + 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. + */ + + num_ = (U64) (mantissa * FACT); + den_ = (U64) FACT; + normalize (); + if (expt < 0) + den_ <<= -expt; + else + num_ <<= expt; + normalize (); } else { num_ = 0; den_ = 1; - sign_ =0; - normalise (); + sign_ = 0; + normalize (); } } - void Rational::invert () { - int r (num_); - num_ = den_; + I64 r (num_); + num_ = den_; den_ = r; } @@ -212,8 +313,8 @@ Rational & Rational::operator *= (Rational r) { sign_ *= ::sign (r.sign_); - if (r.infty_b ()) - { + if (r.is_infinity ()) + { sign_ = sign () * 2; goto exit_func; } @@ -221,11 +322,11 @@ Rational::operator *= (Rational r) num_ *= r.num_; den_ *= r.den_; - normalise (); + normalize (); exit_func: return *this; } - + Rational & Rational::operator /= (Rational r) { @@ -239,39 +340,42 @@ Rational::negate () sign_ *= -1; } -Rational& +Rational & Rational::operator -= (Rational r) { r.negate (); return (*this += r); } -/* - be paranoid about overiding libg++ stuff - */ -Rational & -Rational::operator = (Rational const &r) -{ - copy (r); - return *this; -} - -String -Rational::str () const +string +Rational::to_string () const { - if (infty_b ()) + if (is_infinity ()) { - String s (sign_ > 0 ? "" : "-" ); - return String (s + "infinity"); + string s (sign_ > 0 ? "" : "-"); + return string (s + "infinity"); } - String s = to_str (num ()); + + string s = ::to_string (num ()); if (den () != 1 && num ()) - s += "/" + to_str (den ()); + s += "/" + ::to_string (den ()); return s; } +int +Rational::to_int () const +{ + return (int)(num () / den ()); +} + int sign (Rational r) { return r.sign (); } + +bool +Rational::is_infinity () const +{ + return sign_ == 2 || sign_ == -2; +}