push

ex00/Main.cpp

@@ -9,24 +9,44 @@ int main()
 	vec.push_back(42);
 	vec.push_back(56);
 	vec.push_back(87);
-	std::cout << "Test vector container" << std::endl << "Find 42 (pos 2)" << std::endl;
-	std::vector<int>::iterator it = easyfind(vec, 42);
-	std::cout << "Find " << *it << std::endl;
 
 	std::list<int> lst;
 	lst.push_back(10);
 	lst.push_back(47);
 	lst.push_back(42);
 	lst.push_back(87);
-	std::cout << "Test list container" << std::endl << "Find 42 (pos 3)" << std::endl;
-	std::list<int>::iterator it2 = easyfind(lst, 42);
-	std::cout << "Find " << *it2 << std::endl;
 
-	std::cout << "Test vector container" << std::endl << "Find 41 (not here !)" << std::endl;
+	std::cout << "--- TEST 1 : vector, search 10 (present) ---" << std::endl;
 	try {
-		std::vector<int>::iterator it3 = easyfind(vec, 41);
+		std::vector<int>::iterator it = easyfind(vec, 10);
-		std::cout << "found " << *it3 << std::endl;
+		std::cout << "Found : " << *it << std::endl;
 	} catch (std::exception &e) {
-		std::cout << "Exeption catch : not found !" << std::endl;
+		std::cout << "Exception : " << e.what() << std::endl;
 	}
+
+	std::cout << "--- TEST 2 : list, search 42 (present) ---" << std::endl;
+	try {
+		std::list<int>::iterator it = easyfind(lst, 42);
+		std::cout << "Found : " << *it << std::endl;
+	} catch (std::exception &e) {
+		std::cout << "Exception : " << e.what() << std::endl;
+	}
+
+	std::cout << "--- TEST 3 : vector, search 41 (not present) ---" << std::endl;
+	try {
+		std::vector<int>::iterator it = easyfind(vec, 41);
+		std::cout << "Found : " << *it << std::endl;
+	} catch (std::exception &e) {
+		std::cout << "Exception : " << e.what() << std::endl;
+	}
+
+	std::cout << "--- TEST 4 : list, search 99 (not present) ---" << std::endl;
+	try {
+		std::list<int>::iterator it = easyfind(lst, 99);
+		std::cout << "Found : " << *it << std::endl;
+	} catch (std::exception &e) {
+		std::cout << "Exception : " << e.what() << std::endl;
+	}
+
+	return 0;
 }

ex01/Main.cpp

@@ -2,24 +2,33 @@
 
 int main()
 {
+	std::cout << "Test 1 :" << std::endl;
+
 	Span sp = Span(5);
 	sp.addNumber(6);
 	sp.addNumber(3);
 	sp.addNumber(17);
 	sp.addNumber(9);
 	sp.addNumber(11);
+
 	std::cout << sp.shortestSpan() << std::endl;
 	std::cout << sp.longestSpan() << std::endl;
 
+	
+	std::cout << std::endl;
+
+
+	std::cout << "Test 2 :" << std::endl;
+
+	Span sp2 = Span(5);
 	std::vector<int> vec;
 	vec.push_back(42);
 	vec.push_back(1);
 	vec.push_back(99);
 	vec.push_back(7);
 	vec.push_back(55);
-
-	Span sp2 = Span(5);
 	sp2.addNumber(vec.begin(), vec.end());
+
 	std::cout << sp2.shortestSpan() << std::endl;
 	std::cout << sp2.longestSpan() << std::endl;
 

ex02/Main.cpp

@@ -4,7 +4,7 @@
 int main()
 {
 	// TEST 1 - MutantStack
-	std::cout << "test 1" << std::endl << std::endl;
+	std::cout << "Test 1 :" << std::endl;
 	MutantStack<int> mstack;
 	mstack.push(5);
 	mstack.push(17);
@@ -25,7 +25,7 @@ int main()
 	}
 	std::stack<int> s(mstack);
 
-	std::cout << std::endl << "test 2" << std::endl << std::endl;
+	std::cout << std::endl << "Test 2 :" << std::endl;
 	// TEST 2 - std::list (même comportement attendu)
 	std::list<int> mlist;
 	mlist.push_back(5);