From 8543b33348010a2caab9e2a00c6a20e2ec51a655 Mon Sep 17 00:00:00 2001 From: Alexandre POMMIER Date: Sat, 23 Jul 2022 11:58:33 +0200 Subject: [PATCH] correct cpp00 --- cpp00/ex01/Contact.hpp | 3 +-- cpp00/ex01/PhoneBook.hpp | 5 ++--- cpp01/ex00/Zombie.hpp | 4 ++-- cpp01/ex00/main.cpp | 6 +++--- cpp01/ex00/newZombie.cpp | 3 +-- cpp01/ex00/randomChump.cpp | 4 ++-- cpp01/ex01/main.cpp | 18 +++++++++++++++++- cpp01/ex01/zombieHorde.cpp | 5 +---- cpp02/ex00/Fixed.cpp | 10 +++++++++- cpp02/ex00/Fixed.hpp | 4 +++- cpp02/ex02/Fixed.cpp | 2 +- cpp02/ex02/main.cpp | 23 ++++++++++++----------- 12 files changed, 54 insertions(+), 33 deletions(-) diff --git a/cpp00/ex01/Contact.hpp b/cpp00/ex01/Contact.hpp index 08abfc8..c57692d 100644 --- a/cpp00/ex01/Contact.hpp +++ b/cpp00/ex01/Contact.hpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/15 10:37:15 by apommier #+# #+# */ -/* Updated: 2022/07/21 09:55:59 by apommier ### ########.fr */ +/* Updated: 2022/07/22 12:57:52 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,7 +32,6 @@ class Contact { private: - std::string _first_name; std::string _last_name; std::string _nickname; diff --git a/cpp00/ex01/PhoneBook.hpp b/cpp00/ex01/PhoneBook.hpp index 06fe66a..0492fb8 100644 --- a/cpp00/ex01/PhoneBook.hpp +++ b/cpp00/ex01/PhoneBook.hpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/15 10:37:24 by apommier #+# #+# */ -/* Updated: 2022/07/22 12:32:50 by apommier ### ########.fr */ +/* Updated: 2022/07/22 12:57:45 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,9 +24,8 @@ class PhoneBook { void StoreContact(Contact *NewContact); void PrintContact(int index); void PrintIndex(); - //void deleteContact(); - private: + private: int _NbrContact; int _nbrContactSet; diff --git a/cpp01/ex00/Zombie.hpp b/cpp01/ex00/Zombie.hpp index 9086f0a..b42f0ca 100644 --- a/cpp01/ex00/Zombie.hpp +++ b/cpp01/ex00/Zombie.hpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/08 16:30:22 by apommier #+# #+# */ -/* Updated: 2022/06/10 13:22:55 by apommier ### ########.fr */ +/* Updated: 2022/07/22 12:57:34 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -27,5 +27,5 @@ class Zombie { }; -void randomChump(std::string name); +void randomChump(std::string name); Zombie *newZombie(std::string name); diff --git a/cpp01/ex00/main.cpp b/cpp01/ex00/main.cpp index 2ee85d8..5567de8 100644 --- a/cpp01/ex00/main.cpp +++ b/cpp01/ex00/main.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/08 16:30:06 by apommier #+# #+# */ -/* Updated: 2022/06/10 13:20:28 by apommier ### ########.fr */ +/* Updated: 2022/07/22 13:01:54 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,11 +14,11 @@ int main() { - std::cout << " --Zombie on the Heap--" << std::endl; + std::cout << "--Zombie on the Heap--" << std::endl; Zombie *heap = newZombie("Bob"); heap->announce(); delete heap; - std::cout << " --Zombie on the Stack--" << std::endl; + std::cout << "--Zombie on the Stack--" << std::endl; randomChump("John"); return (0); } \ No newline at end of file diff --git a/cpp01/ex00/newZombie.cpp b/cpp01/ex00/newZombie.cpp index a258466..11ed1d4 100644 --- a/cpp01/ex00/newZombie.cpp +++ b/cpp01/ex00/newZombie.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/08 16:30:16 by apommier #+# #+# */ -/* Updated: 2022/06/10 12:34:21 by apommier ### ########.fr */ +/* Updated: 2022/07/22 12:58:18 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,6 +17,5 @@ Zombie *newZombie(std::string name) Zombie *newZombie; newZombie = new Zombie(name); - //newZombie->announce(); return (newZombie); } diff --git a/cpp01/ex00/randomChump.cpp b/cpp01/ex00/randomChump.cpp index 5b6b09e..83d2460 100644 --- a/cpp01/ex00/randomChump.cpp +++ b/cpp01/ex00/randomChump.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/08 16:30:17 by apommier #+# #+# */ -/* Updated: 2022/06/10 12:41:50 by apommier ### ########.fr */ +/* Updated: 2022/07/22 12:58:36 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,6 +15,6 @@ void randomChump(std::string name) { Zombie newZombie(name); - + newZombie.announce(); } \ No newline at end of file diff --git a/cpp01/ex01/main.cpp b/cpp01/ex01/main.cpp index e661e37..a60a19b 100644 --- a/cpp01/ex01/main.cpp +++ b/cpp01/ex01/main.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/08 16:30:06 by apommier #+# #+# */ -/* Updated: 2022/06/10 14:05:05 by apommier ### ########.fr */ +/* Updated: 2022/07/22 13:14:47 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,6 +19,22 @@ int main() std::cout << "--Zombie Horde--" << std::endl; Horde = zombieHorde(nbZombie, "Bob"); + for (int i = 0; i < nbZombie; i++) + { + std::cout << i << " "; + Horde[i].announce(); + } delete[] Horde; + + nbZombie = 20; + std::cout << std::endl << "--Zombie Horde2--" << std::endl; + Horde = zombieHorde(nbZombie, "Bob2"); + for (int i = 0; i < nbZombie; i++) + { + std::cout << i << " "; + Horde[i].announce(); + } + delete[] Horde; + return (0); } \ No newline at end of file diff --git a/cpp01/ex01/zombieHorde.cpp b/cpp01/ex01/zombieHorde.cpp index c2f2e01..abf01c8 100644 --- a/cpp01/ex01/zombieHorde.cpp +++ b/cpp01/ex01/zombieHorde.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/10 13:44:22 by apommier #+# #+# */ -/* Updated: 2022/06/10 13:57:30 by apommier ### ########.fr */ +/* Updated: 2022/07/22 13:10:33 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,9 +18,6 @@ Zombie *zombieHorde(int N, std::string name) Horde = new Zombie[N]; while (N--) - { Horde[N].setName(name); - //Horde[N].announce(); - } return (Horde); } \ No newline at end of file diff --git a/cpp02/ex00/Fixed.cpp b/cpp02/ex00/Fixed.cpp index 3b2527b..2fb231a 100644 --- a/cpp02/ex00/Fixed.cpp +++ b/cpp02/ex00/Fixed.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/22 00:58:04 by apommier #+# #+# */ -/* Updated: 2022/06/22 15:28:59 by apommier ### ########.fr */ +/* Updated: 2022/07/22 13:23:40 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,3 +40,11 @@ void Fixed::setRawBits(int const raw) std::cout << "setRawBits member function called\n"; this->_value = raw; } + +Fixed & Fixed::operator=(const Fixed& op) +{ + std::cout << "Assignation operator called" << std::endl; + if (this != &op) + this->_value = op.getRawBits(); + return (*this); +} diff --git a/cpp02/ex00/Fixed.hpp b/cpp02/ex00/Fixed.hpp index 225627c..ed6d20d 100644 --- a/cpp02/ex00/Fixed.hpp +++ b/cpp02/ex00/Fixed.hpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/22 00:58:18 by apommier #+# #+# */ -/* Updated: 2022/06/22 15:25:06 by apommier ### ########.fr */ +/* Updated: 2022/07/22 13:23:04 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -31,4 +31,6 @@ class Fixed { const static int _fraction = 8; }; +std::ostream &operator<<(std::ostream &out, const Fixed &nbr); + #endif \ No newline at end of file diff --git a/cpp02/ex02/Fixed.cpp b/cpp02/ex02/Fixed.cpp index 2076e95..13a0ff8 100644 --- a/cpp02/ex02/Fixed.cpp +++ b/cpp02/ex02/Fixed.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/22 15:31:03 by apommier #+# #+# */ -/* Updated: 2022/07/18 14:44:52 by apommier ### ########.fr */ +/* Updated: 2022/07/22 13:36:04 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/cpp02/ex02/main.cpp b/cpp02/ex02/main.cpp index 6851b97..8ab7b92 100644 --- a/cpp02/ex02/main.cpp +++ b/cpp02/ex02/main.cpp @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/06/22 15:31:09 by apommier #+# #+# */ -/* Updated: 2022/07/13 03:54:43 by apommier ### ########.fr */ +/* Updated: 2022/07/22 13:29:02 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,26 +20,27 @@ int main( void ) float test = a.getRawBits(); std::cout << test << std::endl; - std::cout << "1--" << std::endl; + std::cout << "--1--" << std::endl; std::cout << ++test << std::endl; - std::cout << "2--" << std::endl; + std::cout << "--2--" << std::endl; std::cout << test << std::endl; - std::cout << "3--" << std::endl; + std::cout << "--3--" << std::endl; std::cout << test++ << std::endl; - std::cout << "4--" << std::endl; + std::cout << "--4--" << std::endl; std::cout << test << std::endl; - std::cout << "5--" << std::endl; + std::cout << "--5--" << std::endl; + std::cout << "--0--" << std::endl; std::cout << a << std::endl; - std::cout << "1" << std::endl; + std::cout << "--1--" << std::endl; std::cout << ++a << std::endl; - std::cout << "2" << std::endl; + std::cout << "--2--" << std::endl; std::cout << a << std::endl; - std::cout << "3" << std::endl; + std::cout << "--3--" << std::endl; std::cout << a++ << std::endl; - std::cout << "4" << std::endl; + std::cout << "--4--" << std::endl; std::cout << a << std::endl; - std::cout << "5" << std::endl; + std::cout << "--5--" << std::endl; std::cout << b << std::endl;