2003 -> 2004

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

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 4160af814d87b8eac8c34d64fbe4ff552b907d88..4c4b0a3891dbfeb74146715c466d94c22161edfd 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,58 +3,78 @@
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
-#if PARANOIA
-#ifndef Rational
-#define Rational MyRational
-#endif
-#endif
-
 #include "compare.hh"
 #include "arithmetic-operator.hh"
-#include "fproto.hh"
+#include "flower-proto.hh"
+#include "string.hh"
 
+
+/**
+   Rational numbers.  Included is support for + and - infinity.
+ */
 class Rational {
+  /**
+     Sign of rational.
+     -2, .. 2
+
+     -2,2 is - and + infinity.
+     -1,1 is negative and positive.
+     0 if *this is zero.
+   */
   int sign_;
   unsigned int num_, den_;
   void normalise ();
   void copy (Rational const &);
+
 public:
   void set_infinite (int sign);
-  bool infty_b () const;
+  bool is_infinity () const;
   void invert ();
-  int num  () const { return sign_ * num_; }
-  int den  () const { return den_; }
-  Rational truncated () const;
+  int num () const { return sign_ * num_; }
+  int den () const { return den_; }
+
+  Rational trunc_rat () const;
+  Rational div_rat (Rational) const;
+  Rational mod_rat (Rational) const;
   void negate ();
-  operator bool () const;
-  operator String () const;
+  //   operator bool () const;
+  int to_int () const;
+  operator double () const;
   Rational operator - () const;
+  /**
+     Initialize to 0. 
+   */
   Rational ();
-  Rational (int, int =1);
+  Rational (int);
+  Rational (int, int);
   Rational (double);
-  Rational (Rational const&);
+  Rational (Rational const&r) {   copy (r);}
+  Rational &operator = (Rational const &r) {
+    copy (r); return *this;
+  }
 
-  Rational &operator = (Rational const &);
   Rational &operator *= (Rational);
-  Rational  &operator /= (Rational);  
-  Rational  &operator += (Rational);
-  Rational  &operator -= (Rational);
+  Rational &operator /= (Rational);  
+  Rational &operator += (Rational);
+  Rational &operator -= (Rational);
+  Rational &operator %= (Rational);
   static int compare (Rational const&, Rational const&);
   int sign () const;
-  String str () const;
+  String to_string () const;
 };
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, / );
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, + );
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, * );
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, - );
+IMPLEMENT_ARITHMETIC_OPERATOR (Rational, % );
 
 INSTANTIATE_COMPARE (Rational const&, Rational::compare);
 
@@ -69,8 +89,11 @@ Rational::copy (Rational const&r)
   den_ = r.den_;
 }
 
-class ostream;
+#if 0
 ostream &
 operator << (ostream &,  Rational);
+#endif
+
+const Rational infinity_rat = INT_MAX;
 
 #endif // RATIONAL_HH