removed usage of friend keyword and implemented min/max functions. ch…

…anged some functions to const

mod2/ex00/Fixed.cpp

@@ -1,27 +1,29 @@
 #include "Fixed.hpp"
 
-// Constructors
+// Constructors / Destructor
 Fixed::Fixed()
 {
 	this->setRawBits(0);
+	std::cout << "[ default constructor called ] ";
 }
 Fixed::Fixed(const Fixed &other)
 {
 	this->setRawBits(other.getRawBits());
+	std::cout << "[ copy constructor called ] ";
+}
+Fixed::~Fixed()
+{
+	std::cout << "[ destructor called ] ";
 }
 
 // Operators
 Fixed &Fixed::operator= (const Fixed &other)
 {
 	this->setRawBits(other.getRawBits());
+	std::cout << "[ operator constructor called ] ";
 	return *this;
 }
 
-// Destructor
-Fixed::~Fixed()
-{
-}
-
 // Getters / Setters
 int Fixed::getRawBits() const
 {

mod2/ex00/main.cpp

@@ -4,11 +4,16 @@
 int main(void)
 {
 	Fixed a;
+	std::cout << std::endl;
+
 	Fixed b(a);
-	Fixed c = b;
+	std::cout << std::endl;
 
+	Fixed c;
+	c = b;
+	std::cout << std::endl << std::endl;
 
 	std::cout << "value A : " << a.getRawBits() << std::endl;
 	std::cout << "value B : " << b.getRawBits() << std::endl;
-	std::cout << "value C : " << c.getRawBits() << std::endl;
+	std::cout << "value C : " << c.getRawBits() << std::endl << std::endl;
 }

mod2/ex01/Fixed.cpp

@@ -4,30 +4,37 @@
 Fixed::Fixed()
 {
 	this->setRawBits(0);
+	std::cout << "[ default constructor called ] ";
 }
 Fixed::Fixed(const int value)
 {
 	this->setRawBits(value * this->_frac_bit);
+	std::cout << "[ int constructor called ] ";
+
 }
 Fixed::Fixed(const float value)
 {
 	this->setRawBits((int)(value * this->_frac_bit));
+	std::cout << "[ float constructor called ] ";
+
 }
 Fixed::Fixed(const Fixed &other)
 {
 	this->setRawBits(other.getRawBits());
+	std::cout << "[ copy constructor called ] ";
 }
 Fixed::~Fixed()
 {
+	std::cout << "[ destructor called ] ";
 }
 
 // Operators
 Fixed &Fixed::operator= (const Fixed &other)
 {
 	this->setRawBits(other.getRawBits());
+	std::cout << "[ operator constructor called ] ";
 	return *this;
 }
-// "friend" keyword allows us to create/override non-member functions
 // function cannot be member of Fixed cause it needs to be a member of ostream
 // this is because the ostream instance if the first argument of the "<<" operator
 std::ostream &operator<< (std::ostream &out, const Fixed &fpn)
@@ -36,7 +43,6 @@ std::ostream &operator<< (std::ostream &out, const Fixed &fpn)
 	return (out);
 }
 
-
 // Others
 int Fixed::getRawBits() const
 {

mod2/ex01/Fixed.hpp

@@ -19,14 +19,14 @@ class Fixed
 
 		// Operators
 		Fixed &operator= (const Fixed &other);
-		friend std::ostream &operator<< (std::ostream &out, const Fixed &fpn);
 
-		// Other
+		// Others
 		int getRawBits() const;
 		void setRawBits(int raw_value);
 		float toFloat(void) const;
 		int toInt(void) const;
-
 };
 
+std::ostream &operator<< (std::ostream &out, const Fixed &fpn);
+
 #endif

mod2/ex01/main.cpp

@@ -5,14 +5,24 @@ int main(void)
 {
 	Fixed a;
 	a.setRawBits(42 * 8);
+	std::cout << std::endl;
 
 	Fixed b(42);
+	std::cout << std::endl;
 
 	Fixed c(42.5f);
+	std::cout << std::endl;
+
+	Fixed d;
+	d = Fixed(42.25f);
+	std::cout << std::endl;
 
-	Fixed d = Fixed(42.25f);
 	Fixed e(b);
-	Fixed f = c;
+	std::cout << std::endl;
+
+	Fixed f;
+	f = c;
+	std::cout << std::endl << std::endl;
 
 	std::cout << "int value of A : " << a.toInt() << std::endl;
 	std::cout << "int value of B : " << b.toInt() << std::endl;

mod2/ex02/Fixed.cpp

@@ -35,26 +35,33 @@ Fixed &Fixed::operator= (const Fixed &other)
 	std::cout << "[ operator constructor called ] ";
 	return *this;
 }
+// function cannot be member of Fixed cause it needs to be a member of ostream
+// this is because the ostream instance is the first argument of the "<<" operator
+std::ostream &operator<< (std::ostream &out, const Fixed &fpn)
+{
+	out << fpn.toFloat();
+	return (out);
+}
 
-Fixed Fixed::operator+ (const Fixed &other)
+Fixed Fixed::operator+ (const Fixed &other) const
 {
 	Fixed tmp;
 	tmp.setRawBits(this->getRawBits() + other.getRawBits());
 	return (tmp);
 }
-Fixed Fixed::operator- (const Fixed &other)
+Fixed Fixed::operator- (const Fixed &other) const
 {
 	Fixed tmp;
 	tmp.setRawBits(this->getRawBits() - other.getRawBits());
 	return (tmp);
 }
-Fixed Fixed::operator* (const Fixed &other)
+Fixed Fixed::operator* (const Fixed &other) const
 {
 	Fixed tmp;
 	tmp.setRawBits((this->getRawBits() * other.getRawBits()) / this->_frac_bit);
 	return (tmp);
 }
-Fixed Fixed::operator/ (const Fixed &other)
+Fixed Fixed::operator/ (const Fixed &other) const
 {
 	Fixed tmp;
 	tmp.setRawBits((this->getRawBits() * this->_frac_bit) / other.getRawBits());
@@ -82,27 +89,27 @@ Fixed &Fixed::operator/= (const Fixed &other)
 }
 
 
-bool Fixed::operator!= (const Fixed &other)
+bool Fixed::operator!= (const Fixed &other) const
 {
 	return (this->getRawBits() != other.getRawBits());
 }
-bool Fixed::operator> (const Fixed &other)
+bool Fixed::operator> (const Fixed &other) const
 {
 	return (this->getRawBits() > other.getRawBits());
 }
-bool Fixed::operator>= (const Fixed &other)
+bool Fixed::operator>= (const Fixed &other) const
 {
 	return (this->getRawBits() >= other.getRawBits());
 }
-bool Fixed::operator== (const Fixed &other)
+bool Fixed::operator== (const Fixed &other) const
 {
 	return (this->getRawBits() == other.getRawBits());
 }
-bool Fixed::operator<= (const Fixed &other)
+bool Fixed::operator<= (const Fixed &other) const
 {
 	return (this->getRawBits() <= other.getRawBits());
 }
-bool Fixed::operator< (const Fixed &other)
+bool Fixed::operator< (const Fixed &other) const
 {
 	return (this->getRawBits() < other.getRawBits());
 }
@@ -137,15 +144,38 @@ Fixed Fixed::operator-- (int)
 	return (tmp);
 }
 
-// "friend" keyword allows us to create/override non-member functions
-// function cannot be member of Fixed cause it needs to be a member of ostream
-// this is because the ostream instance if the first argument of the "<<" operator
-std::ostream &operator<< (std::ostream &out, const Fixed &fpn)
+// Min/Max
+// static member functions have no 'this' to use
+Fixed &Fixed::min(Fixed &fpn1, Fixed &fpn2)
 {
-	out << fpn.toFloat();
-	return (out);
+	if (fpn1 > fpn2)
+		return (fpn2);
+	else
+		return (fpn1);
+}
+Fixed &Fixed::max(Fixed &fpn1, Fixed &fpn2)
+{
+	if (fpn1 > fpn2)
+		return (fpn1);
+	else
+		return (fpn2);
+}
+// function's return has to be const to be able to return a const var
+const Fixed &Fixed::min(const Fixed &fpn1, const Fixed &fpn2)
+{
+	if (fpn1 > fpn2)
+		return (fpn2);
+	else
+		return (fpn1);
+}
+// function's return has to be const to be able to return a const var
+const Fixed &Fixed::max(const Fixed &fpn1, const Fixed &fpn2)
+{
+	if (fpn1 > fpn2)
+		return (fpn1);
+	else
+		return (fpn2);
 }
-
 
 // Others
 int Fixed::getRawBits() const

mod2/ex02/Fixed.hpp

@@ -20,36 +20,41 @@ class Fixed
 		// Operators
 		Fixed &operator= (const Fixed &other);
 			// Arithmetics
-		Fixed operator+ (const Fixed &other);
-		Fixed operator- (const Fixed &other);
-		Fixed operator* (const Fixed &other);
-		Fixed operator/ (const Fixed &other);
+		Fixed operator+ (const Fixed &other) const;
+		Fixed operator- (const Fixed &other) const;
+		Fixed operator* (const Fixed &other) const;
+		Fixed operator/ (const Fixed &other) const;
 		Fixed &operator+= (const Fixed &other);
 		Fixed &operator-= (const Fixed &other);
 		Fixed &operator*= (const Fixed &other);
 		Fixed &operator/= (const Fixed &other);
 			// Comparisons
-		bool operator!= (const Fixed &other);
-		bool operator> (const Fixed &other);
-		bool operator>= (const Fixed &other);
-		bool operator== (const Fixed &other);
-		bool operator<= (const Fixed &other);
-		bool operator< (const Fixed &other);
+		bool operator!= (const Fixed &other) const;
+		bool operator> (const Fixed &other) const;
+		bool operator>= (const Fixed &other) const;
+		bool operator== (const Fixed &other) const;
+		bool operator<= (const Fixed &other) const;
+		bool operator< (const Fixed &other) const;
 			// Incrementations
 		Fixed &operator++ ();
 		Fixed &operator-- ();
 		Fixed operator++ (int);
 		Fixed operator-- (int);
 
-		friend std::ostream &operator<< (std::ostream &out, const Fixed &fpn);
+		// Min/Max
+		static Fixed &min(Fixed &fpn1, Fixed &fpn2);
+		static Fixed &max(Fixed &fpn1, Fixed &fpn2);
+		static const Fixed &min(const Fixed &fpn1, const Fixed &fpn2);
+		static const Fixed &max(const Fixed &fpn1, const Fixed &fpn2);
 
-		// Other
+		// Others
 		int getRawBits() const;
 		void setRawBits(int raw_value);
 		float toFloat() const;
 		int toInt() const;
 		int getFracBit() const;
-
 };
 
+std::ostream &operator<< (std::ostream &out, const Fixed &fpn);
+
 #endif