X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=TP2%2FMain.java;h=85c21fe2384a48564712366c5083c17db504b4ca;hp=e05593a846aa509c54e65de24431230b355212ea;hb=22758baf926b8b833ce6a38566eb157e13fbd3fb;hpb=14d4fd0d0d84e3b8a52ecde790d878fcb909ddd0

diff --git a/TP2/Main.java b/TP2/Main.java
index e05593a..85c21fe 100644
--- a/TP2/Main.java
+++ b/TP2/Main.java
@@ -1,40 +1,152 @@
 
-
 class Main {
 
-    public static void main(String[] args) {
+    private static void main1() {
+        Point p1 = new Point(1, 2);
+        Point p2 = new Point(2, 7);
+        Segment segment = new Segment(p1, p2);
+        Point p3 = new Point(4, 5);
+        Cercle cercle = new Cercle(p3, 5.2);
+        Point p4 = new Point(2, 3);
+        Piletransformations trans = new Piletransformations(10);
+
+        boolean rt = trans.empiler(p4);
+        if (!rt) {
+            System.out.println("Echec empilation");
+        }
+
+        segment.dessiner(trans);
+        cercle.dessiner(trans);
+
+        Point p5 = new Point(3, 5);
+        segment.deplacer(p5);
+        cercle.deplacer(p5);
+
+        Image image = new Image();
+        image.ajouter(segment);
+        image.ajouter(cercle);
+        image.dessiner(trans);
+        image.deplacer(p5);
+        image.dessiner(trans);
+
+        trans.depiler();
+    }
 
+    private static void main2() {
         Point p1 = new Point(1, 2);
         Point p2 = new Point(2, 7);
-        Point p3 = p1.additionner(p2);
+        Segment segment1 = new Segment(p1, p2);
+        Point p3 = new Point(1, 5);
+        Point p4 = new Point(3, 1);
+        Segment segment2 = new Segment(p3, p4);
+        Point p5 = new Point(4, 5);
+        Cercle cercle1 = new Cercle(p5, 5.2);
+        Point p6 = new Point(5, 4);
+        Cercle cercle2 = new Cercle(p6, 4.3);
+        Point point1 = new Point(8, -1.5);
+        Image image1 = new Image();
+        Image image2 = new Image();
+        Image image3 = new Image();
+        Piletransformations transformations = new Piletransformations(10);
 
-        System.out.println(p1.toString());
-        System.out.println(p2.toString());
-        System.out.println(p3.toString());
+        transformations.empiler(point1);
+        image1.ajouter(segment1);
+        image1.ajouter(cercle1);
+        image2.ajouter(segment2);
+        image2.ajouter(cercle2);
+        image1.dessiner(transformations);
+        image2.dessiner(transformations);
+        Point point2 = new Point(0.5, 2.5);
+        image1.deplacer(point2);
+        image3.ajouter(image1);
+        image3.ajouter(image2);
+        image3.dessiner(transformations);
+        transformations.depiler();
+    }
 
-        Point p4 = new Point(4, 5);
-        Point p5 = new Point(2, 3);
-        Segment segment = new Segment(p4, p5);
-        Cercle cercle = new Cercle(p4, 5.2);
+    public static void main3() {
 
-        Piletransformations trans = new Piletransformations(10);
-        trans.display();
+        Affichable[] affichable = new Affichable[10];
 
-        segment.dessiner(trans);
-        cercle.dessiner(trans);
-        boolean rt = trans.empiler(p1);
-        trans.display();
-        segment.dessiner(trans);
-        cercle.dessiner(trans);
-        rt = trans.empiler(p2);
-        trans.display();
-        segment.dessiner(trans);
-        cercle.dessiner(trans);
+        Point p1 = new Point(1, 2);
+        Point p2 = new Point(2, 7);
+        Point p3 = new Point(1, 5);
 
-        segment.deplacer(p1);
-        cercle.deplacer(p1);
-        segment.dessiner(trans);
-        cercle.dessiner(trans);
+        Entiers entiers = new Entiers(5);
+        entiers.inserer(3);
+        entiers.inserer(1);
+        entiers.inserer(5);
+
+        Liste liste = new Liste();
+        liste.inserer(3);
+        liste.inserer(1);
+        liste.inserer(5);
+
+        for (int i = 0; i < 10; i++) {
+            affichable[i] = entiers;
+            affichable[i].afficher();
+
+            affichable[i] = liste;
+            affichable[i].afficher();
+
+            affichable[i] = new Segment(p1, p2);
+            affichable[i].afficher();
+
+            affichable[i] = new Cercle(p3, 5.5);
+            affichable[i].afficher();
+        }
+
+    }
+
+    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) {
+
+        main4();
 
     }