Fix the Compactable implementation in Entiers and Listes classes.

[TP_POO.git] / TP2 / Main.java

diff --git a/TP2/Main.java b/TP2/Main.java
index 49473b41c1c9f983ba073102c9f91a41ce36702e..85c21fe2384a48564712366c5083c17db504b4ca 100644 (file)
--- a/TP2/Main.java
+++ b/TP2/Main.java
@@ -98,9 +98,55 @@ class Main {
 
     }
 
 
     }
 

+    public static void main4() {
+
+        Structure[] structure = new Structure[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);
+
+        for (int i = 0; i < 10; i++) {
+            structure[i] = entier;
+            structure[i].afficher();
+            structure[i].compacter(1);
+            structure[i].afficher();
+
+            structure[i] = liste;
+            structure[i].afficher();
+            structure[i].compacter(1);
+            structure[i].afficher();
+
+            structure[i] = image;
+            structure[i].afficher();
+            structure[i].compacter(1);
+            structure[i].afficher();
+        }
+    }
+

     public static void main(String[] args) {
 
     public static void main(String[] args) {
 

-        main3();
+        main4();

 
     }
 
 
     }