*** empty log message ***

[lilypond.git] / flower / rational.cc

diff --git a/flower/rational.cc b/flower/rational.cc
index 0b0e3d524fadbf003cf9538ed49b5acce9a07dc5..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"
 
@@ -54,7 +56,7 @@ Rational::Rational (int n)
   den_= 1;
 }
 
-static
+static inline
 int gcd (int a, int b)
 {
   int t;
@@ -66,13 +68,6 @@ int gcd (int a, int b)
   return b;
 }
 
-#if 0
-static
-int lcm (int a, int b)
-{
-  return abs (a*b / gcd (a,b));
-}
-#endif
 
 void
 Rational::set_infinite (int s)
@@ -143,7 +138,7 @@ 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;
@@ -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;
@@ -279,7 +274,7 @@ Rational::operator -= (Rational r)
 String
 Rational::to_string () const
 {
-  if (infty_b ())
+  if (is_infinity ())
     {
       String s (sign_ > 0 ? "" : "-" );
       return String (s + "infinity");
@@ -302,3 +297,9 @@ sign (Rational r)
 {
   return r.sign ();
 }
+
+bool
+Rational::is_infinity () const
+{
+  return sign_ == 2 || sign_ == -2;
+}