Release: bump Welcome versions.

[lilypond.git] / flower / rational.cc

diff --git a/flower/rational.cc b/flower/rational.cc
index ff32704f85eb0bd7167ae1b83327fb8ea07bca7f..559e1646a0cade47b932d7cfab048f0feb641da8 100644 (file)
--- 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 <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #include "rational.hh"
@@ -20,7 +31,7 @@ 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)
@@ -31,7 +42,6 @@ Rational::to_double () const
   return 0.0;
 }
 
-
 #ifdef STREAM_SUPPORT
 ostream &
 operator << (ostream &o, Rational r)
@@ -50,7 +60,7 @@ Rational::abs () const
 Rational
 Rational::trunc_rat () const
 {
-  if (is_infinity())
+  if (is_infinity ())
     return *this;
   return Rational ((num_ - (num_ % den_)) * sign_, den_);
 }
@@ -90,7 +100,6 @@ Rational::Rational (int n)
   den_ = 1;
 }
 
-
 void
 Rational::set_infinite (int s)
 {
@@ -122,7 +131,6 @@ Rational::mod_rat (Rational div) const
   return r;
 }
 
-
 /*
   copy & paste from scm_gcd (GUILE).
  */
@@ -140,36 +148,35 @@ gcd (I64 u, I64 v)
       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 ()
 {
@@ -209,11 +216,11 @@ Rational::compare (Rational const &r, Rational const &s)
     return -1;
   else if (r.sign_ > s.sign_)
     return 1;
-  else if (r.is_infinity ())
+  else if (r.is_infinity ()) // here s is also infinite with the same sign
     return 0;
-  else if (r.sign_ == 0)
+  else if (r.sign_ == 0) // here s.sign_ is also zero
     return 0;
-  return r.sign_ * ::sign ((I64) (r.num_ * s.den_) - (I64) (s.num_ * r.den_));
+  return ::sign (r - s);
 }
 
 int
@@ -265,20 +272,20 @@ 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_ = (U64) (mantissa * FACT);
       den_ = (U64) FACT;
       normalize ();
       if (expt < 0)
-       den_ <<= -expt;
+        den_ <<= -expt;
       else
-       num_ <<= expt;
+        num_ <<= expt;
       normalize ();
     }
   else
@@ -312,7 +319,7 @@ Rational::operator *= (Rational r)
   den_ *= r.den_;
 
   normalize ();
- exit_func:
+exit_func:
   return *this;
 }
 
@@ -354,7 +361,7 @@ Rational::to_string () const
 int
 Rational::to_int () const
 {
-  return (int) num () / den ();
+  return (int) (num () / den ());
 }
 
 int