TP2: cast double to int the compare method returned value.

[TP_POO.git] / Arbres / ArbreBinaire.java

diff --git a/Arbres/ArbreBinaire.java b/Arbres/ArbreBinaire.java
index c4d84fb2b1a058c70528919717e086723dfe19fe..fc19203a7e4b9025a49e3628be08079abc12629e 100644 (file)
--- a/Arbres/ArbreBinaire.java
+++ b/Arbres/ArbreBinaire.java
@@ -1,7 +1,7 @@
 
 /**
  * Binary tree class.
 
 /**
  * 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 {
 
  */
 public class ArbreBinaire {
 


@@ -69,7 +69,8 @@ public class ArbreBinaire {
     private IntNode inserer_rec(IntNode currentNode, int value) {
         if (currentNode == null) {
             return new IntNode(value);
     private IntNode inserer_rec(IntNode currentNode, int value) {
         if (currentNode == null) {
             return new IntNode(value);

-        } else if (value < currentNode.getData()) {
+        }
+        if (value < currentNode.getData()) {

             currentNode.setLeftNode(inserer_rec(currentNode.getLeftNode(), value));
         } else if (value > currentNode.getData()) {
             currentNode.setRightNode(inserer_rec(currentNode.getRightNode(), value));
             currentNode.setLeftNode(inserer_rec(currentNode.getLeftNode(), value));
         } else if (value > currentNode.getData()) {
             currentNode.setRightNode(inserer_rec(currentNode.getRightNode(), value));


@@ -84,7 +85,8 @@ public class ArbreBinaire {
     private IntNode supprimer_rec(IntNode currentNode, int value) {
         if (currentNode == null) {
             return null;
     private IntNode supprimer_rec(IntNode 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) {
             if (currentNode.getLeftNode() == null && currentNode.getRightNode() == null) {
                 return null;
             } else if (currentNode.getRightNode() == null) {


@@ -147,11 +149,9 @@ public class ArbreBinaire {
     }
 
     private void afficher_arbre_rec(IntNode currentNode, int column) {
     }
 
     private void afficher_arbre_rec(IntNode currentNode, int column) {

-        int i;
-

         if (currentNode != null) {
             afficher_arbre_rec(currentNode.getRightNode(), column + 1);
         if (currentNode != null) {
             afficher_arbre_rec(currentNode.getRightNode(), column + 1);

-            for (i = 0; i < column; i++) {
+            for (int i = 0; i < column; i++) {

                 System.out.print("   ");
             }
             System.out.println(currentNode.getData());
                 System.out.print("   ");
             }
             System.out.println(currentNode.getData());


@@ -192,6 +192,8 @@ public class ArbreBinaire {
         bTree.inserer(9);
         bTree.inserer(11);
         bTree.inserer(10);
         bTree.inserer(9);
         bTree.inserer(11);
         bTree.inserer(10);

+        bTree.inserer(8);
+        bTree.inserer(4);

 
         bTree.afficher();
         bTree.afficher_arbre();
 
         bTree.afficher();
         bTree.afficher_arbre();