Merge master into nested-bookparts

[lilypond.git] / flower / rational.cc

diff --git a/flower/rational.cc b/flower/rational.cc
index 6822703256a410433e3235c4fa263b389357a08a..ff32704f85eb0bd7167ae1b83327fb8ea07bca7f 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rational.hh"
@@ -16,7 +16,8 @@ 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_;
@@ -49,7 +50,9 @@ Rational::abs () const
 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 ()
@@ -58,7 +61,7 @@ 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);
@@ -66,6 +69,20 @@ Rational::Rational (int n, int d)
   normalize ();
 }
 
+Rational::Rational (I64 n)
+{
+  sign_ = ::sign (n);
+  num_ = ::abs (n);
+  den_ = 1;
+}
+
+Rational::Rational (U64 n)
+{
+  sign_ = 1;
+  num_ = n;
+  den_ = 1;
+}
+
 Rational::Rational (int n)
 {
   sign_ = ::sign (n);
@@ -78,6 +95,7 @@ void
 Rational::set_infinite (int s)
 {
   sign_ = ::sign (s) * 2;
+  num_ = 1;
 }
 
 Rational
@@ -108,18 +126,18 @@ Rational::mod_rat (Rational div) const
 /*
   copy & paste from scm_gcd (GUILE).
  */
-static int
-gcd (long u, long v) 
+static I64
+gcd (I64 u, I64 v)
 {
-  long result = 0;
+  I64 result = 0;
   if (u == 0)
     result = v;
   else if (v == 0)
     result = u;
   else
     {
-      long k = 1;
-      long t;
+      I64 k = 1;
+      I64 t;
       /* Determine a common factor 2^k */
       while (!(1 & (u | v)))
        {
@@ -172,7 +190,7 @@ Rational::normalize ()
     }
   else
     {
-      int g = gcd (num_, den_);
+      I64 g = gcd (num_, den_);
 
       num_ /= g;
       den_ /= g;
@@ -195,7 +213,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
@@ -220,9 +238,9 @@ 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);
@@ -254,8 +272,8 @@ Rational::Rational (double x)
        easily.
       */
 
-      num_ = (unsigned int) (mantissa * FACT);
-      den_ = (unsigned int) FACT;
+      num_ = (U64) (mantissa * FACT);
+      den_ = (U64) FACT;
       normalize ();
       if (expt < 0)
        den_ <<= -expt;
@@ -275,7 +293,7 @@ Rational::Rational (double x)
 void
 Rational::invert ()
 {
-  int r (num_);
+  I64 r (num_);
   num_ = den_;
   den_ = r;
 }