42/42_INT_09_piscine_cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

d02 ex02 multiplications sans float et sans long pbm abandon

Browse Source
This commit is contained in:
Hugo LAMY
2022-02-18 17:01:29 +01:00
parent 787336b06d
commit 6d2c0f9f29
7 changed files with 214 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
d02/ex02/Fixed.cpp
View File

@@ -1,6 +1,5 @@
#include "Fixed.hpp"
/*
* functions to print numbers in binary
* for the float, found help from stackoverflow :
@@ -125,15 +124,90 @@ bool Fixed::operator!=(Fixed const & rhs) const {
return this->toFloat() != rhs.toFloat();
}
Fixed Fixed::operator+ ( Fixed const & rhs ) const {
return Fixed( this->toFloat() + rhs.toFloat() );
Fixed result(*this);
result._value += rhs._value;
return (result);
}
Fixed Fixed::operator- ( Fixed const & rhs ) const {
return Fixed( this->toFloat() - rhs.toFloat() );
Fixed result(*this);
result._value -= rhs._value;
return (result);
}
Fixed Fixed::operator* ( Fixed const & rhs ) const {
return Fixed( this->toFloat() * rhs.toFloat() );
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;
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 Fixed::operator++() {

25
d02/ex02/color.h Normal file
View File

@@ -0,0 +1,25 @@
#ifndef COLOR_H
# define COLOR_H
# define GRAY "\e[0;30m"
# define RED "\e[0;31m"
# define GREEN "\e[0;32m"
# define YELLOW "\e[0;33m"
# define BLUE "\e[0;34m"
# define PURPLE "\e[0;35m"
# define CYAN "\e[0;36m"
# define WHITE "\e[0;37m"
# define B_GRAY "\e[1;30m"
# define B_RED "\e[1;31m"
# define B_GREEN "\e[1;32m"
# define B_YELLOW "\e[1;33m"
# define B_BLUE "\e[1;34m"
# define B_PURPLE "\e[1;35m"
# define B_CYAN "\e[1;36m"
# define B_WHITE "\e[1;37m"
# define RESET "\e[0m"
#endif

185
d02/ex02/main.cpp
View File

@@ -1,6 +1,9 @@
#include "Fixed.hpp"
#include <iostream>
#include <iomanip>
#include "color.h"
#define COLOR B_YELLOW
int main( void ) {
@@ -17,83 +20,111 @@ int main( void ) {
std::cout << Fixed::max( a, b ) << std::endl;
// Fixed c(10);
// Fixed d(5);
// Fixed e;
//
// std::cout << "c: " << c << '\n';
// std::cout << "d: " << d << "\n\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 << "e > c ? : " << (e > c) << '\n';
// std::cout << "e > d ? : " << (e > d) << "\n\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 << "e < c ? : " << (e < c) << '\n';
// std::cout << "e < d ? : " << (e < d) << "\n\n";
// // "<="
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e <= c ? : " << (e <= c) << '\n';
// std::cout << "e <= d ? : " << (e <= d) << "\n\n";
// // ">="
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e >= c ? : " << (e >= c) << '\n';
// std::cout << "e >= d ? : " << (e >= d) << "\n\n";
// // "=="
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e == c ? : " << (e == c) << '\n';
// std::cout << "e == d ? : " << (e == d) << "\n\n";
// // "!="
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e != c ? : " << (e != c) << '\n';
// std::cout << "e != d ? : " << (e != d) << "\n\n";
// // "+"
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e = c + d : " << (e = c + d) << "\n";
// std::cout << "e = e + c + d : " << (e = e + c + d) << "\n\n";
// // "-"
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e = d - e ? : " << (e = d - e) << "\n";
// std::cout << "e = c - d - e ? : " << (e = c - d - e) << "\n\n";
// // "*"
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e = d * c ? : " << (e = d * c) << "\n";
// std::cout << "e = d * c * c ? : " << (e = d * c * c) << "\n\n";
// // "/"
// std::cout << "e:" << e << " c:" << c << " d:" << d << '\n';
// std::cout << "e = d / c ? : " << (e = d / c) << "\n";
// std::cout << "e = d / c / e ? : " << (e = d / c / e) << "\n\n";
// // "+ - * /"
// Fixed f;
// Fixed g;
// std::cout << "f:" << f << " e:" << e << " c:" << c << " d:" << d << '\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\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\n";
// // "++x"
// e = Fixed(2);
// std::cout << "e : " << e << '\n';
// std::cout << "++e : " << ++e << " ; e : " << e << "\n\n";
// // "--x"
// std::cout << "e : " << e << '\n';
// std::cout << "--e : " << --e << " ; e : " << e << "\n\n";
// // "x++"
// std::cout << "e : " << e << '\n';
// std::cout << "e++ : " << e++ << " ; e : " << e << "\n\n";
// // "x--"
// std::cout << "e : " << e << '\n';
// std::cout << "e-- : " << e-- << " ; e : " << e << "\n\n";
Fixed c(10);
Fixed d(5);
Fixed e;
std::cout << "c: " << c << '\n';
std::cout << "d: " << d << "\n\n";
// ">"
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 << "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 << "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 << "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 << "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 << "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 << "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 << "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 << "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 << "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 << "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 << "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 << "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 << "e = d / c ? : " << (e = d / c) << "\n";
std::cout << "e = d / c / e ? : " << (e = d / c / e) << '\n';
// "+ - * /"
std::cout << "\n" COLOR "operator + - * /" RESET "\n";
Fixed g;
std::cout << "f:" << f << " e:" << e << " c:" << c << " d:" << d << '\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 << "++e : " << ++e << " ; e : " << e << '\n';
// "--x"
std::cout << "\n" COLOR "operator --o" RESET "\n";
std::cout << "e : " << e << '\n';
std::cout << "--e : " << --e << " ; e : " << e << '\n';
// "x++"
std::cout << "\n" COLOR "operator o++" RESET "\n";
std::cout << "e : " << e << '\n';
std::cout << "e++ : " << e++ << " ; e : " << e << '\n';
// "x--"
std::cout << "\n" COLOR "operator o--" RESET "\n";
std::cout << "e : " << e << '\n';
std::cout << "e-- : " << e-- << " ; e : " << e << '\n';
return 0;
}

BIN
d02/ex02/operators Executable file
View File

Binary file not shown.

5
d03/ex01/ClapTrap.hpp
View File

@@ -10,7 +10,6 @@ class ClapTrap {
public:
ClapTrap( void ); // default/parametric constructor
ClapTrap( std::string name ); // default/parametric constructor
ClapTrap( ClapTrap const & src ); // copy constructor
~ClapTrap( void ); // destructor
@@ -28,7 +27,7 @@ public:
protected:
std::string _name;
std::string const _name;
std::string _class;
int _hit;
int _energy;
@@ -40,6 +39,8 @@ protected:
private:
ClapTrap( void ); // default/parametric constructor
static int _totalNumber;
};

1
d03/ex01/ScavTrap.cpp
View File

@@ -2,7 +2,6 @@
ScavTrap::ScavTrap( std::string name ) : ClapTrap(name) {
_name = name;
_class = "ScavTrap";
_hit = 100;
_energy = 50;

BIN
d03/ex01/robots
View File

Binary file not shown.