mit Plus und PlusGleich Operator

mgretler · mgretler · commit 77692474f020 · 2013-09-29T08:32:08.000+02:00
diff --git a/FractionDemo/src/CFraction.cpp b/FractionDemo/src/CFraction.cpp
@@ -27,7 +27,7 @@ CFraction::CFraction(int num, int den) {
 	*mp_numerator = num;
 	*mp_denumerator = den;
 
-	clog << "Num: " << *mp_numerator << ", Den: " << *mp_denumerator << endl;
+	// clog << "Num: " << *mp_numerator << ", Den: " << *mp_denumerator << endl;
 }
 
 CFraction::CFraction(const CFraction &fraction) {
@@ -39,7 +39,7 @@ CFraction::CFraction(const CFraction &fraction) {
 
 	*mp_numerator = *fraction.mp_numerator;
 	*mp_denumerator = *fraction.mp_denumerator;
-	clog << "Num: " << *mp_numerator << ", Den: " << *mp_denumerator << endl;
+	// clog << "Num: " << *mp_numerator << ", Den: " << *mp_denumerator << endl;
 
 }
 
@@ -49,13 +49,33 @@ CFraction& CFraction::operator =(const CFraction& fraction) {
 
 	*mp_numerator = *fraction.mp_numerator;
 	*mp_denumerator = *fraction.mp_denumerator;
-	clog << "Num: " << *mp_numerator << ", Den: " << *mp_denumerator << endl;
+	// clog << "Num: " << *mp_numerator << ", Den: " << *mp_denumerator << endl;
 
 	return *this;
 }
 
+CFraction& CFraction::operator +=(const CFraction& fraction) {
+
+	*this->mp_numerator += *fraction.mp_numerator;
+	*this->mp_denumerator += *fraction.mp_denumerator;
+
+	return *this;
+}
+
+CFraction CFraction::operator +(const CFraction& fraction) {
+
+	int num = *this->mp_numerator + *fraction.mp_numerator;
+	int den = *this->mp_denumerator + *fraction.mp_denumerator;
+
+	return CFraction(num, den);
+}
+
+ostream& operator <<(ostream& o, const CFraction& cf) {
+	return o << "Num: " << *cf.mp_numerator << ", Den: " << *cf.mp_denumerator
+			<< endl;
+}
+
 void CFraction::writeln() {
 	cout << "Num: " << *mp_numerator << ", Den: " << *mp_denumerator << endl;
 }
 
-
diff --git a/FractionDemo/src/CFraction.h b/FractionDemo/src/CFraction.h
@@ -4,6 +4,7 @@
  *  Created on: 16.09.2013
  *      Author: Markus
  */
+#include <iostream>
 
 #ifndef CFRACTION_H_
 #define CFRACTION_H_
@@ -13,9 +14,12 @@ class CFraction {
 	CFraction();
 	virtual ~CFraction();
 	CFraction(int num, int den);
-	CFraction(const CFraction &fraction);
-	CFraction& operator=(const CFraction &fraction);
+	CFraction(const CFraction& fraction);
+	CFraction& operator =(const CFraction& fraction);
+	CFraction operator +(const CFraction& fraction);
+	CFraction& operator +=(const CFraction& fraction);
 
+	friend std::ostream& operator <<(std::ostream& o, const CFraction& cf);
 	void writeln();
 
 private:
diff --git a/FractionDemo/src/FractionDemo.cpp b/FractionDemo/src/FractionDemo.cpp
@@ -14,7 +14,7 @@ int main() {
 	CFraction zahl1(3, 4);		// mit �bergabeparametern
 	CFraction zahl2;			// mit Standardwerten initialisieren
 	CFraction zahl3(zahl1);		// als Copy Konstruktor
-	CFraction zahl4 = zahl2;			// mit Zuweisungsoperator
+	CFraction zahl4 = zahl2;	// mit Zuweisungsoperator
 
 	zahl1.writeln();
 	zahl2.writeln();
@@ -24,6 +24,18 @@ int main() {
 	// Test zu Aufgabe 5
 	CFraction aFraction;
 	aFraction = CFraction(13, 42);
+	aFraction.writeln();
+
+	// Aufgabe 7
+	CFraction a(3, 5), b(7, 9), c;
+	a.writeln();
+	b.writeln();
+	c = a + b;
+	c.writeln();
+	c += b;
+	c.writeln();
+
+	cout << "c= " << c;
 
 	return 0;
 }
