Structure: fix all remaining bugs and a test case.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/Structure/Entiers.java b/Structure/Entiers.java
index b2c9247076410f0d2d6a21740cbccc3d12df20dc..4abf4f0ba8be2bda10cd4ff51851ab561ba0a6c0 100644 (file)
--- a/Structure/Entiers.java
+++ b/Structure/Entiers.java
@@ -97,9 +97,9 @@ class Entiers extends Structure {
     }
 
     public void afficher() {
-        System.out.println("----");
+        System.out.println("---- entiers ----");
         for (int i = 0; i < getCurrentSize(); i++) {
-            System.out.println("element " + i + " " + int_array[i]);
+            System.out.println("element " + i + " : " + int_array[i]);
         }
     }
 

diff --git a/Structure/Liste.java b/Structure/Liste.java
index d6bd9633bc15ac7382312afdf9b2d51e02ae849d..b31d0816218f2db6028c5edf8ff4ac14a5392852 100644 (file)
--- a/Structure/Liste.java
+++ b/Structure/Liste.java
@@ -118,19 +118,20 @@ public class Liste extends Structure {
     }
 
     public void afficher() {
+        System.out.println("---- liste ----");
         if (isEmpty()) {
             System.out.println("Liste vide");
         } else if (headNode.getNext() == null) {
-            System.out.println("Valeur du noeud 0 : " + headNode.getData());
+            System.out.println("element 0 : " + headNode.getData());
         } else {
             IntNode nodeCursor = headNode;
             int i = 0;
             while (nodeCursor.getNext() != null) {
-                System.out.println("Valeur du noeud " + i + " : " + nodeCursor.getData());
+                System.out.println("element " + i + " : " + nodeCursor.getData());
                 nodeCursor = nodeCursor.getNext();
                 i++;
             }
-            System.out.println("Valeur du noeud " + i++ + " : " + nodeCursor.getData());
+            System.out.println("element " + i++ + " : " + nodeCursor.getData());
         }
     }
 

diff --git a/Structure/Main.java b/Structure/Main.java
index de10882ad357faa08fb8b2160bd8f6f9ba4d4230..3794bddaddaf0f651c30b09de7882e60bacd7140 100644 (file)
--- a/Structure/Main.java
+++ b/Structure/Main.java
@@ -67,8 +67,25 @@ class Main {
 
     public static void main(String[] args) {
 
-        main_liste();
-        main_entiers();
+        Structure[] structure = new Structure[10];
+
+        for (int i = 0; i < 10; i++) {
+            structure[i] = new Liste();
+            structure[i].inserer(3);
+            structure[i].inserer(1);
+            structure[i].inserer(5);
+            structure[i].afficher();
+            structure[i].supprimer(5);
+            structure[i].afficher();
+
+            structure[i] = new Entiers(10);
+            structure[i].inserer(3);
+            structure[i].inserer(1);
+            structure[i].inserer(5);
+            structure[i].afficher();
+            structure[i].supprimer(5);
+            structure[i].afficher();
+        }
 
     }