X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=TP2%2FMain.java;h=229b6390ba4f5888c0384e0f9352fe8a7e50298e;hp=49473b41c1c9f983ba073102c9f91a41ce36702e;hb=a8276a31e5cfa00657738bb5803438fa82752d15;hpb=c7c510eb1829b97b642bd584a8737103b07efeb7

diff --git a/TP2/Main.java b/TP2/Main.java
index 49473b4..229b639 100644
--- a/TP2/Main.java
+++ b/TP2/Main.java
@@ -98,9 +98,53 @@ class Main {
 
     }
 
+    public static void main4() {
+
+        Compactable[] compactable = new Compactable[10];
+
+        Point p1 = new Point(1, 2);
+        Point p2 = new Point(2, 7);
+        Point p3 = new Point(1, 5);
+        Point p4 = new Point(3, 1);
+
+        Segment segment1 = new Segment(p1, p2);
+        Segment segment2 = new Segment(p3, p4);
+        Cercle cercle = new Cercle(p3, 5.5);
+        Image image = new Image();
+        image.ajouter(segment1);
+        image.ajouter(segment2);
+        image.ajouter(cercle);
+
+        Entiers entiers = new Entiers(5);
+        entiers.inserer(3);
+        entiers.inserer(1);
+        entiers.inserer(4);
+
+        Liste liste = new Liste();
+        liste.inserer(3);
+        liste.inserer(1);
+        liste.inserer(5);
+        liste.inserer(4);
+
+        compactable[0] = entiers;
+        entiers.afficher();
+        compactable[0].compacter(1);
+        entiers.afficher();
+
+        compactable[1] = liste;
+        liste.afficher();
+        compactable[1].compacter(1);
+        liste.afficher();
+
+        compactable[2] = image;
+        image.afficher();
+        compactable[2].compacter(1);
+        image.afficher();
+    }
+
     public static void main(String[] args) {
 
-        main3();
+        main4();
 
     }