From b08663e74e15732ed9e500bc5f509bc3bf64366e Mon Sep 17 00:00:00 2001 From: hugogogo Date: Mon, 14 Feb 2022 21:06:36 +0100 Subject: [PATCH] creation d02 ex02 --- d02/README.md | 26 ++++----- d02/ex01/Fixed.cpp | 60 +++++++++------------ d02/ex01/Fixed.hpp | 5 +- d02/ex01/fixed | Bin 19032 -> 0 bytes d02/ex01/main.cpp | 47 ++++++---------- d02/ex02/Fixed.cpp | 132 +++++++++++++++++++++++++++++++++++++++++++++ d02/ex02/Fixed.hpp | 35 ++++++++++++ d02/ex02/Makefile | 62 +++++++++++++++++++++ d02/ex02/main.cpp | 24 +++++++++ 9 files changed, 310 insertions(+), 81 deletions(-) delete mode 100755 d02/ex01/fixed create mode 100644 d02/ex02/Fixed.cpp create mode 100644 d02/ex02/Fixed.hpp create mode 100644 d02/ex02/Makefile create mode 100644 d02/ex02/main.cpp diff --git a/d02/README.md b/d02/README.md index c85ea7b..935d869 100644 --- a/d02/README.md +++ b/d02/README.md @@ -58,7 +58,7 @@ DECIMALE VS BINARY --------------------------------------------------------- NEGATIVS INTEGERS --------------------------------------------------------- - +``` 5 0101 0 0000 0 0000 0000 0000 0000 0000 0000 0000 0000 1010 + 1 1 0001 1 0000 0000 0000 0000 0000 0000 0000 0001 -5 1011 2 0010 2 0000 0000 0000 0000 0000 0000 0000 0010 @@ -79,13 +79,14 @@ NEGATIVS INTEGERS 13 1101 -3 1111 1111 1111 1111 1111 1111 1111 1101 14 1110 -2 1111 1111 1111 1111 1111 1111 1111 1110 15 1111 -1 1111 1111 1111 1111 1111 1111 1111 1111 - +``` --------------------------------------------------------- FLOATS --------------------------------------------------------- https://stackoverflow.com/questions/7644699/how-are-floating-point-numbers-stored-in-memory +``` 1.....................23 8......1 seeeeeeeemmmmmmmmmmmmmmmmmmmmmmm meaning @@ -93,20 +94,21 @@ https://stackoverflow.com/questions/7644699/how-are-floating-point-numbers-store signe exponent mantis - +``` 1.175494351 * 10^-38 < ... > 3.40282347 * 10^+38 + 2x10^-1 = 0.2x10^0 = 0.02x10^1 = 0.2 -x 00000000 xxxxxxxx xxxxxxxx xxxxxxx special meanings (see bellow) -x 11111111 xxxxxxxx xxxxxxxx xxxxxxx // -x 00000001 xxxxxxxx xxxxxxxx xxxxxxx smallest exponent (-126) -x 01111111 xxxxxxxx xxxxxxxx xxxxxxx 0 is middle exponent (254 / 2 = 127) -x 11111110 xxxxxxxx xxxxxxxx xxxxxxx biggest exponent (+127) +- x 00000000 xxxxxxxx xxxxxxxx xxxxxxx special meanings (see bellow) +- x 11111111 xxxxxxxx xxxxxxxx xxxxxxx // +- x 00000001 xxxxxxxx xxxxxxxx xxxxxxx smallest exponent (-126) +- x 01111111 xxxxxxxx xxxxxxxx xxxxxxx 0 is middle exponent (254 / 2 = 127) +- x 11111110 xxxxxxxx xxxxxxxx xxxxxxx biggest exponent (+127) -x 00000000 00000000 00000000 0000000 0 (x can still be + or -) -x 11111111 00000000 00000000 0000000 +/- infinity -x 11111111 xxxxxxxx xxxxxxxx xxxxxx1 NaN (at least one non-zero mantissa digit) -x 00000000 xxxxxxxx xxxxxxxx xxxxxx1 denormalized numbers (same for mantissa) +- x 00000000 00000000 00000000 0000000 0 (x can still be + or -) +- x 11111111 00000000 00000000 0000000 +/- infinity +- x 11111111 xxxxxxxx xxxxxxxx xxxxxx1 NaN (at least one non-zero mantissa digit) +- x 00000000 xxxxxxxx xxxxxxxx xxxxxx1 denormalized numbers (same for mantissa) --------------------------------------------------------- CONVERSIONS diff --git a/d02/ex01/Fixed.cpp b/d02/ex01/Fixed.cpp index 7c54d70..163a98b 100644 --- a/d02/ex01/Fixed.cpp +++ b/d02/ex01/Fixed.cpp @@ -53,18 +53,18 @@ int const Fixed::_max = -1U >> (_frac +1); */ Fixed::Fixed() : _value(0) { -// std::cout << "Default constructor called" << '\n'; + std::cout << "Default constructor called" << '\n'; return; } Fixed::Fixed(Fixed const & src) { -// std::cout << "Copy constructor called" << '\n'; + std::cout << "Copy constructor called" << '\n'; *this = src; return; } Fixed::~Fixed( void ) { -// std::cout << "Destructor called" << '\n'; + std::cout << "Destructor called" << '\n'; return; } @@ -73,42 +73,21 @@ Fixed::~Fixed( void ) { */ Fixed::Fixed(int integer) { -// std::cout << "Int constructor called" << '\n'; + std::cout << "Int constructor called" << '\n'; if (integer < ~this->_max || integer > this->_max) - { std::cout << "error: integer out of range" << '\n'; - return; - } -// std::cout << "integer : " << printBitsInt(integer) << " (" << integer << ")\n"; - this->_value = integer << this->_frac; -// std::cout << "_value : " << printBitsInt(this->_value) << " (" << this->_value << ")\n"; + else + this->_value = integer << this->_frac; } Fixed::Fixed(float const floater) { -// std::cout << "Float constructor called" << '\n'; + std::cout << "Float constructor called" << '\n'; if (floater < ~this->_max || floater > this->_max) - { std::cout << "error: float out of range" << '\n'; - return; - } -// std::cout << "floater : " << printBitsFloat(floater) << " (" << floater << ")\n"; - this->_value = floater * (1 << this->_frac); -// std::cout << "_value : " << printBitsInt(this->_value) << " (" << this->_value << ")\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 + 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"; -*/ + else + this->_value = floater * (1 << this->_frac); } /* @@ -116,19 +95,17 @@ Fixed::Fixed(float const floater) { */ Fixed & Fixed::operator=( Fixed const & rhs ) { -// std::cout << "Copy assignment operator called" << '\n'; + std::cout << "Copy assignment operator called" << '\n'; if ( this != &rhs ) this->_value = rhs.getRawBits(); - return *this; } /* - * other functions + * functions that returns _value */ int Fixed::getRawBits( void ) const { -// std::cout << "getRawBits member function called" << '\n'; return this->_value; } @@ -136,9 +113,20 @@ void Fixed::setRawBits( int const raw ) { this->_value = raw; } -void Fixed::toFloat( void ) const {} int Fixed::toInt( void ) const { - return 0; + 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 + * took here : https://github.com/pgomez-a/42_CPP_Piscine/blob/master/cpp02/ex01/Fixed.cpp + */ +std::ostream & operator<<(std::ostream & out, Fixed const & fixed) +{ + out << fixed.toFloat(); + return (out); +} diff --git a/d02/ex01/Fixed.hpp b/d02/ex01/Fixed.hpp index 5b5e594..42619aa 100644 --- a/d02/ex01/Fixed.hpp +++ b/d02/ex01/Fixed.hpp @@ -3,6 +3,7 @@ #include #include +#include class Fixed { @@ -18,7 +19,7 @@ public: int getRawBits(void) const; void setRawBits(int const raw); - void toFloat(void) const; + float toFloat(void) const; int toInt(void) const; private: @@ -29,4 +30,6 @@ private: }; +std::ostream & operator<<(std::ostream & out, Fixed const & fixed); + #endif diff --git a/d02/ex01/fixed b/d02/ex01/fixed deleted file mode 100755 index b9b8e43349dd146896973276a9a2a7762bae7ffa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19032 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 PS*?;PU`Mr*4Hf?byv%hj diff --git a/d02/ex01/main.cpp b/d02/ex01/main.cpp index 5bea77c..13402e6 100644 --- a/d02/ex01/main.cpp +++ b/d02/ex01/main.cpp @@ -3,39 +3,22 @@ int main( void ) { -// Fixed a(1105979538); - Fixed a(1105979); - std::cout << '\n'; - 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 ); + Fixed const c( 42.42f ); + Fixed const d( b ); -// Fixed a; -// Fixed const b( 10 ); -// Fixed const c( 42.42f ); -// Fixed const d( b ); -// -// a = Fixed( 1234.4321f ); -// -// std::cout << "a is " << a << std::endl; -// std::cout << "b is " << b << std::endl; -// std::cout << "c is " << c << std::endl; -// std::cout << "d is " << d << std::endl; -// -// std::cout << "a is " << a.toInt() << " as integer" << std::endl; -// std::cout << "b is " << b.toInt() << " as integer" << std::endl; -// std::cout << "c is " << c.toInt() << " as integer" << std::endl; -// std::cout << "d is " << d.toInt() << " as integer" << std::endl; + a = Fixed( 1234.4321f ); + + std::cout << "a is " << a << std::endl; + std::cout << "b is " << b << std::endl; + std::cout << "c is " << c << std::endl; + std::cout << "d is " << d << std::endl; + + std::cout << "a is " << a.toInt() << " as integer" << std::endl; + std::cout << "b is " << b.toInt() << " as integer" << std::endl; + std::cout << "c is " << c.toInt() << " as integer" << std::endl; + std::cout << "d is " << d.toInt() << " as integer" << std::endl; return 0; } diff --git a/d02/ex02/Fixed.cpp b/d02/ex02/Fixed.cpp new file mode 100644 index 0000000..163a98b --- /dev/null +++ b/d02/ex02/Fixed.cpp @@ -0,0 +1,132 @@ +#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 *)# + 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) { + std::cout << "Default constructor called" << '\n'; + return; +} + +Fixed::Fixed(Fixed const & src) { + std::cout << "Copy constructor called" << '\n'; + *this = src; + return; +} + +Fixed::~Fixed( void ) { + std::cout << "Destructor called" << '\n'; + return; +} + +/* + * int and float constructors + */ + +Fixed::Fixed(int integer) { + std::cout << "Int constructor called" << '\n'; + + 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) { + std::cout << "Float constructor called" << '\n'; + + if (floater < ~this->_max || floater > this->_max) + std::cout << "error: float out of range" << '\n'; + else + this->_value = floater * (1 << this->_frac); +} + +/* + * assignement operator + */ + +Fixed & Fixed::operator=( Fixed const & rhs ) { + std::cout << "Copy assignment operator called" << '\n'; + if ( this != &rhs ) + this->_value = rhs.getRawBits(); + return *this; +} + +/* + * 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 + * took here : https://github.com/pgomez-a/42_CPP_Piscine/blob/master/cpp02/ex01/Fixed.cpp + */ + +std::ostream & operator<<(std::ostream & out, Fixed const & fixed) +{ + out << fixed.toFloat(); + return (out); +} diff --git a/d02/ex02/Fixed.hpp b/d02/ex02/Fixed.hpp new file mode 100644 index 0000000..42619aa --- /dev/null +++ b/d02/ex02/Fixed.hpp @@ -0,0 +1,35 @@ +#ifndef FIXED_HPP +# define FIXED_HPP + +#include +#include +#include + +class Fixed { + +public: + + Fixed(void); // default/parametric constructor + Fixed(Fixed const & src); // copy constructor + ~Fixed(void); // destructor + Fixed(int integer); + Fixed(float const floater); + + Fixed & operator=(Fixed const & rhs); // assignement operator + + int getRawBits(void) const; + void setRawBits(int const raw); + float toFloat(void) const; + int toInt(void) const; + +private: + + int _value; + static int const _frac; + static int const _max; + +}; + +std::ostream & operator<<(std::ostream & out, Fixed const & fixed); + +#endif diff --git a/d02/ex02/Makefile b/d02/ex02/Makefile new file mode 100644 index 0000000..0712445 --- /dev/null +++ b/d02/ex02/Makefile @@ -0,0 +1,62 @@ +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # +# . name = value . name is case sensitive # +# VARIABLES . or name = value \ . use VPATH only for .c # +# . value . or .cpp # +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # + +NAME = fixed + +CC = clang++ +CFLAGS = -Wall -Wextra -Werror $(INCLUDES) -std=c++98 + +VPATH = $(D_SRCS) + +LIBS = + +INCLUDES = -I$(D_HEADERS) + +D_SRCS = . +SRCS = main.cpp \ + Fixed.cpp + +D_HEADERS = . +HEADERS = Fixed.hpp + +D_OBJS = builds +OBJS = $(SRCS:%.cpp=$(D_OBJS)/%.o) + +RM_D_OBJS = rm -rf $(D_OBJS) +ifeq "$(D_OBJS)" "." +RM_D_OBJS = +endif + + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # +# . target: prerequisites . $@ : target # +# RULES . recipe . $< : 1st prerequisite # +# . recipe . $^ : all prerequisites # +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # + +all: $(NAME) + +$(D_OBJS)/%.o: %.cpp | $(D_OBJS) + $(CC) $(CFLAGS) -c $< -o $@ + +$(D_OBJS): + mkdir $@ + +$(OBJS): $(HEADERS:%=$(D_HEADERS)/%) + +$(NAME): $(OBJS) + $(CC) $(OBJS) -o $@ $(LIBS) + +clean: + rm -f $(OBJS) + +fclean: clean + rm -f $(NAME) + $(RM_D_OBJS) + +re: fclean all + +.PHONY : all clean fclean re bonus run valgrind diff --git a/d02/ex02/main.cpp b/d02/ex02/main.cpp new file mode 100644 index 0000000..13402e6 --- /dev/null +++ b/d02/ex02/main.cpp @@ -0,0 +1,24 @@ +#include "Fixed.hpp" +#include + +int main( void ) { + + Fixed a; + Fixed const b( 10 ); + Fixed const c( 42.42f ); + Fixed const d( b ); + + a = Fixed( 1234.4321f ); + + std::cout << "a is " << a << std::endl; + std::cout << "b is " << b << std::endl; + std::cout << "c is " << c << std::endl; + std::cout << "d is " << d << std::endl; + + std::cout << "a is " << a.toInt() << " as integer" << std::endl; + std::cout << "b is " << b.toInt() << " as integer" << std::endl; + std::cout << "c is " << c.toInt() << " as integer" << std::endl; + std::cout << "d is " << d.toInt() << " as integer" << std::endl; + + return 0; +}