From d01c4eb1354fea01410a085e5913c1bc8a7fcaf0 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Sun, 6 Mar 2016 17:29:02 +0100
Subject: [PATCH] Seance #5

---
 README.md         |   6 +++-
 ex5.cpp           |  20 +++++++++++
 ex5/Duree.cpp     |  85 ++++++++++++++++++++++++++++++++++++++++++++++
 ex5/Duree.h       |  36 ++++++++++++++++++++
 exec/ex5          | Bin 0 -> 13858 bytes
 exec/tp2          | Bin 9205 -> 13598 bytes
 tp2.cpp           |  10 +++---
 tp2/ZFraction.cpp |  34 +++++++++++++++----
 tp2/ZFraction.h   |  13 ++++---
 9 files changed, 188 insertions(+), 16 deletions(-)
 create mode 100644 ex5.cpp
 create mode 100644 ex5/Duree.cpp
 create mode 100644 ex5/Duree.h
 create mode 100755 exec/ex5

diff --git a/README.md b/README.md
index daa39f6..fc12e72 100644
--- a/README.md
+++ b/README.md
@@ -10,4 +10,8 @@ Lab de prog. en C++.
 
 [ex4] Fichiers
 
-[tp1] Mot mystere
\ No newline at end of file
+[tp1] Mot mystere
+
+[ex5] Surcharge d'operateurs (Duree)
+
+[tp2] Surcharge d'operateurs (Fraction)
diff --git a/ex5.cpp b/ex5.cpp
new file mode 100644
index 0000000..24857d1
--- /dev/null
+++ b/ex5.cpp
@@ -0,0 +1,20 @@
+#include <iostream>
+#include <string>
+
+#include "ex5/Duree.h"
+
+using namespace std;
+
+
+
+int main(){
+	Duree d1(0, 10, 30);
+	Duree d2(2, 14, 89);
+
+	cout << d1 << " +  " << d2 << " -> " << d1+d2 << endl;
+	cout << d1 << " == " << d2 << " -> " << (d1==d2) << endl;
+	cout << 2  << " *  " << d2 << " -> " << (2*d2) << endl;
+
+
+	return 0;
+}
\ No newline at end of file
diff --git a/ex5/Duree.cpp b/ex5/Duree.cpp
new file mode 100644
index 0000000..2bdaa2a
--- /dev/null
+++ b/ex5/Duree.cpp
@@ -0,0 +1,85 @@
+/* [x] Constructeur
+=========================================================*/
+void Duree::fix(){
+	int stack(0);
+
+	// Gestion du debordement de secondes
+	stack = _s;
+	if( stack >= 60 ){
+		_s  = stack % 60;
+		_m += stack / 60;
+	}
+	
+	// Gestion du debordement de minutes
+	stack = _m;
+	if( stack >= 60 ){
+		_m  = stack % 60;
+		_h += stack / 60;
+	}
+}
+
+Duree::Duree(int h, int m, int s) : _h(h), _m(m), _s(s){
+	this->fix();
+}
+
+Duree::Duree(const Duree& d) : _h(d._h), _m(d._m), _s(d._s){
+	this->fix();
+}
+
+/* [0] Affichage
+=========================================================*/
+ostream& operator<<(ostream& o, const Duree& d){
+	o << "[" << d._h << ":" << d._m << "," << d._s << "]";
+
+	return o;
+}
+
+
+
+/* [1] Egalite
+=========================================================*/
+bool Duree::operator==(const Duree& x){
+	return _h == x._h && _m == x._m && _s == x._s;
+}
+
+
+
+/* [2] Addition
+=========================================================*/
+void Duree::operator+=(const Duree& d){
+	_h += d._h;
+	_m += d._m;
+	_s += d._s;
+
+	this->fix();
+}
+
+Duree operator+(Duree& l, Duree& r){
+	Duree tmp(l);
+	tmp += r;
+	return tmp;
+}
+
+
+
+/* [3] Multiplication
+=========================================================*/
+void Duree::operator*=(const int d){
+	_h *= d;
+	_m *= d;
+	_s *= d;
+
+	this->fix();
+}
+
+Duree operator*(int l, Duree& r){
+	Duree tmp(r);
+	tmp *= l;
+	return tmp;
+}
+
+Duree operator*(Duree& l, int r){
+	Duree tmp(l);
+	tmp *= r;
+	return tmp;
+}
\ No newline at end of file
diff --git a/ex5/Duree.h b/ex5/Duree.h
new file mode 100644
index 0000000..521f1fa
--- /dev/null
+++ b/ex5/Duree.h
@@ -0,0 +1,36 @@
+#ifndef DEF_DUREE
+	
+	#define DEF_DUREE
+	#include <iostream>
+	#include <string>
+	using namespace std;
+
+	class Duree{
+		public:
+			Duree(int h=0, int m=0, int s=0);
+			Duree(const Duree& d);
+
+			bool operator==(const Duree& x);
+			void operator+=(const Duree& d);
+			void operator*=(const int d);
+
+		private:
+			int _h;
+			int _m;
+			int _s;
+			void fix();
+			friend ostream& operator<<(ostream& o, const Duree& d);
+
+	};
+
+
+	// Operateurs binaires
+	Duree operator+(Duree& l, Duree& r);
+	Duree operator*(int l, Duree& r);
+	Duree operator*(Duree& l, int r);
+
+
+
+	#include "Duree.cpp"
+
+#endif
\ No newline at end of file
diff --git a/exec/ex5 b/exec/ex5
new file mode 100755
index 0000000000000000000000000000000000000000..6acc3f6d9ebbbeda92f3c0cc0930b8dfbb191c07
GIT binary patch
literal 13858
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
a6PND{i-D}?;jQbA$jb39{|`a6>wf{Cm`LOR

literal 0
HcmV?d00001

diff --git a/exec/tp2 b/exec/tp2
index 17ca2ff35b5ace3f454509480f59a16b84970cc6..ca2e098030e7b2f5f1eee2a02b95ef13bcd49caa 100755
GIT binary patch
literal 13598
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
Nd`J&mR_UuT{~N%Pa`^xN

literal 9205
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
Q6KO=0kOxTe0^C&jCw>_AF#rGn

diff --git a/tp2.cpp b/tp2.cpp
index f94194a..9a6cb2a 100644
--- a/tp2.cpp
+++ b/tp2.cpp
@@ -7,11 +7,13 @@ using namespace std;
 
 
 int main(){
-	ZFraction f1(1,10);
-	ZFraction f2(10);
-	ZFraction f3(10, 3);
+	ZFraction f1(1, 2);
+	ZFraction f2(1, 4);
 
-	f1.toString();
+
+
+	cout << f1 << "+" << f2 << " = " << f1+f2 << endl;
+	cout << f1 << "*" << f2 << " = " << f1*f2 << endl;
 
 	return 0;
 }
\ No newline at end of file
diff --git a/tp2/ZFraction.cpp b/tp2/ZFraction.cpp
index 848b9ba..c875daf 100644
--- a/tp2/ZFraction.cpp
+++ b/tp2/ZFraction.cpp
@@ -1,23 +1,43 @@
 /* [0] CONSTRUCTEUR
 =========================================================*/
-ZFraction::ZFraction(int a, int b) : a(a), b(b){}
+ZFraction::ZFraction(int a, int b) : _a(a), _b(b){}
 
 
 
 /* [1] Getters
 =========================================================*/
-void ZFraction::toString() const{ cout << "(" << this->a << "/" << this->b << ")"; }
+ostream& operator<<(ostream& o, const ZFraction& f){
+	o << "(" << f._a << "/" << f._b << ")";
+
+	return o;
+}
 
 
 
 /* [2] Operateurs
 =========================================================*/
 	/* (1) Addition */
-	ZFraction& operator+=(ZFraction const& x){
-		int new_a = this->a * x.b + this->b * x.a;
-		int new_b = this->b * x.b;
+	ZFraction ZFraction::operator+(const ZFraction& x) const{
+		int new_a = _a * x._b + _b * x._a;
+		int new_b = _b * x._b;
 
-		ZFraction out = ZFraction(new_a, new_b);
+		return ZFraction(new_a, new_b);
+	}
 
-		return &out;
+	ZFraction& ZFraction::operator+=(const ZFraction& x){
+		*this = *this + x;
+		return *this;
+	}
+
+	/* (2) Multiplication */
+	ZFraction ZFraction::operator*(const ZFraction& x) const{
+		int new_a = _a * x._a;
+		int new_b = _b * x._b;
+
+		return ZFraction(new_a, new_b);
+	}
+
+	ZFraction& ZFraction::operator*=(const ZFraction& x){
+		*this = *this * x;
+		return *this;
 	}
\ No newline at end of file
diff --git a/tp2/ZFraction.h b/tp2/ZFraction.h
index 1aed4ae..05e9357 100644
--- a/tp2/ZFraction.h
+++ b/tp2/ZFraction.h
@@ -11,13 +11,18 @@
 		public:
 			ZFraction(int a=1, int b=1);
 
-			void toString()       const;
 
-			ZFraction& operator+=(ZFraction const& operand);
+			ZFraction operator+(const ZFraction& x) const;
+			ZFraction& operator+=(const ZFraction& x);
+
+			ZFraction operator*(const ZFraction& x) const;
+			ZFraction& operator*=(const ZFraction& x) const;
 
 		private:
-			int a;
-			int b;
+			friend ostream& operator<<(ostream& o, const ZFraction& f);
+
+			int _a;
+			int _b;
 	};