d02 ex02 division avec long sans float

d02/ex02/make

@@ -0,0 +1,238 @@
+#include "Fixed.hpp"
+
+/*
+ * functions to print numbers in binary
+ * for the float, found help from stackoverflow :
+ * https://stackoverflow.com/questions/474007/floating-point-to-binary-valuec
+ */
+
+std::string printBitsInt(int num)
+{
+	int i = 0;
+
+	for (unsigned int mask = 1U << (sizeof(int) *8 -1); mask; mask >>= 1)
+	{
+		std::cout << ((num & mask) != 0);
+		i++;
+		if (i == 1 || i == 9 || i == 24)
+			std::cout << ' ';
+	}
+	return "";
+}
+
+std::string	printBitsFloat(float num)
+{
+	int	*p = (int *)&num;
+	int i = 0;
+
+	for (unsigned int mask = 1U << (sizeof(float) *8 -1); mask; mask >>= 1)
+	{
+		std::cout << ((*p & mask) != 0);
+		i++;
+		if (i == 1 || i == 9 || i == 24)
+			std::cout << ' ';
+	}
+	return "";
+}
+
+
+/*
+ * statics variables initialisation
+ *
+ * for MAX integer :
+ * 00000000 01111111 11111111 11111111 ( 8388607) (-1U >> (this->_frac +1))
+ *              <= ... >=
+ * 11111111 10000000 00000000 00000000 (-8388608)
+ *
+ */
+
+int const Fixed::_frac = 8;
+int const Fixed::_max = -1U >> (_frac +1);
+
+
+/*
+ * default constructor / copy constructor / destructor
+ */
+
+Fixed::Fixed() : _value(0) {
+	return;
+}
+
+Fixed::Fixed(Fixed const & src) {
+	*this = src;
+	return;
+}
+
+Fixed::~Fixed( void ) {
+	return;
+}
+
+
+/*
+ * int and float constructors
+ */
+
+Fixed::Fixed(int integer) {
+	if (integer < ~this->_max || integer > this->_max)
+		std::cout << "error: integer out of range" << '\n';
+	else
+		this->_value = integer << this->_frac;
+}
+
+Fixed::Fixed(float const floater) {
+	if (floater < ~this->_max || floater > this->_max)
+		std::cout << "error: float out of range" << '\n';
+	else
+		this->_value = roundf(floater * (1 << this->_frac));
+}
+
+
+/*
+ * assignement operator
+ */
+
+Fixed &	Fixed::operator=( Fixed const & rhs ) {
+	if ( this != &rhs )
+		this->_value = rhs.getRawBits();
+	return *this;
+}
+
+
+/*
+ * operators < ; > ; <= ; == ; != ; + ; - ; * ; / ; ++ ; --
+ * ref : https://en.cppreference.com/w/cpp/language/operators
+ * for division, if you want to avoid floats (legitimate) :
+ * https://stackoverflow.com/questions/8506317/fixed-point-unsigned-division-in-c
+ */
+
+bool	Fixed::operator< (Fixed const & rhs) const {
+	return this->toFloat() < rhs.toFloat();
+}
+bool	Fixed::operator> (Fixed const & rhs) const {
+	return this->toFloat() > rhs.toFloat();
+}
+bool	Fixed::operator<=(Fixed const & rhs) const {
+	return this->toFloat() <= rhs.toFloat();
+}
+bool	Fixed::operator>=(Fixed const & rhs) const {
+	return this->toFloat() >= rhs.toFloat();
+}
+bool	Fixed::operator==(Fixed const & rhs) const {
+	return this->toFloat() == rhs.toFloat();
+}
+bool	Fixed::operator!=(Fixed const & rhs) const {
+	return this->toFloat() != rhs.toFloat();
+}
+Fixed	Fixed::operator+ ( Fixed const & rhs ) const {
+	Fixed	result(*this);
+	result._value += rhs._value;
+	return (result);
+}
+Fixed	Fixed::operator- ( Fixed const & rhs ) const {
+	Fixed	result(*this);
+	result._value -= rhs._value;
+	return (result);
+}
+Fixed	Fixed::operator* ( Fixed const & rhs ) const {
+	Fixed	result(*this);
+	result._value = ((long)result._value * (long)rhs._value) >> 8;
+	return result;
+}
+Fixed	Fixed::operator/ ( Fixed const & rhs ) const {
+	Fixed	result(*this);
+
+	while (result._value < (rhs._value << 8))
+		result._value <<= 1;
+//	result._value /= rhs._value;
+	return result;
+
+//	if (rhs._value >> _frac != 0)
+//		result._value /= rhs._value >> _frac;
+//	return result;
+	
+//	return Fixed( this->toFloat() / rhs.toFloat() );
+
+//
+// 10 /  5 = 2
+//  5 / 10 = 0.5
+// 10 /  6 = 1.666...
+//  6 / 10 = 0.6
+//
+
+}
+Fixed	Fixed::operator++() {
+	this->_value++;
+	return *this;
+}
+Fixed	Fixed::operator--() {
+	this->_value--;
+	return *this;
+}
+Fixed	Fixed::operator++( int ) {
+	Fixed old = *this;
+	Fixed::operator++();
+	return old;
+}
+Fixed	Fixed::operator--( int ) {
+	Fixed old = *this;
+	Fixed::operator--();
+	return old;
+}
+
+
+/*
+ * returns min and max
+ */
+
+Fixed const &	Fixed::min(Fixed const & lhs, Fixed const & rhs) {
+	if (lhs < rhs)
+		return lhs;
+	return rhs;
+}
+Fixed const &	Fixed::max(Fixed const & lhs, Fixed const & rhs) {
+	if (lhs > rhs)
+		return lhs;
+	return rhs;
+}
+Fixed &	Fixed::min(Fixed & lhs, Fixed & rhs) {
+	if (lhs < rhs)
+		return lhs;
+	return rhs;
+}
+Fixed &	Fixed::max(Fixed & lhs, Fixed & rhs) {
+	if (lhs > rhs)
+		return lhs;
+	return rhs;
+}
+
+
+/*
+ * functions that returns _value
+ */
+
+int		Fixed::getRawBits( void ) const {
+	return this->_value;
+}
+
+void	Fixed::setRawBits( int const raw ) {
+	this->_value = raw;
+}
+
+int		Fixed::toInt( void ) const {
+	return (this->_value >> this->_frac);
+}
+float	Fixed::toFloat( void ) const {
+	return ((float)this->_value / (float)(1 << this->_frac));
+}
+
+
+/*
+ * overload "<<" -> output fixed point in float representation
+ * found here : https://github.com/pgomez-a/42_CPP_Piscine/blob/master/cpp02/ex01/Fixed.cpp
+ */
+
+std::ostream &	operator<<(std::ostream & o, Fixed const & rhs)
+{
+	o << rhs.toFloat();
+	return (o);
+}

d02/ex02/Fixed.cpp

@@ -135,80 +135,28 @@ Fixed	Fixed::operator- ( Fixed const & rhs ) const {
 }
 Fixed	Fixed::operator* ( Fixed const & rhs ) const {
 	Fixed	result(*this);
-	int		left = this->_value;
-	int		right = rhs._value;
-
-	result._value = 0;
-													// left:5 right:10
-	while (right > 0)								//           1
-	{
-		result._value /= 10;						//    0/10 = 0     0/10 = 0
-		result._value += (left * (right % 10));		// 0+(5*0) = 0  0+(5*1) = 1
-std::cout << "intermediaire: " << result << " ";	//
-		right /= 10;								//   10/10 = 1     1/10 = 0
-	}
-	result._value >>= _frac;
-
-//	result._value *= rhs._value >> _frac;
-//	result._value += (this->_value * (rhs._value & ((1 << (_frac + 1)) - 1))) >> _frac;
-
-//	result._value = ((long)result._value * (long)rhs._value) >> 8;
-
+	result._value = ((long)result._value * (long)rhs._value) >> 8;
 	return result;
-
-//
-// 47 * 256 = 12 032
-// 5 * 10 -> 5*256 * 10*256 -> 5 * 10 * 256^2
-// 256^2 = 65 536
-//    256 :          1 00000000
-// 65 536 : 1 00000000 00000000
-//
-//
-//   5 *   10 = 50
-// 101 * 1010 = 110010
-// 101.00000000 * 1010.00000000 = 110010.00000000
-// 101 00000000 * 1010 00000000 = 110010 00000000
-//                                110010 00000000
-//          128 *          2560 =          327680
-//
-//
-//  3 *   5 =   15
-// 11 * 101 = 1111
-//
-//
-//  3.5 *   5.25 =    18.375
-// 11.1 * 101.01 = 10010.011
-// 11 1 * 101 01 = 10010 011
-//    7 *     21 =       147
-//
-//
-//   3.5 * 5.25
-//   3.5 * (5 + 0.25)
-//   3.5 * 5
-// + 3.5 * 0.25
-//
-// 3.5 * 4.25 = 14.875
-// 3.5 * (0.05 + 0.20 + 4.00)
-// 3.5 * 0.05 = 0.175 = 17.5 / 100
-// 3.5 * 0.20 = 0.7 = 7 / 10
-// 3.5 * 4.00 = 14
-// 14 + 0.7 + 0.175 = 14.875
-//
-// 3.5 * 5 = 17.5
-// 3.5 * 2 = 7
-// 3.5 * 4 = 14
-// (((17.5 / 10) + 7) / 10) + 14
-//    17.5 / 10
-//         1.75  + 7
-//              8.75  / 10
-//                   0.875  + 14
-//
-
 }
 Fixed	Fixed::operator/ ( Fixed const & rhs ) const {
-	std::cout << this->_value << " " << rhs._value << " "
-			  << (( (this->_value << 8) / rhs._value )) << "\n";
-	return Fixed( this->toFloat() / rhs.toFloat() );
+	Fixed	result(*this);
+
+	result._value = (long)(result._value << _frac) / rhs._value;
+
+//	if (rhs._value >> _frac != 0)
+//		result._value /= rhs._value >> _frac;
+
+	return result;
+	
+//	return Fixed( this->toFloat() / rhs.toFloat() );
+
+//
+// 10 /  5 = 2
+//  5 / 10 = 0.5
+// 10 /  6 = 1.666...
+//  6 / 10 = 0.6
+//
+
 }
 Fixed	Fixed::operator++() {
 	this->_value++;

d02/ex02/main.cpp

@@ -4,6 +4,7 @@
 #include "color.h"
 
 #define COLOR B_YELLOW
+#define COLOR2 B_CYAN
 
 int main( void ) {
 
@@ -30,100 +31,103 @@ int main( void ) {
 	// ">"
 	std::cout << "\n" COLOR "operator >"" RESET " RESET "\n";
 	std::cout << "e = greater of (c, d) : e == " << (e = (c > d) ? c : d) << '\n';
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e > c ? : " << (e > c) << '\n';
 	std::cout << "e > d ? : " << (e > d) << '\n';
 	// "<"
 	std::cout << "\n" COLOR "operator <" RESET "\n";
 	std::cout << "e = smaller of (c, d) : e == " << (e = (c < d) ? c : d) << '\n';
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e < c ? : " << (e < c) << '\n';
 	std::cout << "e < d ? : " << (e < d) << '\n';
 	// "<="
 	std::cout << "\n" COLOR "operator <=" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e <= c ? : " << (e <= c) << '\n';
 	std::cout << "e <= d ? : " << (e <= d) << '\n';
 	// ">="
 	std::cout << "\n" COLOR "operator >=" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e >= c ? : " << (e >= c) << '\n';
 	std::cout << "e >= d ? : " << (e >= d) << '\n';
 	// "=="
 	std::cout << "\n" COLOR "operator ==" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e == c ? : " << (e == c) << '\n';
 	std::cout << "e == d ? : " << (e == d) << '\n';
 	// "!="
 	std::cout << "\n" COLOR "operator !=" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e != c ? : " << (e != c) << '\n';
 	std::cout << "e != d ? : " << (e != d) << '\n';
 	// "+"
 	std::cout << "\n" COLOR "operator +" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e = c + d : " << (e = c + d) << "\n";
 	std::cout << "e = e + c + d : " << (e = e + c + d) << '\n';
 	// "-"
 	std::cout << "\n" COLOR "operator -" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e = d - e ? : " << (e = d - e) << "\n";
 	std::cout << "e = c - d - e ? : " << (e = c - d - e) << '\n';
 	// "*"
 	Fixed	f;
 	std::cout << "\n" COLOR "operator *" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e = d * c ? : " << (e = d * c) << "\n";
 	std::cout << "e = d * c * c ? : " << (e = d * c * c) << '\n';
 	f = Fixed(3.5f);
 	e = Fixed(5.25f);
-	std::cout << "f:" << f << " e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "f:" << f << " e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e = f * e ? : " << (e = f * e) << "\n";
 	f = Fixed(1000);
 	e = Fixed(50);
-	std::cout << "f:" << f << " e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "f:" << f << " e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e = f * e ? : " << (e = f * e) << "\n";
 	f = Fixed(178481); // 8 388 607 / 47 = 178 481
 	e = Fixed(47);
-	std::cout << "f:" << f << " e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "f:" << f << " e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e = f * e ? : " << (e = f * e) << "\n";
 	// "/"
 	std::cout << "\n" COLOR "operator /" RESET "\n";
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "e = d / c ? : " << (e = d / c) << "\n";
+	std::cout << "e = c / d ? : " << (e = c / d) << "\n";
 	std::cout << "e = d / c / e ? : " << (e = d / c / e) << '\n';
+	c = Fixed(6);
+	d = Fixed(10);
+	std::cout << COLOR2 "e:" << e << " c:" << c << " d:" << d << RESET "\n";
+	std::cout << "e = c / d ? : " << (e = c / d) << '\n';
 	// "+ - * /"
 	std::cout << "\n" COLOR "operator + - * /" RESET "\n";
 	Fixed	g;
-	std::cout << "f:" << f << " e:" << e << " c:" << c << " d:" << d << '\n';
+	std::cout << COLOR2 "f:" << f << " e:" << e << " c:" << c << " d:" << d << RESET "\n";
 	std::cout << "f = e + d / c - d / e * c ? : " << (f = e + d / c - d / e * c) << '\n';
 	std::cout << "g = d / c ? : " << std::setw(5) << std::left << (g = d / c) << "[f:" << std::setw(5) << std::left << f << " g:" << std::setw(5) << std::left << g << " e:" << e << " c:" << c << " d:" << d << "]\n";
 	std::cout << "g = e + g ? : " << std::setw(5) << std::left << (g = e + g) << "[f:" << std::setw(5) << std::left << f << " g:" << std::setw(5) << std::left << g << " e:" << e << " c:" << c << " d:" << d << "]\n";
 	std::cout << "f = d / e ? : " << std::setw(5) << std::left << (f = d / e) << "[f:" << std::setw(5) << std::left << f << " g:" << std::setw(5) << std::left << g << " e:" << e << " c:" << c << " d:" << d << "]\n";
 	std::cout << "f = f * c ? : " << std::setw(5) << std::left << (f = f * c) << "[f:" << std::setw(5) << std::left << f << " g:" << std::setw(5) << std::left << g << " e:" << e << " c:" << c << " d:" << d << "]\n";
 	std::cout << "f = g - f ? : " << std::setw(5) << std::left << (f = g - f) << "[f:" << std::setw(5) << std::left << f << " g:" << std::setw(5) << std::left << g << " e:" << e << " c:" << c << " d:" << d << "]\n";
-	// "/"
-	std::cout << "\n" COLOR "operator /" RESET "\n";
-	c = Fixed(6);
-	d = Fixed(10);
-	std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
-	std::cout << "e = c / d ? : " << (e = c / d) << '\n';
 	// "++x"
 	std::cout << "\n" COLOR "operator ++o" RESET "\n";
 	e = Fixed(2);
 	std::cout << "e : " << e << '\n';
+	std::cout << COLOR2 "e:" << e << RESET "\n";
 	std::cout << "++e : " << ++e << " ; e : " << e << '\n';
 	// "--x"
 	std::cout << "\n" COLOR "operator --o" RESET "\n";
 	std::cout << "e : " << e << '\n';
+	std::cout << COLOR2 "e:" << e << RESET "\n";
 	std::cout << "--e : " << --e << " ; e : " << e << '\n';
 	// "x++"
 	std::cout << "\n" COLOR "operator o++" RESET "\n";
 	std::cout << "e : " << e << '\n';
+	std::cout << COLOR2 "e:" << e << RESET "\n";
 	std::cout << "e++ : " << e++ << " ; e : " << e << '\n';
 	// "x--"
 	std::cout << "\n" COLOR "operator o--" RESET "\n";
 	std::cout << "e : " << e << '\n';
+	std::cout << COLOR2 "e:" << e << RESET "\n";
 	std::cout << "e-- : " << e-- << " ; e : " << e << '\n';
 
 	return 0;