From 3433fafd8705fe4f8cdba4451da7bc1c3ccdc638 Mon Sep 17 00:00:00 2001 From: hugogogo Date: Thu, 10 Mar 2022 17:52:05 +0100 Subject: [PATCH] d07 ex00 ajout 1 test --- d07/ex00/Makefile | 5 +-- d07/ex00/{headers => }/Templates.hpp | 0 d07/ex00/colors.h | 25 +++++++++++++ d07/ex00/main.cpp | 52 ++++++++++++++++++++------- d07/ex00/templates | Bin 14704 -> 14728 bytes 5 files changed, 68 insertions(+), 14 deletions(-) rename d07/ex00/{headers => }/Templates.hpp (100%) create mode 100644 d07/ex00/colors.h diff --git a/d07/ex00/Makefile b/d07/ex00/Makefile index ca18bd1..9f3a92d 100644 --- a/d07/ex00/Makefile +++ b/d07/ex00/Makefile @@ -31,8 +31,9 @@ INCLUDES = -I$(D_HEADERS) D_SRCS = . SRCS = main.cpp -D_HEADERS = headers -HEADERS = Templates.hpp +D_HEADERS = . +HEADERS = colors.h \ + Templates.hpp D_OBJS = builds OBJS = $(SRCS:%.$(EXT)=$(D_OBJS)/%.o) diff --git a/d07/ex00/headers/Templates.hpp b/d07/ex00/Templates.hpp similarity index 100% rename from d07/ex00/headers/Templates.hpp rename to d07/ex00/Templates.hpp diff --git a/d07/ex00/colors.h b/d07/ex00/colors.h new file mode 100644 index 0000000..0374e42 --- /dev/null +++ b/d07/ex00/colors.h @@ -0,0 +1,25 @@ +#ifndef COLORS_H +# define COLORS_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 + diff --git a/d07/ex00/main.cpp b/d07/ex00/main.cpp index 434f440..5e9683f 100644 --- a/d07/ex00/main.cpp +++ b/d07/ex00/main.cpp @@ -1,23 +1,51 @@ #include #include +#include "colors.h" #include "Templates.hpp" +#define N_TEST "3" + int main() { - int a = 2; - int b = 3; + int i = 0; - ::swap( a, b ); - std::cout << "a = " << a << ", b = " << b << std::endl; - std::cout << "min( a, b ) = " << ::min( a, b ) << std::endl; - std::cout << "max( a, b ) = " << ::max( a, b ) << std::endl; + std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " + << "tests int :" RESET "\n"; + { + int a = 2; + int b = 3; + + std::cout << "a = " << a << ", b = " << b << "\nswap :\n"; + ::swap( a, b ); + std::cout << "a = " << a << ", b = " << b << "\n"; + std::cout << "min( a, b ) = " << ::min( a, b ) << "\n"; + std::cout << "max( a, b ) = " << ::max( a, b ) << "\n"; + } - std::string c = "chaine1"; - std::string d = "chaine2"; + std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " + << "tests string :" RESET "\n"; + { + std::string a = "chaine1"; + std::string b = "chaine2"; + + std::cout << "a = " << a << ", b = " << b << "\nswap :\n"; + ::swap(a, b); + std::cout << "a = " << a << ", b = " << b << "\n"; + std::cout << "min( a, b ) = " << ::min( a, b ) << "\n"; + std::cout << "max( a, b ) = " << ::max( a, b ) << "\n"; + } - ::swap(c, d); - std::cout << "c = " << c << ", d = " << d << std::endl; - std::cout << "min( c, d ) = " << ::min( c, d ) << std::endl; - std::cout << "max( c, d ) = " << ::max( c, d ) << std::endl; + std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " + << "tests floats :" RESET "\n"; + { + float a = 2.42f; + float b = 32.7f; + + std::cout << "a = " << a << ", b = " << b << "\nswap :\n"; + ::swap( a, b ); + std::cout << "a = " << a << ", b = " << b << "\n"; + std::cout << "min( a, b ) = " << ::min( a, b ) << "\n"; + std::cout << "max( a, b ) = " << ::max( a, b ) << "\n"; + } return 0; } diff --git a/d07/ex00/templates b/d07/ex00/templates index 04b42663519faf605e99d0c3f3e972e753b1bbae..eada0c6067dd09f2defb3d231861699aba433ffa 100755 GIT binary patch literal 14728 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 PT6ZY<_eNSFUH`uUyFj5- delta 4806 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 NX4OdNp>5Xm{{xG@(;ol;