From deb582ffeda8d445218fd74ae6d56d69c9930f32 Mon Sep 17 00:00:00 2001
From: Tanguy <tanguy.dietrich@etu.hesge.ch>
Date: Fri, 8 Nov 2019 11:59:10 +0100
Subject: [PATCH] Ecriture de la fonction print() pour binaryHeap
---
.../ch/hepia/hangman/{hangman.java => Hangman.java} | 6 +++---
src/main/java/ch/hepia/structure/BinaryHeap.java | 13 +++++++++++--
src/test/java/ch/hepia/hangman/AppTest.java | 12 ++++++------
src/test/java/ch/hepia/structure/AppTest.java | 4 ++--
4 files changed, 22 insertions(+), 13 deletions(-)
rename src/main/java/ch/hepia/hangman/{hangman.java => Hangman.java} (98%)
diff --git a/src/main/java/ch/hepia/hangman/hangman.java b/src/main/java/ch/hepia/hangman/Hangman.java
similarity index 98%
rename from src/main/java/ch/hepia/hangman/hangman.java
rename to src/main/java/ch/hepia/hangman/Hangman.java
index 20505fd..62fc13d 100644
--- a/src/main/java/ch/hepia/hangman/hangman.java
+++ b/src/main/java/ch/hepia/hangman/Hangman.java
@@ -1,5 +1,5 @@
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
+}
diff --git a/src/main/java/ch/hepia/structure/BinaryHeap.java b/src/main/java/ch/hepia/structure/BinaryHeap.java
index 3e91507..7464140 100644
--- a/src/main/java/ch/hepia/structure/BinaryHeap.java
+++ b/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("");
}
diff --git a/src/test/java/ch/hepia/hangman/AppTest.java b/src/test/java/ch/hepia/hangman/AppTest.java
index 65aeca3..78184f2 100644
--- a/src/test/java/ch/hepia/hangman/AppTest.java
+++ b/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");
}
}
diff --git a/src/test/java/ch/hepia/structure/AppTest.java b/src/test/java/ch/hepia/structure/AppTest.java
index 1ea41ba..a1c9be5 100644
--- a/src/test/java/ch/hepia/structure/AppTest.java
+++ b/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);
--
GitLab