Merge branch 'master' of git.piment-noir.org:TP_POO

diff --git a/Arbres/ArbreBinaire.java b/Arbres/ArbreBinaire.java
index ee0f27b1753d370bf7a48836beb2514d90e39843..fc19203a7e4b9025a49e3628be08079abc12629e 100644 (file)
--- a/Arbres/ArbreBinaire.java
+++ b/Arbres/ArbreBinaire.java
@@ -69,7 +69,8 @@ public class ArbreBinaire {
     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));
@@ -84,7 +85,8 @@ public class ArbreBinaire {
     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) {

diff --git a/Entiers/Entiers.java b/Entiers/Entiers.java
index 0c813d9382995b2752c2a3f0136da5614d98541b..fe92652e5c739ef5d7be92d6c340c4aa86138fdf 100644 (file)
--- a/Entiers/Entiers.java
+++ b/Entiers/Entiers.java
@@ -52,7 +52,7 @@ class Entiers {
         int middle = (first + last) / 2;
         if (value == int_array[middle])
             return middle;
-        if (value > int_array[middle])
+        else if (value > int_array[middle])
             return binarySearch((middle + 1), last, value);
         return binarySearch(first, (middle -1), value);
     }