From bdf5a8103408c3503741f416d5dbf0d6d9a21593 Mon Sep 17 00:00:00 2001
From: "tanguy.dietrich" <tanguy.dietrich@etu.hesge.ch>
Date: Sun, 3 Nov 2019 11:00:53 +0100
Subject: [PATCH] Ecriture de .populate() pour le BinaryHeap
---
src/main/java/ch/hepia/structure/BinaryHeap.java | 11 +++++++++++
src/test/java/ch/hepia/structure/AppTest.java | 10 +++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/ch/hepia/structure/BinaryHeap.java b/src/main/java/ch/hepia/structure/BinaryHeap.java
index fe7cfc1..35ff6b7 100644
--- a/src/main/java/ch/hepia/structure/BinaryHeap.java
+++ b/src/main/java/ch/hepia/structure/BinaryHeap.java
@@ -4,6 +4,7 @@ import java.util.List;
import java.util.ArrayList;
import java.util.function.DoubleFunction;
import java.util.function.Function;
+import java.util.Random;
final public class BinaryHeap
{
@@ -22,6 +23,15 @@ final public class BinaryHeap
this.sort();
}
+ public static void populate(BinaryHeap heap, int size)
+ {
+ Random rand = new Random();
+ for(int i=0;i<size;i++)
+ {
+ heap.push(rand.nextInt(100));
+ }
+ }
+
private void sort()
{
int index=this.size()-1;
@@ -65,6 +75,7 @@ final public class BinaryHeap
{
System.out.println(val);
}
+ System.out.println("");
}
public int size()
diff --git a/src/test/java/ch/hepia/structure/AppTest.java b/src/test/java/ch/hepia/structure/AppTest.java
index b24c38f..86c864a 100644
--- a/src/test/java/ch/hepia/structure/AppTest.java
+++ b/src/test/java/ch/hepia/structure/AppTest.java
@@ -11,9 +11,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
class BinaryHeapTest
{
@Test
- void BinaryHeapPushTest()
+ void BinaryHeapMainOpreationTest()
{
BinaryHeap bHeap= new BinaryHeap();
+ BinaryHeap bHeapRand= new BinaryHeap();
+ BinaryHeap.populate(bHeapRand,20);
bHeap.push(100);
bHeap.push(19);
bHeap.push(36);
@@ -24,7 +26,9 @@ class BinaryHeapTest
bHeap.push(2);
bHeap.push(7);
bHeap.push(40);
- bHeap.print();
- //assertEquals();
+ //bHeap.print();
+ //bHeapRand.print();
+ assertEquals(bHeap.size(),10);
+ assertEquals(bHeapRand.size(),20);
}
}
--
GitLab