diff --git a/d08/ex00/easyfind b/d08/ex00/easyfind index 1c3bb6e..c5468ea 100755 Binary files a/d08/ex00/easyfind and b/d08/ex00/easyfind differ diff --git a/d08/ex00/easyfind.hpp b/d08/ex00/easyfind.hpp index 9496691..a6a5109 100644 --- a/d08/ex00/easyfind.hpp +++ b/d08/ex00/easyfind.hpp @@ -6,7 +6,7 @@ class easyfindException : public std::exception { virtual char const *what(void) const throw() { - return "not found"; + return B_RED "not found" RESET; } }; diff --git a/d08/ex00/main.cpp b/d08/ex00/main.cpp index 4ae39e5..2e0a24b 100644 --- a/d08/ex00/main.cpp +++ b/d08/ex00/main.cpp @@ -10,10 +10,10 @@ #define N_TEST "3" template < typename T > -void standardTest(T container, int test) { +void standardTest(T container, int start, int end, int test) { typename T::const_iterator it; - for (int i = 65 ; i < 91 ; i++) + for (int i = start ; i < end ; i++) container.push_back(i); for (it = container.begin(); it != container.end(); it++) std::cout << *it << ": " << &*it << "\n"; @@ -33,28 +33,73 @@ int main() { std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " << "tests list :" RESET "\n"; { - std::list container; - standardTest(container, 70); - std::list container2; - standardTest(container2, 'T'); + std::cout << B_BLUE "char A - L; find H :" RESET "\n"; + std::list container; + standardTest(container, 'A', 'L', 'H'); + + std::cout << B_BLUE "char A - L; find L :" RESET "\n"; + std::list container1; + standardTest(container1, 'A', 'L', 'L'); + + std::cout << B_BLUE "int -5 - 5; find 4 :" RESET "\n"; + std::list container2; + standardTest(container2, -5, 5, 4); + + std::cout << B_BLUE "int -5 - 5; find 5 :" RESET "\n"; + std::list container3; + standardTest(container3, -5, 5, 5); + + std::cout << B_BLUE "int -5 - 5; find 6 :" RESET "\n"; + std::list container4; + standardTest(container4, -5, 5, 6); } std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " << "tests vector :" RESET "\n"; { - std::vector container; - standardTest(container, 70); - std::vector container2; - standardTest(container2, 'T'); + std::cout << B_BLUE "char A - L; find H :" RESET "\n"; + std::vector container; + standardTest(container, 'A', 'L', 'H'); + + std::cout << B_BLUE "char A - L; find L :" RESET "\n"; + std::vector container1; + standardTest(container1, 'A', 'L', 'L'); + + std::cout << B_BLUE "int -5 - 5; find 4 :" RESET "\n"; + std::vector container2; + standardTest(container2, -5, 5, 4); + + std::cout << B_BLUE "int -5 - 5; find 5 :" RESET "\n"; + std::vector container3; + standardTest(container3, -5, 5, 5); + + std::cout << B_BLUE "int -5 - 5; find 6 :" RESET "\n"; + std::vector container4; + standardTest(container4, -5, 5, 6); } std::cout << B_YELLOW "\n[" << ++i << "/" N_TEST "] " << "tests deque :" RESET "\n"; { - std::deque container; - standardTest(container, 70); - std::deque container2; - standardTest(container2, 'T'); + std::cout << B_BLUE "char A - L; find H :" RESET "\n"; + std::deque container; + standardTest(container, 'A', 'L', 'H'); + + std::cout << B_BLUE "char A - L; find L :" RESET "\n"; + std::deque container1; + standardTest(container1, 'A', 'L', 'L'); + + std::cout << B_BLUE "int -5 - 5; find 4 :" RESET "\n"; + std::deque container2; + standardTest(container2, -5, 5, 4); + + std::cout << B_BLUE "int -5 - 5; find 5 :" RESET "\n"; + std::deque container3; + standardTest(container3, -5, 5, 5); + + std::cout << B_BLUE "int -5 - 5; find 6 :" RESET "\n"; + std::deque container4; + standardTest(container4, -5, 5, 6); } return 0;