ajout du gitignore et modif du tp3 de Cpp

.gitignore

@@ -0,0 +1,56 @@
+# ---> C
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+#Mac 
+.DS_Store

Algo/tp/Cpp/3_tp/.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "files.associations": {
         "iosfwd": "cpp"
-    }
+    },
+    "files.autoSave": "afterDelay"
 }

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

@@ -6,7 +6,7 @@
 using namespace std;
 
 Passager::Passager(string nom, string prenom)
-    :nom{nom}, prenom{prenom}
+    :nom{nom}, prenom{prenom}, wagonActuel{nullptr}
 {}
 
 Wagon Passager::getWagonActuel() const {

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

@@ -21,8 +21,7 @@ public :
 
     friend std::ostream &operator<<(std::ostream &s, const Passager &p);
     
-    
+    ~Passager()=default;          ///////// =default pour dire que celui par défaut suffit => pas besoin de le définir dans le .cpp  
-    ~Passager();
 };
 
 

Algo/tp/Cpp/3_tp/src/passagerOld.hpp

@@ -0,0 +1,29 @@
+#ifndef PASSAGER_HPP
+#define PASSAGER_HPP
+
+#include <string>
+
+class Wagon;
+
+class Passager {
+private :
+    
+    std::string nom;
+    std::string prenom;
+
+    Wagon *wagonActuel;
+
+public :
+
+    Passager(std::string nom, std::string prenom);
+
+    Wagon getWagonActuel() const;
+
+    friend std::ostream &operator<<(std::ostream &s, const Passager &p);
+    
+    
+    ~Passager();
+};
+
+
+#endif // PASSAGER_HPP

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

@@ -5,21 +5,21 @@
 
 using namespace std;
 
-Train::Train(string nom)
+Train::Train(int nbWagons)
-    :nom{nom}
+	: lesWagons{} {
-{}
+	for (int i = 1; i <= nbWagons; ++i) {
-
+		lesWagons.push_back(new Wagon(i));
-int Train::ajouter(Wagon leWagon) {
+	}
-    lesWagons->push_back(leWagon);
-    return 0;
 }
 
-int Train::enlever(Wagon leWagon) {
+void Train::demarrer() {
-    lesWagons->remove(leWagon);
+	roule = true;
-    return 0;
 }
 
-Train::~Train() {
+void Train::arreter() {
-    delete lesWagons;
+	roule = false;
 }
 
+bool Train::isRoule() const {
+	return roule;
+}

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

@@ -8,18 +8,28 @@
 class Train {
 private :
     
-    std::string nom;
+    bool roule;
-    std::list<Wagon> *lesWagons;
+
+    std::list<Wagon*> lesWagons;
 
 public :
         
-        Train(std::string nom);
+        Train(int nombreDeWagons);
+        
+        void demarrer();
+        void arreter();
+        bool isRoule() const;
+        
+        int monterDansLeTrain(int numeroWagon, Passager& lePassager);
+        int descendreDuTrain(Passager& lePassager);
+        int deplacerAuWagonSuivant(Passager& lePassager);
+        int deplacerAuWagonPrecedent(Passager& lePassager);
+
+        int monterDansLeTrainAPartirDe(int numeroWagon, Passager& lePassager);
 
-        int ajouter(Wagon leWagon);
-        int enlever(Wagon leWagon);
         
-        ~Train();
+        ~Train() = default;
-    };
+};
 
 
 

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

@@ -6,28 +6,29 @@
 using namespace std;
 
 Wagon::Wagon(int numero)
-    :numero{numero}
+    :numero{numero}, lesPassagers{}
 {}
 
 int Wagon::ajouter(Passager& lePassager) {
-    if(lesPassagers.size() == capacite) {
+    if(lesPassagers.size() >= capacite) {
         return -1;
     }
     lesPassagers.push_back(&lePassager);
     return 0;
 }
 
-int Wagon::enlever(Passager& lePassager) {
+// int Wagon::enlever(const Passager& lePassager) {
-    list<Passager*>::iterator it = find(lesPassagers.begin(), lesPassagers.end(), &lePassager);
+//     list<Passager*>::iterator it = find(lesPassagers.begin(), lesPassagers.end(), &lePassager);
-    if(it == lesPassagers.end()) return 0;
+//     if(it == lesPassagers.end()) return 0;
-
+//     lesPassagers.remove(it);
-    lesPassagers.erase(it);
+//     return 1;
-    return 1;
+// }
-}
 
 ostream &operator<<(ostream &s, const Wagon &w) {
-    s << "Wagon n° " << w.numero << " : " << w.lesPassagers->size() << " passager(s)." << endl;
+    s << "Wagon n° " << w.numero << " : " << w.lesPassagers.size() << " passager(s)." << endl;
-    s << "Reste " << w.capacite - w.lesPassagers->size() << " places(s)." << endl;
+    s << "Reste " << w.capacite - w.lesPassagers.size() << " places(s)." << endl;
-    s << "Liste des passagers :\n" << w.lesPassagers << endl;
+    s << "Liste des passagers :\n";                        /////
+    for(Passager* ptp : w.lesPassagers)                    /////  comme ça
+      s<<"\t"<< *ptp<<endl;                                /////
     return s;                                                      
 }

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

@@ -0,0 +1,32 @@
+#include "wagon.hpp"
+#include "passager.hpp"
+#include <iostream>
+#include <string>
+
+using namespace std;
+
+Wagon::Wagon(int numero)
+    :numero{numero}, lesPassagers{}
+{}
+
+int Wagon::ajouter(Passager& lePassager) {
+    if(lesPassagers.size() >= capacite) {
+        return -1;
+    }
+    lesPassagers.push_back(&lePassager);
+    return 0;
+}
+
+// int Wagon::enlever(const Passager& lePassager) {
+//     list<Passager*>::iterator it = find(lesPassagers.begin(), lesPassagers.end(), &lePassager);
+//     if(it == lesPassagers.end()) return 0;
+//     lesPassagers.remove(it);
+//     return 1;
+// }
+
+ostream &operator<<(ostream &s, const Wagon &w) {
+    s << "Wagon n° " << w.numero << " : " << w.lesPassagers.size() << " passager(s)." << endl;
+    s << "Reste " << w.capacite - w.lesPassagers.size() << " places(s)." << endl;
+    s << "Liste des passagers :\n" << w.lesPassagers << endl;
+    return s;
+}

Algo/tp/Cpp/tp4/.vscode/settings.json

@@ -0,0 +1,67 @@
+{
+    "files.associations": {
+        "__bit_reference": "cpp",
+        "__config": "cpp",
+        "__debug": "cpp",
+        "__errc": "cpp",
+        "__functional_base": "cpp",
+        "__hash_table": "cpp",
+        "__locale": "cpp",
+        "__mutex_base": "cpp",
+        "__node_handle": "cpp",
+        "__nullptr": "cpp",
+        "__split_buffer": "cpp",
+        "__string": "cpp",
+        "__threading_support": "cpp",
+        "__tuple": "cpp",
+        "algorithm": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "complex": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "exception": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "ratio": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "utility": "cpp",
+        "vector": "cpp"
+    }
+}

Algo/tp/Cpp/tp4/src/Train.cpp

@@ -9,7 +9,6 @@ using namespace std;
 
 Train::Train(int nbWagons)
 	: lesWagons{} {
-	//lesWagons.reserve(nbWagons);
 	for (int i = 1; i <= nbWagons; ++i) {
 		lesWagons.emplace_back(i);
 	}

cle_ssh/id_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDKlT+iyUK+kT/4SnKNLMtpWysE+AW/47jLSVApbEYP14crYJdPC6CeBKum9CPTqiG4s1caVUUuwCXIEdawrgSHg3SvyzwC8lHE7hQMj5tZ7dFVQy7N+k+8s3uW/lZ8JadOHmQOXcRQ4wDKlZcuihQQZpNBZgPvkCXY2CJGRLcpUTfLIXYR9T+4bXXcOXx+yv1Pql4AbJJGdrIAsYDxjZmsapprz46Mi/zmOw8aj7X+0cVsZra9/eEqd2nHOvh1lBR0fgNMgXEU4J0EKJtVYMpTtxmlHIvZRhhq5v8yG9H1dQTocDsFnjf6c3I7FZ2+qw8jG/DeofDuI7m/HIBd8DZel5xwWJD/94dSUcvlsMH/UIwIA0ej5Aet7PmIAef9mtUhuvqY9cq5KI/Q9EY3HX1gjzjAo8isx/vukWTEd2lxAiFj44nAkH5Yk5XSGcZqrjFMWGLet0to5+tm6+0DKZpAWkBgvuiBN3ytPjOhomhDHBiIufkq2HzfNAzhGIjVCMU= ia@IA