release: 1.3.0

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

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 3c15f76c4f5749c4d9f4e23cf770daac0d9d573f..b1187ec6924770f10b2c813609f42394782fa521 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,51 +3,66 @@
 
   source file of the Flower Library
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 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 "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;
   void invert ();
   int num  () const { return sign_ * num_; }
   int den  () const { return den_; }
-  Rational truncated () const;
+  int num_i  () const { return sign_ * num_; }
+  int den_i  () const { return den_; }
+  Rational trunc_rat () const;
+  Rational div_rat (Rational) const;
+  Rational mod_rat (Rational) const;
   void negate ();
   operator bool () const;
   operator int () const;
   operator double () const;
-  operator String () const;
   Rational operator - () const;
+  /**
+     Initialize to 0. 
+   */
   Rational ();
   Rational (int, int =1);
   Rational (double);
-  Rational (Rational const&);
+  Rational (Rational const&r) {   copy (r);}
 
   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;
@@ -57,6 +72,7 @@ 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);