Ecriture de la fonction print() pour binaryHeap

src/main/java/ch/hepia/hangman/hangman.java → src/main/java/ch/hepia/hangman/Hangman.java

 package ch.hepia.hangman;
-public class hangman
+public class Hangman
 {
     /*
     currentWord = l'avancement actuel du mot ex : _a___ == David
@@ -12,7 +12,7 @@ public class hangman
 
     resultat = _a____
     */
-    public static String check(String currentWord,String guessWord,char letter) 
+    public static String check(String currentWord,String guessWord,char letter)
     {
         //les string sont immutable en java
         //conversion en tableau de char
@@ -136,4 +136,4 @@ public class hangman
         return pot;
     }
 
-}
+}
\ No newline at end of file

src/main/java/ch/hepia/structure/BinaryHeap.java

@@ -136,9 +136,18 @@ final public class BinaryHeap
 
     public void print()
     {
-      for(int val:lstBinaryHeap)
+      int index=0;
+      for(int etage=1;etage<=this.depth();etage++)//e
       {
-        System.out.println(val);
+        for(int nToShow=0;nToShow<Math.pow(2,etage-1);nToShow++)//n
+        {
+          if(index<this.size())
+          {
+            System.out.print(" "+this.get(index)+" ");
+          }
+          index++;
+        }
+        System.out.println("");
       }
       System.out.println("");
     }

src/test/java/ch/hepia/hangman/AppTest.java

@@ -13,21 +13,21 @@ class HangmanTests
   @Test
   void check_create()
   {
-      String hiddenWord= hangman.createWord("david");
+      String hiddenWord= Hangman.createWord("david");
       assertEquals(hiddenWord,"_____");
 
   }
   @Test
-  void check_test() 
-  {  
-      String hiddenWord= hangman.createWord("david");
-      hiddenWord=hangman.check(hiddenWord,"david",'d');
+  void check_test()
+  {
+      String hiddenWord= Hangman.createWord("david");
+      hiddenWord=Hangman.check(hiddenWord,"david",'d');
       assertEquals(hiddenWord,"d___d");
   }
   @Test
   void check_potence()
   {
-    String potence =hangman.showHangman(2);
+    String potence =Hangman.showHangman(2);
     assertEquals(potence,"----------\n|/       |\n|\n|\n|\n|\n|\n|\n");
   }
 }

src/test/java/ch/hepia/structure/AppTest.java

@@ -31,9 +31,9 @@ class BinaryHeapTest
     bHeap.push(7);lst.add(7);
     bHeap.push(40);lst.add(40);
     bHeap2.addAll(lst);
-    //bHeap.print();
+    bHeap.print();
     //bHeap2.print();
-    //bHeapRand.print();
+    bHeapRand.print();
     assertEquals(bHeap.size(),10);
     assertEquals(bHeapRand.size(),20);
     assertEquals(bHeapEmpty.isEmpty(),true);