ajout de l'opérateur << dans train.cpp

Algo/tp/Cpp/3_tp/src/passager.cpp

@@ -14,7 +14,7 @@ Wagon Passager::getWagonActuel() const {
 }
 
 ostream &operator<<(ostream &s, const Passager &p) {
-    s << "Passager : " << p.nom << p.prenom << endl; 
+    s << "Passager : " << p.nom << " " << p.prenom << endl; 
     return s;
 }
 

Algo/tp/Cpp/3_tp/src/test.cpp

@@ -13,18 +13,28 @@ void testPassager(void) {
 }
 
 void testWagon(void) {
-    Wagon leWagon(1);
+    Wagon w1(1);
-    cout << leWagon << endl;
+    Wagon w2(2);
+    Wagon w3(3);
+    Passager lePassager("Maurice", "Mitchel");
+    Passager lePassager2("Pierre", "Roberts");
+    Passager lePassager3("Jean", "Dupont");
+    w1.ajouter(lePassager);
+    w1.ajouter(lePassager2);
+    w3.ajouter(lePassager3);
+    cout << w1 << endl;
+    cout << w2 << endl;
+    cout << w3 << endl;
 }
 
-// void testTrain(void) {
+void testTrain(void) {
-//     Train leTrain("Train 1");
+    Train leTrain(1);
-//     cout << leTrain.getNom() << endl;
+    cout << leTrain << endl;
-// }
+}
 
 int main() {
-    testPassager();
+    // testPassager();
-    // testWagon();
+    testWagon();
     //testTrain();
     return 0;
 }

Algo/tp/Cpp/3_tp/src/train.cpp

@@ -23,3 +23,17 @@ void Train::arreter() {
 bool Train::isRoule() const {
 	return roule;
 }
+
+ostream &operator<<(ostream &s, const Train &t) {
+	s << "Train : " << t.lesWagons.size() << " wagon(s)." << endl;
+	s << "Liste des wagons :\n";
+	for (Wagon* w : t.lesWagons)
+	{	
+		s << "\t" << "Wagon n°" << w->numero << " : " << w->lesPassagers.size() << " passager(s)." << endl;
+		s << "\t" << "Reste " << w->capacite - w->lesPassagers.size() << " places(s)." << endl;
+		s << "\t" << "Liste des passagers :\n";
+		for (Passager* p : w->lesPassagers)
+			s << "\t\t" << *p << endl;
+	}	
+	return s;                                                     
+}