From 9036ded700fac211814fee5dfca43078ebf3b9ec Mon Sep 17 00:00:00 2001
From: hugogogo <hugogogo@protonmail.com>
Date: Mon, 14 Feb 2022 17:17:19 +0100
Subject: [PATCH] float to int les deux methodes fonctionnent

---
 d02/ex01/Fixed.cpp |  60 ++++++++++++---------------------------------
 d02/ex01/fixed     | Bin 19032 -> 19032 bytes
 d02/ex01/main.cpp  |  10 ++++++++
 3 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/d02/ex01/Fixed.cpp b/d02/ex01/Fixed.cpp
index f94c568..7c54d70 100644
--- a/d02/ex01/Fixed.cpp
+++ b/d02/ex01/Fixed.cpp
@@ -80,9 +80,9 @@ Fixed::Fixed(int integer) {
 		std::cout << "error: integer out of range" << '\n';
 		return;
 	}
-	std::cout << "integer : " << printBitsInt(integer) << " (" << integer << ")\n";
+//	std::cout << "integer : " << printBitsInt(integer) << " (" << integer << ")\n";
 	this->_value = integer << this->_frac;
-	std::cout << "_value  : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
+//	std::cout << "_value  : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
 }
 
 Fixed::Fixed(float const floater) {
@@ -93,52 +93,22 @@ Fixed::Fixed(float const floater) {
 		std::cout << "error: float out of range" << '\n';
 		return;
 	}
-	std::cout << "floater : " << printBitsFloat(floater) << " (" << floater << ")\n";
+//	std::cout << "floater : " << printBitsFloat(floater) << " (" << floater << ")\n";
 	this->_value = floater * (1 << this->_frac);
-	std::cout << "_value  : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
+//	std::cout << "_value  : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
 
-	this->_value = *((int *)&floater); // cast floater into int
-std::cout << "_value  : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-
-	int sign = this->_value & (1 << 31); // set most left bits to sign
-std::cout << "sign    : " << printBitsInt(sign) << " (" << sign << ")\n";
-
-	int exponent = ((unsigned int)(this->_value << 1) >> 24) - 127; // extract exponent value
-std::cout << "exponent: " << printBitsInt(exponent) << " (" << exponent << ")\n";
-
-	int decimal = (this->_value << (9));
-std::cout << "decimal : " << printBitsInt(decimal) << " (" << decimal << ")\n";
-	decimal = (this->_value << (9 + exponent));
-std::cout << "decimal : " << printBitsInt(decimal) << " (" << decimal << ")\n";
-
-	int integer = (this->_value << 8) | (1 << 31); // add left 1 to integer part
-std::cout << "left 1  : " << printBitsInt(integer) << " (" << integer << ")\n";
+/*
+	this->_value = *((int *)&floater);                               // cast float to int
+	int sign = this->_value & (1 << 31);                             // extract sign
+	int exponent = ((unsigned int)(this->_value << 1) >> 24) - 127;  // extract exponent
+	int integer = (this->_value << 8) | (1 << 31);                   // add left 1
+	integer = (unsigned int)integer >> (31 - this->_frac - exponent);// align to right
 	if (sign != 0)
-		integer = ~integer; // reverse for negatif
-std::cout << "reverse : " << printBitsInt(integer) << " (" << integer << ")\n";
-	integer = ((unsigned int)integer >> 1) | sign; // add sign to integer part
-std::cout << "left +/-: " << printBitsInt(integer) << " (" << integer << ")\n";
-	integer >>= (30 - exponent); // extract integer part
-std::cout << "integer : " << printBitsInt(integer) << " (" << integer << ")\n";
-
-//	this->_value = (unsigned int)(this->_value << 8); // shift to left to erase exponent part
-//	this->_value |= 1 << 31; // add the missing left 1
-//std::cout << "to left : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-//	this->_value = (unsigned int)this->_value >> 1;
-//std::cout << "to right: " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-//	this->_value |= sign;
-//std::cout << "sign    : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-//	this->_value = this->_value >> (30 - exponent - this->_frac); // shift to right untill fixed point
-//std::cout << "_value  : " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-////	int decimal = (unsigned int)(this->_value << (24)) >> 24; // extract decimal
-////std::cout << "decimal : " << printBitsInt(decimal) << " (" << decimal << ")\n";
-//	this->_value >>= this->_frac;
-//std::cout << "int valu: " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-////	this->_value += (unsigned int)sign >> 31;
-////std::cout << "val sign: " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-//	this->_value = (this->_value << this->_frac);
-//std::cout << "val sign: " << printBitsInt(this->_value) << " (" << this->_value << ")\n";
-
+		integer = (~integer + 1);                                    // reverse negatif
+	integer = (integer << (30 - this->_frac - exponent)) | sign;     // add sign
+	integer >>= (30 - this->_frac - exponent);                       // align right
+	std::cout << "integer : " << printBitsInt(integer) << " (" << integer << ")\n";
+*/
 }
 
 /*
diff --git a/d02/ex01/fixed b/d02/ex01/fixed
index 7171e14918b5127e3fa16a4723d188018b8c8dce..b9b8e43349dd146896973276a9a2a7762bae7ffa 100755
GIT binary patch
delta 4105
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
V)w=2&qcs9W+FIIsf4uHv`Tvz0<H`U4

delta 5528
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
W`JxqdZrvKmIciR%|92~nJO2-~Lc+lS

diff --git a/d02/ex01/main.cpp b/d02/ex01/main.cpp
index 78e4ce0..5bea77c 100644
--- a/d02/ex01/main.cpp
+++ b/d02/ex01/main.cpp
@@ -9,6 +9,16 @@ int main( void ) {
 	Fixed		b(1000.5979f);
 	std::cout << '\n';
 	Fixed		c(-1105.979f);
+	std::cout << '\n';
+	Fixed		d(3726.7623683f);
+	std::cout << '\n';
+	Fixed		e(4328239.384271721f);
+	std::cout << '\n';
+	Fixed		f(1.11117f);
+	std::cout << '\n';
+	Fixed		g(42.42f);
+	std::cout << '\n';
+	Fixed		h(1234.4321f);
 
 //	Fixed a;
 //	Fixed const b( 10 );