diff --git a/DSq2.plantuml b/DSq2.plantuml deleted file mode 100644 index 7d406d0..0000000 --- a/DSq2.plantuml +++ /dev/null @@ -1,13 +0,0 @@ --- Diagramme séquence question 2 TP n°2 -@startuml -autonumber -participant "VueJardin:Pape14" as v -participant "Parcelle:p" as p -participant "Parcelle:p0" as p0 -participant "Parcelle:p1" as p1 -participant "Parcelle:p2" as p2 -participant "Parcelle:p3" as p3 -v -> v ++ : setParcelleVisible(p) -v -- -return -@enduml diff --git a/DSq2.svg b/DSq2.svg deleted file mode 100644 index b8f872d..0000000 --- a/DSq2.svg +++ /dev/null @@ -1 +0,0 @@ -VueJardin.Pape14VueJardin.Pape14Parcelle.pParcelle.p0Parcelle.p1Parcelle.p2Parcelle.p3VueJardin:Pape14VueJardin:Pape14Parcelle:pParcelle:pParcelle:p0Parcelle:p0Parcelle:p1Parcelle:p1Parcelle:p2Parcelle:p2Parcelle:p3Parcelle:p3VueJardin.Pape141setParcelleVisible(p)2  \ No newline at end of file diff --git a/MlnVdM.svg b/MlnVdM.svg deleted file mode 100644 index d4b6efc..0000000 --- a/MlnVdM.svg +++ /dev/null @@ -1 +0,0 @@ -PlantUML 1.2025.9[From MlnVdM.plantUML (line 35) ] @startumlscale 2     object "Satiton : Melun" as mlnobject "Satiton : Gare de Lyon" as gdlobject "Satiton : Maison-Alfort" as maobject "Satiton : Vert-de-Maison" as vdm object "Liaison 1" as l1object "Liaison 2" as l2object "Liaison 3" as l3 object "Ligne R" as lrobject "Ligne RER D" as rerd object "PS : lR" as pslrobject "PS : RER D" as psrer object "PAC : Melun | Vert-de-Maison" as pac    l1 oSyntax Error? (Assumed diagram type: class) \ No newline at end of file diff --git a/TP1/Liaison.java b/TP1/Liaison.java new file mode 100644 index 0000000..c15be05 --- /dev/null +++ b/TP1/Liaison.java @@ -0,0 +1,14 @@ +public class Liaison{ + private Station debut; + private Station fin; + private Ligne ligne; + + public Liaison(Station s1,Station s2,Ligne l){ + this.debut = s1; + this.fin = s2; + this.ligne = l; + } + public String toString(){ + return this.debut+" -> "+this.fin; + } +} \ No newline at end of file diff --git a/TP1/Ligne.java b/TP1/Ligne.java new file mode 100644 index 0000000..57bebdb --- /dev/null +++ b/TP1/Ligne.java @@ -0,0 +1,17 @@ +public class Ligne{ + private String nom; + private Liaison[] tabLiaison; + private int nbLiaison = 0; + public Ligne(String s){ + this.nom = s; + } + public String toString(){ + String s = "Ligne "+this.nom; + for(int i = 0; i < nbLiaison ;i++){ + s += "\n"; + s += this.tabLiaison[i]; + } + return s; + } + +} \ No newline at end of file diff --git a/MlnVdM.plantUML b/TP1/MlnVdM.plantUML similarity index 60% rename from MlnVdM.plantUML rename to TP1/MlnVdM.plantUML index 9da40de..a091117 100644 --- a/MlnVdM.plantUML +++ b/TP1/MlnVdM.plantUML @@ -26,13 +26,42 @@ object "Ligne RER D" as rerd object "PS : lR" as pslr object "PS : RER D" as psrer -object "PAC : Melun | Vert-de-Maison" as pac +object "Parcours complexe: Parcours" as pc +mln<-- "debut" l1 +gdl<-- "fin" l1 +gdl<-- "debut" l2 +ma<-- "fin" l2 +ma<-- "debut" l3 +vdm<-- "fin" l3 + +mln<-- "debut" pslr +gdl<-- "fin" pslr +gdl<-- "debut" psrer +ma<-- "fin" psrer +mln<-- "debut" pc +vdm<-- "fin" pc + +l1--o lr +l1--o pslr +l2--o rerd +l2--o psrer +l3--o rerd +l3--o psrer + +l1--> lr +l2--> rerd +l3--> rerd + +pslr--> lr +psrer--> rerd +pc o--pslr +pc o--psrer ' describe the arrows -l1 o + @enduml diff --git a/TP1/MlnVdM.png b/TP1/MlnVdM.png new file mode 100644 index 0000000..16193f9 Binary files /dev/null and b/TP1/MlnVdM.png differ diff --git a/TP1/Parcours.java b/TP1/Parcours.java new file mode 100644 index 0000000..d374bfc --- /dev/null +++ b/TP1/Parcours.java @@ -0,0 +1,6 @@ +public class Parcours{ + Station debut; + Station fin; + public Parcours(){ + } +} \ No newline at end of file diff --git a/TP1/ParcoursComplexe.java b/TP1/ParcoursComplexe.java new file mode 100644 index 0000000..1f2696a --- /dev/null +++ b/TP1/ParcoursComplexe.java @@ -0,0 +1,5 @@ +public class ParcoursComplexe{ + public ParcoursComplexe(){ + + } +} \ No newline at end of file diff --git a/TP1/ParcoursSimple.java b/TP1/ParcoursSimple.java new file mode 100644 index 0000000..c04a587 --- /dev/null +++ b/TP1/ParcoursSimple.java @@ -0,0 +1,5 @@ +public class ParcoursSimple implements Parcours{ + public ParcoursSimple(){ + + } +} \ No newline at end of file diff --git a/TP1/Station.java b/TP1/Station.java new file mode 100644 index 0000000..d54487f --- /dev/null +++ b/TP1/Station.java @@ -0,0 +1,9 @@ +public class Station{ + private String nom; + public Station(String s){ + this.nom = s; + } + public String toString(){ + return "Station : "+this.nom; + } +} \ No newline at end of file diff --git a/TP2/DSq2.plantuml b/TP2/DSq2.plantuml new file mode 100644 index 0000000..6f757a8 --- /dev/null +++ b/TP2/DSq2.plantuml @@ -0,0 +1,61 @@ +@startuml +autonumber +participant "VueJardin:Pape14" as vue +participant "Parcelle:p" as p +participant "Parcelle:p0" as p0 +participant "Parcelle:p1" as p1 +participant "Parcelle:p2" as p2 +participant "Parcelle:p3" as p3 +vue -> vue ++ : setParcelleVisible(p) +vue -- +vue -> p0 ++ : getSplit() +return V +vue -> p0 ++ : getFirst() +return p2 +vue -> vue ++ : setParcelleVisible(p2) +vue -- +vue -> p2 ++ : getSplit() +return V +vue -> p2 ++ : getFirst() +return p4 +vue -> vue ++ : setParcelleVisible(p4) +vue -- +vue -> p4 ++ : getSplit() +return Null +vue -> vue ++ : setSplit(p4,V) +note right +void setSplit(Parcelle p, Orientation o) : divise +une parcelle selon l'orientation donnée +end note +vue -- +vue -> p4 ++ : reset() +p4 -> p5 !! : delete +p4 -> p6 !! : delete +return +vue -> vue ++ : setSplit(p4,H) +vue -- +vue -> vue ++ : setParcelleVisible(p0) +vue -- +vue -> p0 ++ : getFirst() +return p1 +vue -> vue ++ : setParcelleVisible(p1) +vue -- +vue -> p1 ++ : getLegume() +note right +Legume getLegume() : récupère +le légume de la parcelle +end note +return "Romaine" +vue -> p1 ++ : removeLegume() +note right +void removeLegume() : supprime +le légume de la parcelle +end note +return +vue -> p1 ++ : addLegume("EPINARDS") +note right +void addLegume(Legume l) : insère +un légume dans la parcelle +end note +return +@enduml diff --git a/TP2/DSq2.png b/TP2/DSq2.png new file mode 100644 index 0000000..42215d2 Binary files /dev/null and b/TP2/DSq2.png differ diff --git a/DSsemaine2TDQuestion1.plantuml b/TP2/DSsemaine2TDQuestion1.plantuml similarity index 100% rename from DSsemaine2TDQuestion1.plantuml rename to TP2/DSsemaine2TDQuestion1.plantuml diff --git a/DSsemaine2TDQuestion1.svg b/TP2/DSsemaine2TDQuestion1.svg similarity index 100% rename from DSsemaine2TDQuestion1.svg rename to TP2/DSsemaine2TDQuestion1.svg diff --git a/TP2/plantuml.jar b/TP2/plantuml.jar new file mode 100644 index 0000000..673cda1 Binary files /dev/null and b/TP2/plantuml.jar differ diff --git a/tp2-reponses.txt b/TP2/tp2-reponses.txt similarity index 100% rename from tp2-reponses.txt rename to TP2/tp2-reponses.txt diff --git a/TP3/DC3.plantuml b/TP3/DC3.plantuml new file mode 100644 index 0000000..83f244c --- /dev/null +++ b/TP3/DC3.plantuml @@ -0,0 +1,33 @@ +@startuml +scale 1.5 + +abstract class "Surface finie" as surfFini +class "Cercle" as circ +class "Rectangle" as rect +class "Carre" as carr +rect --|> surfFini +carr --|> surfFini +circ --|> surfFini + +class "Fractale" as fract +fract : int[] pts + +interface "Dessinable" as dessin +dessin : String tracer() + +rect ..|> dessin +carr ..|> dessin +surfFini : Float perim +surfFini : int[] pts +surfFini : int[] getPoints() +surfFini : Float getPerim() + + + +interface "DessinableApproche" as dessinApp +dessinApp : String tracerApprox() + +circ ..|> dessinApp +fract ..|> dessinApp + +@enduml diff --git a/TP3/DC3.png b/TP3/DC3.png new file mode 100644 index 0000000..95b4b11 Binary files /dev/null and b/TP3/DC3.png differ diff --git a/TP3/plantuml.jar b/TP3/plantuml.jar new file mode 100644 index 0000000..673cda1 Binary files /dev/null and b/TP3/plantuml.jar differ