Skip to content
Snippets Groups Projects
Commit bdf5a810 authored by tanguy.dietrich's avatar tanguy.dietrich
Browse files

Ecriture de .populate() pour le BinaryHeap

parent 4f543c18
No related branches found
No related tags found
2 merge requests!2Tanguy,!1David
This commit is part of merge request !2. Comments created here will be created in the context of that merge request.
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.function.DoubleFunction; import java.util.function.DoubleFunction;
import java.util.function.Function; import java.util.function.Function;
import java.util.Random;
final public class BinaryHeap final public class BinaryHeap
{ {
...@@ -22,6 +23,15 @@ final public class BinaryHeap ...@@ -22,6 +23,15 @@ final public class BinaryHeap
this.sort(); 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() private void sort()
{ {
int index=this.size()-1; int index=this.size()-1;
...@@ -65,6 +75,7 @@ final public class BinaryHeap ...@@ -65,6 +75,7 @@ final public class BinaryHeap
{ {
System.out.println(val); System.out.println(val);
} }
System.out.println("");
} }
public int size() public int size()
......
...@@ -11,9 +11,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse; ...@@ -11,9 +11,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
class BinaryHeapTest class BinaryHeapTest
{ {
@Test @Test
void BinaryHeapPushTest() void BinaryHeapMainOpreationTest()
{ {
BinaryHeap bHeap= new BinaryHeap(); BinaryHeap bHeap= new BinaryHeap();
BinaryHeap bHeapRand= new BinaryHeap();
BinaryHeap.populate(bHeapRand,20);
bHeap.push(100); bHeap.push(100);
bHeap.push(19); bHeap.push(19);
bHeap.push(36); bHeap.push(36);
...@@ -24,7 +26,9 @@ class BinaryHeapTest ...@@ -24,7 +26,9 @@ class BinaryHeapTest
bHeap.push(2); bHeap.push(2);
bHeap.push(7); bHeap.push(7);
bHeap.push(40); bHeap.push(40);
bHeap.print(); //bHeap.print();
//assertEquals(); //bHeapRand.print();
assertEquals(bHeap.size(),10);
assertEquals(bHeapRand.size(),20);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment