new

Makefile

@@ -1,2 +1,8 @@
-all:
-	g++ -o main main.cpp Rational.cpp
+all: main.o Rational.o
+	g++ -o main main.o Rational.o
+
+main.o: main.cpp
+	g++ -c main.cpp
+
+Rational.o: Rational.cpp
+	g++ -c Rational.cpp

Rational.cpp

@@ -25,21 +25,46 @@ Rational Rational::sum(const Rational &b) const {
   return Rational(num * b.den + den * b.num, den * b.den);
 } 
 
+Rational Rational::operator+(const Rational &b) const {
+  return Rational(num * b.den + den * b.num, den * b.den);
+} 
+
+double Rational::operator+(double b) const {
+  return real() + b; 
+}
+
+Rational Rational::operator*(const Rational &b) const {
+  return Rational(num *  b.num, den * b.den);
+} 
+
+
 bool Rational::gt(const Rational &b) const {
-/*
-  if (num * b.den > den * b.num) {
-    return true;
-  }
-  else {
-    return false;
-  }
-*/
   return num * b.den > den * b.num;
-  
 }
 
+bool Rational::operator>(const Rational &b) const {
+  return num * b.den > den * b.num;
+}
+
+
 
 void Rational::display() const {
   cout << num << " / " << den << endl;
 }
 
+
+double Rational::real() const {
+  return static_cast<double>(num) / den;
+}
+
+
+double operator+(double a, const Rational &b) {
+    return a + b.real();
+}
+
+
+
+
+
+
+

Rational.h

@@ -10,6 +10,15 @@ public:
   Rational(int n, int d);
   void reduce();
   Rational sum(const Rational &b) const;
+  Rational operator+(const Rational &b) const;
+
+  double operator+(double b) const;
+
+  Rational operator*(const Rational &b) const;
   bool gt(const Rational &b) const;
+  bool operator>(const Rational &b) const;
   void display() const;
+  double real() const;
 };
+
+double operator+(double a, const Rational &b);

main.cpp

@@ -1,26 +1,29 @@
 #include <iostream>
 #include "Rational.h"
-
+////
 using namespace std;
 
 int main() { 
   Rational a(1,2);
   Rational b(8,4);
-  Rational c = a.sum(b);
+  Rational c;
  
+  c = a + b;
+  c = a * b;
 
+  // funcionara????
+  cout << a + 0.5 << endl;
 
-  a.display();
-  b.display();
-  c.display();
-  c.reduce();
-  c.display();
+  cout << 0.5 + a << endl; 
 
-  a.sum(b).display();
+  cout << 0.5 + a + 1.3 << endl; 
 
-  a.sum(a).sum(b).sum(c).display();
+  (a + b + c).display();
+ 
+  c.display();
 
-  cout << boolalpha << a.gt(b) << endl;
+  cout << boolalpha << (a > b) << endl;
+ 
   
   return 0; 
 }