*** empty log message ***

[lilypond.git] / flower / rational.cc

diff --git a/flower/rational.cc b/flower/rational.cc
index 11aaf1e23b6ce457df53985ca52e62e7143d7708..888a82ae9de452c6a398a027f0171836851b7368 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -3,12 +3,14 @@
   
   source file of the Flower Library
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <math.h>
-#include <stdlib.h>
+
 #include "rational.hh"
-#include "string.hh"
+
+#include <cmath>
+#include <cstdlib>
+
 #include "string-convert.hh"  
 #include "libc-extension.hh"
 
@@ -17,12 +19,15 @@ 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::trunc_rat () const
@@ -51,7 +56,7 @@ Rational::Rational (int n)
   den_= 1;
 }
 
-static
+static inline
 int gcd (int a, int b)
 {
   int t;
@@ -63,11 +68,6 @@ int gcd (int a, int b)
   return b;
 }
 
-static
-int lcm (int a, int b)
-{
-  return abs (a*b / gcd (a,b));
-}
 
 void
 Rational::set_infinite (int s)
@@ -138,18 +138,13 @@ 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;
   else if (r.sign_ == 0)
     return 0;
   else
     {
-      /*
-       TODO: fix this code; (r-s).sign() is too expensive.
-       
-       return r.sign_ * ::sign  (r.num_ * s.den_ - s.num_ * r.den_);
-      */
-      return (r - s).sign ();
+      return r.sign_ * ::sign  (int (r.num_ * s.den_) - int (s.num_ * r.den_));
     }
 }
 
@@ -169,9 +164,9 @@ Rational::operator %= (Rational r)
 Rational &
 Rational::operator += (Rational r)
 {
-  if (infty_b ())
+  if (is_infinity ())
     ;
-  else if (r.infty_b ())
+  else if (r.is_infinity ())
     {
       *this = r;
     }
@@ -242,7 +237,7 @@ Rational &
 Rational::operator *= (Rational r)
 {
   sign_ *= ::sign (r.sign_);
-  if (r.infty_b ())
+  if (r.is_infinity ())
     {  
       sign_ = sign () * 2;
       goto exit_func;
@@ -276,27 +271,18 @@ Rational::operator -= (Rational r)
   return (*this += r);
 }
 
-/*
-  be paranoid about overiding libg++ stuff
- */
-Rational &
-Rational::operator = (Rational const &r)
-{
-  copy (r);
-  return *this;
-}
-
 String
-Rational::str () const
+Rational::to_string () const
 {
-  if (infty_b ())
+  if (is_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;
 }
 
@@ -311,3 +297,9 @@ sign (Rational r)
 {
   return r.sign ();
 }
+
+bool
+Rational::is_infinity () const
+{
+  return sign_ == 2 || sign_ == -2;
+}