/*
rational.cc -- implement Rational
-
+
source file of the Flower Library
- (c) 1997--2004 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 "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)
{
- o << r.string ();
+ o << r.string ();
return o;
}
#endif
-
Rational
Rational::trunc_rat () const
{
{
sign_ = ::sign (n);
num_ = abs (n);
- den_= 1;
+ den_ = 1;
}
static inline
return b;
}
-
void
Rational::set_infinite (int s)
{
- sign_ = ::sign (s) * 2;
+ sign_ = ::sign (s) * 2;
}
Rational
}
else
{
- int g = gcd (num_ , den_);
+ int g = gcd (num_, den_);
num_ /= g;
den_ /= g;
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
compare (Rational const &r, Rational const &s)
{
- return Rational::compare (r, s );
+ return Rational::compare (r, s);
}
Rational &
Rational::operator %= (Rational r)
{
- *this = r.mod_rat (r);
+ *this = mod_rat (r);
return *this;
}
if (is_infinity ())
;
else if (r.is_infinity ())
+ *this = r;
+ else
{
- *this = r;
- }
- else
- {
- int n = sign_ * num_ *r.den_ + r.sign_ * den_ * r.num_;
- int d = den_ * r.den_;
- sign_ = ::sign (n) * ::sign (d);
+ 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);
normalise ();
}
return *this;
}
-
/*
copied from libg++ 2.8.0
- */
+*/
Rational::Rational (double x)
{
if (x != 0.0)
num_ = (unsigned int) (mantissa * FACT);
den_ = (unsigned int) FACT;
- normalise ();
+ normalise ();
if (expt < 0)
den_ <<= -expt;
else
{
num_ = 0;
den_ = 1;
- sign_ =0;
+ sign_ = 0;
normalise ();
}
}
-
void
Rational::invert ()
{
int r (num_);
- num_ = den_;
+ num_ = den_;
den_ = r;
}
{
sign_ *= ::sign (r.sign_);
if (r.is_infinity ())
- {
+ {
sign_ = sign () * 2;
goto exit_func;
}
exit_func:
return *this;
}
-
+
Rational &
Rational::operator /= (Rational r)
{
sign_ *= -1;
}
-Rational&
+Rational &
Rational::operator -= (Rational r)
{
r.negate ();
{
if (is_infinity ())
{
- String s (sign_ > 0 ? "" : "-" );
+ String s (sign_ > 0 ? "" : "-");
return String (s + "infinity");
}
int
Rational::to_int () const
{
- return num () / den ();
+ return (int) num () / den ();
}
int