diff --git a/d08/ex00/Makefile b/d08/ex00/Makefile index 09b79b3..5a734bd 100644 --- a/d08/ex00/Makefile +++ b/d08/ex00/Makefile @@ -64,6 +64,9 @@ $(OBJS): $(HEADERS:%=$(D_HEADERS)/%) $(NAME): $(OBJS) $(CC) $(OBJS) -o $@ $(LIBS) +leaks: $(NAME) + valgrind --leak-check=full --show-leak-kinds=all ./$(NAME) + clean: $(RM_OBJS) diff --git a/d08/ex01/< b/d08/ex01/< deleted file mode 100644 index ebb3721..0000000 --- a/d08/ex01/< +++ /dev/null @@ -1,151 +0,0 @@ -#include -#include -#include "colors.h" - -#include "Span.hpp" - -#define N_TEST "1" - -int main() { - int i = 0; - srand(time(NULL)); - - std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " - << "test copy :" RESET "\n"; - { - Span sp = Span(5); - Span sp2 = sp; - Span sp3 = Span(4); - - sp.addNumber(6); - sp.addNumber(3); - sp.addNumber(17); - sp.addNumber(9); - sp.addNumber(11); - - sp3.addNumber(1); - sp3.addNumber(2); - sp3.addNumber(33); - sp3.addNumber(4); - - Span sp4 = Span(sp); - - std::cout << B_BLUE "initial" RESET "\n"; - std::cout << "sp : " << sp << "\n"; - std::cout << "sp2: " << sp2 << "\n"; - std::cout << "sp3: " << sp3 << "\n"; - std::cout << "sp4: " << sp4 << "\n"; - - sp2 = sp; - - std::cout << B_BLUE "sp2 = sp" RESET "\n"; - std::cout << "sp : " << sp << "\n"; - std::cout << "sp2: " << sp2 << "\n"; - std::cout << "sp3: " << sp3 << "\n"; - std::cout << "sp4: " << sp4 << "\n"; - - sp2 = sp3; - - std::cout << B_BLUE "sp2 = sp3" RESET "\n"; - std::cout << "sp : " << sp << "\n"; - std::cout << "sp2: " << sp2 << "\n"; - std::cout << "sp3: " << sp3 << "\n"; - std::cout << "sp4: " << sp4 << "\n"; - - sp3 = sp; - - std::cout << B_BLUE "sp3 = sp" RESET "\n"; - std::cout << "sp : " << sp << "\n"; - std::cout << "sp2: " << sp2 << "\n"; - std::cout << "sp3: " << sp3 << "\n"; - std::cout << "sp4: " << sp4 << "\n"; - - sp4 = Span(sp2); - - std::cout << B_BLUE "sp4 = Span(sp2)" RESET "\n"; - std::cout << "sp : " << sp << "\n"; - std::cout << "sp2: " << sp2 << "\n"; - std::cout << "sp3: " << sp3 << "\n"; - std::cout << "sp4: " << sp4 << "\n"; - } - - std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " - << "test short and long :" RESET "\n"; - { - Span sp = Span(10); - Span sp1 = Span(10); - Span sp2 = Span(10); - - sp.addNumber(43); - sp.addNumber(37); - sp.addNumber(94); - sp.addNumber(18); - sp.addNumber(47); - sp.addNumber(98); - sp.addNumber(69); - sp.addNumber(52); - sp.addNumber(58); - sp.addNumber(63); - - sp1.addNumber(43); - sp1.addNumber(37); - sp1.addNumber(94); - sp1.addNumber(18); - sp1.addNumber(47); - sp1.addNumber(98); - sp1.addNumber(47); - sp1.addNumber(52); - sp1.addNumber(58); - sp1.addNumber(63); - - sp2.addNumber(143); - sp2.addNumber(37); - sp2.addNumber(94); - sp2.addNumber(18); - sp2.addNumber(47); - sp2.addNumber(98); - sp2.addNumber(69); - sp2.addNumber(52); - sp2.addNumber(58); - sp2.addNumber(63); - - std::cout << B_BLUE "sp :" RESET "\n"; - std::cout << sp << "\n"; - std::cout << sp.shortestSpan() << "\n"; - std::cout << sp.longestSpan() << "\n"; - - std::cout << B_BLUE "sp1 :" RESET "\n"; - std::cout << sp1 << "\n"; - std::cout << sp1.shortestSpan() << "\n"; - std::cout << sp1.longestSpan() << "\n"; - - std::cout << B_BLUE "sp2 :" RESET "\n"; - std::cout << sp2 << "\n"; - std::cout << sp2.shortestSpan() << "\n"; - std::cout << sp2.longestSpan() << "\n"; - } - - - std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " - << "test range :" RESET "\n"; - { - Span sp = Span(54); - int arr[] = {42, 35, 65, 12, -10, 3, 7, 45, 21, 98}; - -sp.addNumber(arr, &arr[sizeof arr / sizeof *arr]); -std::cout << sizeof (arr) << "\n"; -std::cout << sizeof (*arr) << "\n"; -while (1) -; - - sp.addNumber(arr); - - std::cout << B_BLUE "sp :" RESET "\n"; - std::cout << sp << "\n"; - std::cout << sp.shortestSpan() << "\n"; - std::cout << sp.longestSpan() << "\n"; - } - - return 0; -} - diff --git a/d08/ex01/main.cpp b/d08/ex01/main.cpp index dba3869..d3b6abd 100644 --- a/d08/ex01/main.cpp +++ b/d08/ex01/main.cpp @@ -4,12 +4,54 @@ #include "Span.hpp" -#define N_TEST "1" +#define N_TEST "6" int main() { int i = 0; srand(time(NULL)); + std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " + << "test 10 000 :" RESET "\n"; + { + unsigned int len = 10000; + Span sp = Span(len); + int arr[len]; + + for (unsigned int i = 0; i < len; i++) + arr[i] = rand() % (10000000000000); + + //sp.addNumber(arr, len); + sp.addNumber(arr, &arr[len]); + + std::cout << B_BLUE "sp :" RESET "\n"; + std::cout << sp << "\n"; + std::cout << sp.shortestSpan() << "\n"; + std::cout << sp.longestSpan() << "\n"; + } + + std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " + << "test 50 000 :" RESET "\n"; + { + unsigned int len = 50000; + Span sp = Span(len); + int arr[len]; + + for (unsigned int i = 0; i < len; i++) + { + arr[i] = rand() % (1000000000000000000); + if (arr[i] % 2) + arr[i] *= -1; + } + + //sp.addNumber(arr, len); + sp.addNumber(arr, &arr[len]); + + std::cout << B_BLUE "sp :" RESET "\n"; + std::cout << sp << "\n"; + std::cout << sp.shortestSpan() << "\n"; + std::cout << sp.longestSpan() << "\n"; + } + std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " << "test copy :" RESET "\n"; { @@ -222,48 +264,6 @@ int main() { std::cout << sp.longestSpan() << "\n"; } - std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " - << "test 10 000 :" RESET "\n"; - { - unsigned int len = 10000; - Span sp = Span(len); - int arr[len]; - - for (unsigned int i = 0; i < len; i++) - arr[i] = rand() % (10000000000000); - - //sp.addNumber(arr, len); - sp.addNumber(arr, &arr[len]); - - std::cout << B_BLUE "sp :" RESET "\n"; - std::cout << sp << "\n"; - std::cout << sp.shortestSpan() << "\n"; - std::cout << sp.longestSpan() << "\n"; - } - - std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " - << "test 50 000 :" RESET "\n"; - { - unsigned int len = 50000; - Span sp = Span(len); - int arr[len]; - - for (unsigned int i = 0; i < len; i++) - { - arr[i] = rand() % (1000000000000000000); - if (arr[i] % 2) - arr[i] *= -1; - } - - //sp.addNumber(arr, len); - sp.addNumber(arr, &arr[len]); - - std::cout << B_BLUE "sp :" RESET "\n"; - std::cout << sp << "\n"; - std::cout << sp.shortestSpan() << "\n"; - std::cout << sp.longestSpan() << "\n"; - } - return 0; } diff --git a/d08/ex01/span b/d08/ex01/span deleted file mode 100755 index e914e3a..0000000 Binary files a/d08/ex01/span and /dev/null differ diff --git a/d08/ex02/main.cpp b/d08/ex02/main.cpp index 8caf72f..fcaae06 100644 --- a/d08/ex02/main.cpp +++ b/d08/ex02/main.cpp @@ -2,7 +2,7 @@ #include "colors.h" #include "MutantStack.hpp" -#define N_TEST "1" +#define N_TEST "2" int main() { int i = 0; diff --git a/d08/ex02/mutantstack b/d08/ex02/mutantstack deleted file mode 100755 index 80bd292..0000000 Binary files a/d08/ex02/mutantstack and /dev/null differ