Properly rename heap -> stack.

[TP_POO.git] / Piles / Pile.java

diff --git a/Piles/Pile.java b/Piles/Pile.java
index e7d4b4deac667aa2c934567be2bd81e94d840c3f..b82dd7e8f99ff3007d36af587b2ea9a76c3b4033 100644 (file)
--- a/Piles/Pile.java
+++ b/Piles/Pile.java
@@ -2,7 +2,7 @@
 class Pile {
     private int int_array[];
     private int array_size;
 class Pile {
     private int int_array[];
     private int array_size;

-    private int heap_head_index;
+    private int stack_head_index;

 
     private void setSize(int size) {
         array_size = size;
 
     private void setSize(int size) {
         array_size = size;


@@ -13,11 +13,11 @@ class Pile {
     }
 
     private void setHeadIndex(int index) {
     }
 
     private void setHeadIndex(int index) {

-        heap_head_index = index;
+        stack_head_index = index;

     }
 
     private int getHeadIndex() {
     }
 
     private int getHeadIndex() {

-        return heap_head_index;
+        return stack_head_index;

     }
 
     Pile(int size) {
     }
 
     Pile(int size) {


@@ -28,8 +28,8 @@ class Pile {
 
     public void empiler(int value) {
         if (!plein()) {
 
     public void empiler(int value) {
         if (!plein()) {

-            int_array[heap_head_index] = value;
-            heap_head_index++;
+            int_array[stack_head_index] = value;
+            stack_head_index++;

         } else {
             System.out.println("La pile est pleine");
         }
         } else {
             System.out.println("La pile est pleine");
         }


@@ -37,8 +37,8 @@ class Pile {
 
     public int depiler() {
         if (!vide()) {
 
     public int depiler() {
         if (!vide()) {

-            heap_head_index--;
-            return int_array[heap_head_index];
+            stack_head_index--;
+            return int_array[stack_head_index];

         } else {
             return -1;
         }
         } else {
             return -1;
         }


@@ -59,30 +59,30 @@ class Pile {
     }
 
     public static void main(String[] args) {
     }
 
     public static void main(String[] args) {

-        Pile heap = new Pile(5);
-
-        heap.empiler(3);
-        heap.empiler(5);
-        heap.empiler(4);
-        heap.empiler(7);
-        heap.empiler(8);
-
-        heap.afficher();
-
-        System.out.println("Heap index " + heap.getHeadIndex());
-        System.out.println("Heap head value " + heap.depiler());
-        System.out.println("Heap index " + heap.getHeadIndex());
-        System.out.println("Heap head value " + heap.depiler());
-        System.out.println("Heap index " + heap.getHeadIndex());
-        System.out.println("Heap head value " + heap.depiler());
-        System.out.println("Heap index " + heap.getHeadIndex());
-        System.out.println("Heap head value " + heap.depiler());
-        System.out.println("Heap index " + heap.getHeadIndex());
-        System.out.println("Heap head value " + heap.depiler());
-        System.out.println("Heap index " + heap.getHeadIndex());
-        System.out.println("Heap head value " + heap.depiler());
-        System.out.println("Heap index " + heap.getHeadIndex());
-
-        heap.afficher();
+        Pile stack = new Pile(5);
+
+        stack.empiler(3);
+        stack.empiler(5);
+        stack.empiler(4);
+        stack.empiler(7);
+        stack.empiler(8);
+
+        stack.afficher();
+
+        System.out.println("stack index " + stack.getHeadIndex());
+        System.out.println("stack head value " + stack.depiler());
+        System.out.println("stack index " + stack.getHeadIndex());
+        System.out.println("stack head value " + stack.depiler());
+        System.out.println("stack index " + stack.getHeadIndex());
+        System.out.println("stack head value " + stack.depiler());
+        System.out.println("stack index " + stack.getHeadIndex());
+        System.out.println("stack head value " + stack.depiler());
+        System.out.println("stack index " + stack.getHeadIndex());
+        System.out.println("stack head value " + stack.depiler());
+        System.out.println("stack index " + stack.getHeadIndex());
+        System.out.println("stack head value " + stack.depiler());
+        System.out.println("stack index " + stack.getHeadIndex());
+
+        stack.afficher();

     }
 }
     }
 }