source file of the Flower Library
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "rational.hh"
#include <cmath>
#include <cstdlib>
+using namespace std;
#include "string-convert.hh"
#include "libc-extension.hh"
Rational::operator double () const
{
- return (double)sign_ * num_ / den_;
+ return ((double)sign_) * num_ / den_;
+}
+
+Rational::operator bool () const
+{
+ return sign_ && num_;
}
#ifdef STREAM_SUPPORT
ostream &
-operator<< (ostream &o, Rational r)
+operator << (ostream &o, Rational r)
{
o << r.string ();
return o;
{
sign_ = ::sign (n);
num_ = abs (n);
- den_= 1;
+ den_ = 1;
}
static inline
}
Rational
-Rational::operator- () const
+Rational::operator - () const
{
Rational r (*this);
r.negate ();
return 0;
else if (r.sign_ == 0)
return 0;
- else
- {
- return r.sign_ * ::sign (int (r.num_ * s.den_) - int (s.num_ * r.den_));
- }
+ return r.sign_ * ::sign (int (r.num_ * s.den_) - int (s.num_ * r.den_));
}
int
}
Rational &
-Rational::operator%= (Rational r)
+Rational::operator %= (Rational r)
{
- *this = r.mod_rat (r);
+ *this = mod_rat (r);
return *this;
}
Rational &
-Rational::operator+= (Rational r)
+Rational::operator += (Rational r)
{
- if (is_infinity ());
+ if (is_infinity ())
+ ;
else if (r.is_infinity ())
- {
- *this = r;
- }
+ *this = r;
else
{
- int n = sign_ * num_ *r.den_ + r.sign_ * den_ * r.num_;
- int d = den_ * r.den_;
+ int lcm = (den_ / gcd (r.den_, den_)) * r.den_;
+ int n = sign_ * num_ * (lcm / den_) + r.sign_ * r.num_ * (lcm / r.den_);
+ int d = lcm;
sign_ = ::sign (n) * ::sign (d);
num_ = abs (n);
den_ = abs (d);
{
num_ = 0;
den_ = 1;
- sign_ =0;
+ sign_ = 0;
normalise ();
}
}
}
Rational &
-Rational::operator*= (Rational r)
+Rational::operator *= (Rational r)
{
sign_ *= ::sign (r.sign_);
if (r.is_infinity ())
}
Rational &
-Rational::operator/= (Rational r)
+Rational::operator /= (Rational r)
{
r.invert ();
return (*this *= r);
}
Rational &
-Rational::operator-= (Rational r)
+Rational::operator -= (Rational r)
{
r.negate ();
return (*this += r);
}
-String
+string
Rational::to_string () const
{
if (is_infinity ())
{
- String s (sign_ > 0 ? "" : "-");
- return String (s + "infinity");
+ string s (sign_ > 0 ? "" : "-");
+ return string (s + "infinity");
}
- String s = ::to_string (num ());
+ string s = ::to_string (num ());
if (den () != 1 && num ())
s += "/" + ::to_string (den ());
return s;
int
Rational::to_int () const
{
- return num () / den ();
+ return (int) num () / den ();
}
int