From e11736705ec74d19b1bf11ed12730da79e68efec Mon Sep 17 00:00:00 2001
From: "tanguy.dietrich" <tanguy.dietrich@etu.hesge.ch>
Date: Sun, 3 Nov 2019 11:26:44 +0100
Subject: [PATCH] Ecriture de .isEmpty(), et .exist() pour le BinaryHeap
---
.../java/ch/hepia/structure/BinaryHeap.java | 24 +++++++++++++++++++
src/test/java/ch/hepia/structure/AppTest.java | 5 ++++
2 files changed, 29 insertions(+)
diff --git a/src/main/java/ch/hepia/structure/BinaryHeap.java b/src/main/java/ch/hepia/structure/BinaryHeap.java
index 35ff6b7..e05737a 100644
--- a/src/main/java/ch/hepia/structure/BinaryHeap.java
+++ b/src/main/java/ch/hepia/structure/BinaryHeap.java
@@ -23,6 +23,30 @@ final public class BinaryHeap
this.sort();
}
+ public boolean isEmpty()
+ {
+ if(this.size()==0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ public boolean exist(int k)
+ {
+ for(int val:this.lstBinaryHeap)
+ {
+ if(k==val)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static void populate(BinaryHeap heap, int size)
{
Random rand = new Random();
diff --git a/src/test/java/ch/hepia/structure/AppTest.java b/src/test/java/ch/hepia/structure/AppTest.java
index 86c864a..f0234d8 100644
--- a/src/test/java/ch/hepia/structure/AppTest.java
+++ b/src/test/java/ch/hepia/structure/AppTest.java
@@ -15,6 +15,7 @@ class BinaryHeapTest
{
BinaryHeap bHeap= new BinaryHeap();
BinaryHeap bHeapRand= new BinaryHeap();
+ BinaryHeap bHeapEmpty= new BinaryHeap();
BinaryHeap.populate(bHeapRand,20);
bHeap.push(100);
bHeap.push(19);
@@ -30,5 +31,9 @@ class BinaryHeapTest
//bHeapRand.print();
assertEquals(bHeap.size(),10);
assertEquals(bHeapRand.size(),20);
+ assertEquals(bHeapEmpty.isEmpty(),true);
+ assertEquals(bHeapRand.isEmpty(),false);
+ assertEquals(bHeap.exist(7),true);
+ assertEquals(bHeap.exist(42),false);
}
}
--
GitLab