*** empty log message ***

[lilypond.git] / flower / include / rational.hh

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 5b4402f4c4b24cb3d605c2ddf481d96da0a64b30..8ac80fb1246a0b507f6d842a1d3d230e2f8b24fc 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,19 +3,15 @@
 
   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>
 */
 
 
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
-#include "compare.hh"
-#include "arithmetic-operator.hh"
-#include "flower-proto.hh"
 #include "string.hh"
 
-
 /**
    Rational numbers.  Included is support for + and - infinity.
  */
@@ -35,13 +31,12 @@ class Rational {
 
 public:
   void set_infinite (int sign);
-  bool infty_b () const
-    {
-      return sign_ == 2 || sign_ == -2;
-    }
+  bool is_infinity () const;
   void invert ();
-  int num () const { return sign_ * num_; }
-  int den () const { return den_; }
+  int numerator () const { return sign_ * num_; }
+  int denominator () const { return den_; }
+  int num () const { return numerator(); }
+  int den () const { return denominator(); }
 
   Rational trunc_rat () const;
   Rational div_rat (Rational) const;
@@ -70,7 +65,7 @@ public:
   Rational &operator %= (Rational);
   static int compare (Rational const&, Rational const&);
   int sign () const;
-  String str () const;
+  String to_string () const;
 };
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, / );