/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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)
return 0.0;
}
-
#ifdef STREAM_SUPPORT
ostream &
operator << (ostream &o, Rational r)
Rational
Rational::trunc_rat () const
{
- if (is_infinity())
+ if (is_infinity ())
return *this;
return Rational ((num_ - (num_ % den_)) * sign_, den_);
}
den_ = 1;
}
-
void
Rational::set_infinite (int s)
{
return r;
}
-
/*
copy & paste from scm_gcd (GUILE).
*/
I64 t;
/* Determine a common factor 2^k */
while (!(1 & (u | v)))
- {
- k <<= 1;
- u >>= 1;
- v >>= 1;
- }
+ {
+ k <<= 1;
+ u >>= 1;
+ v >>= 1;
+ }
/* Now, any factor 2^n can be eliminated */
if (u & 1)
- t = -v;
+ t = -v;
else
- {
- t = u;
- b3:
- t = t >> 1;
- }
+ {
+ t = u;
+b3:
+ t = t >> 1;
+ }
if (!(1 & t))
- goto b3;
+ goto b3;
if (t > 0)
- u = t;
+ u = t;
else
- v = -t;
+ v = -t;
t = u - v;
if (t != 0)
- goto b3;
+ goto b3;
result = u * k;
}
return result;
}
-
void
Rational::normalize ()
{
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_ = (U64) (mantissa * FACT);
den_ = (U64) FACT;
normalize ();
if (expt < 0)
- den_ <<= -expt;
+ den_ <<= -expt;
else
- num_ <<= expt;
+ num_ <<= expt;
normalize ();
}
else
den_ *= r.den_;
normalize ();
- exit_func:
+exit_func:
return *this;
}
int
Rational::to_int () const
{
- return (int) num () / den ();
+ return (int) (num () / den ());
}
int