X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=Arbres%2FArbreBinaire.java;h=89fccc761ccfcfe98c352e1c027e9e5c25c00cb9;hp=ca569c287d1f2d2423a7a342d0ecb7ba335ca073;hb=ae33f914c6b8f939fcef9589c0f14bec2ba37e6b;hpb=a323eab8ab416119b207b482af226382182ac63f

diff --git a/Arbres/ArbreBinaire.java b/Arbres/ArbreBinaire.java
index ca569c2..89fccc7 100644
--- a/Arbres/ArbreBinaire.java
+++ b/Arbres/ArbreBinaire.java
@@ -1,64 +1,20 @@
 
 /**
  * Binary tree class.
- * A binary tree is a ordered value tree with only two childs by node
+ * A binary tree is a ordered value tree with only two childs per node
  */
 public class ArbreBinaire {
-
-    private class IntNode {
-        private int data;
-        private IntNode leftIntNode;
-        private IntNode rightIntNode;
-
-        IntNode(int value) {
-            setData(value);
-            setLeftNode(null);
-            setRightNode(null);
-        }
-
-        IntNode(int value, IntNode leftNode, IntNode rightNode) {
-            setData(value);
-            setLeftNode(leftNode);
-            setRightNode(rightNode);
-        }
-
-        private int getData() {
-            return data;
-        }
-
-        private void setData(int value) {
-            data = value;
-        }
-
-        private IntNode getLeftNode() {
-            return leftIntNode;
-        }
-
-        private void setLeftNode(IntNode leftNode) {
-            leftIntNode = leftNode;
-        }
-
-        private IntNode getRightNode() {
-            return rightIntNode;
-        }
-
-        private void setRightNode(IntNode rightNode) {
-            rightIntNode = rightNode;
-        }
-
-    }
-
-    private IntNode rootNode;
+    private Node<Integer> rootNode;
 
     ArbreBinaire() {
         setRootNode(null);
     }
 
-    private void setRootNode(IntNode node) {
+    private void setRootNode(Node<Integer> node) {
         rootNode = node;
     }
 
-    private IntNode getRootNode() {
+    private Node<Integer> getRootNode() {
         return rootNode;
     }
 
@@ -66,17 +22,15 @@ public class ArbreBinaire {
         return (getRootNode() == null);
     }
 
-    private IntNode inserer_rec(IntNode currentNode, int value) {
+    private Node<Integer> inserer_rec(Node<Integer> currentNode, int value) {
         if (currentNode == null) {
-            return new IntNode(value);
-        } else if (value < currentNode.getData()) {
+            return new Node<Integer>(value);
+        }
+        if (value < currentNode.getData()) {
             currentNode.setLeftNode(inserer_rec(currentNode.getLeftNode(), value));
         } else if (value > currentNode.getData()) {
             currentNode.setRightNode(inserer_rec(currentNode.getRightNode(), value));
-        } else {
-            /* equality */
-            return currentNode;
-        }
+        } /* skip the equality case */
         return currentNode;
     }
 
@@ -84,10 +38,11 @@ public class ArbreBinaire {
         setRootNode(inserer_rec(rootNode, value));
     }
 
-    private IntNode supprimer_rec(IntNode currentNode, int value) {
+    private Node<Integer> supprimer_rec(Node<Integer> currentNode, int value) {
         if (currentNode == null) {
             return null;
-        } else if (value == currentNode.getData()) {
+        }
+        if (value == currentNode.getData()) {
             if (currentNode.getLeftNode() == null && currentNode.getRightNode() == null) {
                 return null;
             } else if (currentNode.getRightNode() == null) {
@@ -95,6 +50,12 @@ public class ArbreBinaire {
             } else if (currentNode.getLeftNode() == null) {
                 return currentNode.getRightNode();
             } else {
+                /*
+                * First, we need to find the node that will replace the deleted node.
+                * We’ll use the smallest node of the node to be deleted’s right sub-tree.
+                * Then, we assign the smallest value to the node to delete and after that,
+                * we’ll delete it from the right subtree.
+                */
                 int smallestValue = findSmallestData(currentNode.getRightNode());
                 currentNode.setData(smallestValue);
                 currentNode.setRightNode(supprimer_rec(currentNode.getRightNode(), smallestValue));
@@ -112,7 +73,7 @@ public class ArbreBinaire {
         supprimer_rec(rootNode, value);
     }
 
-    private boolean hasDataRec(IntNode currentNode, int value) {
+    private boolean hasDataRec(Node<Integer> currentNode, int value) {
         if (currentNode == null) {
             return false;
         }
@@ -123,33 +84,75 @@ public class ArbreBinaire {
     }
 
     public boolean hasData(int value) {
-        return hasDataRec(rootNote, value);
+        return hasDataRec(rootNode, value);
     }
 
-    private int findSmallestData(IntNode node) {
+    private int findSmallestData(Node<Integer> node) {
         return node.getLeftNode() == null ? node.getData() : findSmallestData(node.getLeftNode());
     }
 
-    public afficher_rec(IntNode currentNode) {
-        if (currentNode.getLeftNode() != null) {
+    private void afficher_rec(Node<Integer> currentNode) {
+        if (currentNode != null) {
             afficher_rec(currentNode.getLeftNode());
-        } else if (currentNode.getRightNode() != null) {
+            System.out.print(currentNode.getData() + " ");
             afficher_rec(currentNode.getRightNode());
         }
-        System.out.println("Valeur dans le noeud : ");
+    }
+
+    public void afficher() {
+        afficher_rec(rootNode);
+        System.out.println();
+    }
+
+    private void afficher_arbre_rec(Node<Integer> currentNode, int column) {
+        if (currentNode != null) {
+            afficher_arbre_rec(currentNode.getRightNode(), column + 1);
+            for (int i = 0; i < column; i++) {
+                System.out.print("   ");
+            }
+            System.out.println(currentNode.getData());
+            afficher_arbre_rec(currentNode.getLeftNode(), column + 1);
+        }
+    }
+
+    public void afficher_arbre() {
+        afficher_arbre_rec(rootNode, 1);
     }
 
     public static void main(String[] args) {
-        ArbreBinaire Btree = new ArbreBinaire();
+        ArbreBinaire bTree = new ArbreBinaire();
+
+        bTree.inserer(2);
+        bTree.inserer(6);
+        bTree.inserer(4);
+        bTree.inserer(5);
+        bTree.inserer(1);
+        bTree.inserer(0);
+
+        bTree.afficher();
+        bTree.afficher_arbre();
+
+        bTree.supprimer(4);
+
+        bTree.afficher();
+        bTree.afficher_arbre();
+
+        bTree.supprimer(6);
 
-        Btree.inserer(5);
-        Btree.inserer(2);
-        Btree.inserer(7);
-        Btree.inserer(1);
+        bTree.afficher();
+        bTree.afficher_arbre();
 
-        String Btreeout = Btree.toString();
-        System.out.println(Btreeout);
+        bTree.inserer(2);
+        bTree.inserer(7);
+        bTree.inserer(3);
+        bTree.inserer(9);
+        bTree.inserer(11);
+        bTree.inserer(10);
+        bTree.inserer(8);
+        bTree.inserer(4);
 
+        bTree.afficher();
+        bTree.afficher_arbre();
     }
 
 }