Code cleanup : fix C style array declaration.

[TP_POO.git] / TP2 / Entiers.java

diff --git a/TP2/Entiers.java b/TP2/Entiers.java
index b4cffb15f6f90406be47212e9f9dede7a02f1e66..6c840df0607600197d7e1d5a8494108ac8a483fe 100644 (file)
--- a/TP2/Entiers.java
+++ b/TP2/Entiers.java
@@ -1,6 +1,10 @@
 
+@ClassPreamble (
+    author = "Jérôme Benoit",
+    date = "05/03/2009"
+)
 class Entiers extends Structure {
-    private int int_array[];
+    private int[] int_array;
     private int array_size;
     private int current_size;
 
@@ -60,14 +64,14 @@ class Entiers extends Structure {
 
     private int binarySearch(int first, int last, int value) {
         if (last < first)
-            //FIXME: should not return an integer 
+            //FIXME: should not return an integer
             return -1;
         int middle = (first + last) / 2;
         if (value == int_array[middle])
             return middle;
         else if (value > int_array[middle])
             return binarySearch((middle + 1), last, value);
-        return binarySearch(first, (middle -1), value);
+        return binarySearch(first, (middle - 1), value);
     }
 
     public boolean supprimer(int value) {
@@ -75,7 +79,6 @@ class Entiers extends Structure {
             System.out.println("Aucune valeur à supprimer");
             return false;
         }
-
         for (int i = 0; i < getCurrentSize(); i++) {
             if (int_array[i] == value) {
                 // Deleting the element in the tab
@@ -98,10 +101,19 @@ class Entiers extends Structure {
     }
 
     public void afficher() {
-        System.out.println("---- entiers ----");
+        String className = this.getClass().getSimpleName();
+        System.out.println("---- " + className + " ----");
         for (int i = 0; i < getCurrentSize(); i++) {
             System.out.println("element " + i + " : " + int_array[i]);
         }
     }
 
+    public void compacter(int nElements) {
+        if (current_size - nElements > 0) {
+            // Remove the last nElements
+            current_size -= nElements;
+        } else {
+            current_size = 0;
+        }
+    }
 }