Skip to content

Commit b5302d6

Browse files
committed
fix heap bulk init
1 parent 630b066 commit b5302d6

File tree

7 files changed

+15
-33
lines changed

7 files changed

+15
-33
lines changed

Advanced.Algorithms.Tests/DataStructures/Heap/Max/BMaxHeap_Tests.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ public class BMaxHeap_Tests
1616
[TestMethod]
1717
public void BMaxHeap_Test()
1818
{
19+
var rnd = new Random();
1920

20-
var initial = new List<int>();
21-
22-
for (int i = 50; i >=0; i--)
23-
{
24-
initial.Add(i);
25-
}
21+
var initial = new List<int>(Enumerable.Range(0, 51)
22+
.OrderBy(x => rnd.Next()));
2623

2724
//insert test
2825
var tree = new BMaxHeap<int>(initial);
@@ -38,7 +35,7 @@ public void BMaxHeap_Test()
3835
Assert.AreEqual(Max, 99 - i);
3936
}
4037

41-
var rnd = new Random();
38+
4239
var testSeries = Enumerable.Range(1, 49)
4340
.OrderBy(x => rnd.Next()).ToList();
4441

Advanced.Algorithms.Tests/DataStructures/Heap/Max/D-aryMaxHeap_Tests.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@ public class AsD_aryMaxTree_Tests
1616
[TestMethod]
1717
public void AsD_aryHeap_Test()
1818
{
19-
var initial = new List<int>();
19+
var rnd = new Random();
2020

21-
for (int i = 0; i <= 50; i++)
22-
{
23-
initial.Add(i);
24-
}
21+
var initial = new List<int>(Enumerable.Range(0, 51)
22+
.OrderBy(x => rnd.Next()));
2523

26-
//insert test
2724
var tree = new D_aryMaxHeap<int>(4, initial);
28-
2925
for (int i = 51; i <= 99; i++)
3026
{
3127
tree.Insert(i);
@@ -37,7 +33,6 @@ public void AsD_aryHeap_Test()
3733
Assert.AreEqual(max, i);
3834
}
3935

40-
var rnd = new Random();
4136
var testSeries = Enumerable.Range(1, 49).OrderBy(x => rnd.Next()).ToList();
4237

4338
foreach (var item in testSeries)

Advanced.Algorithms.Tests/DataStructures/Heap/Min/BMinHeap_Tests.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ public class BMinHeap_Tests
1616
[TestMethod]
1717
public void BMinHeap_Test()
1818
{
19-
20-
var initial = new List<int>();
21-
22-
for (int i = 0; i <= 50; i++)
23-
{
24-
initial.Add(i);
25-
}
19+
var rnd = new Random();
20+
var initial = Enumerable.Range(0, 51).OrderBy(x => rnd.Next()).ToList();
2621

2722
//insert test
2823
var tree = new BMinHeap<int>(initial);
@@ -38,7 +33,7 @@ public void BMinHeap_Test()
3833
Assert.AreEqual(min, i);
3934
}
4035

41-
var rnd = new Random();
36+
4237
var testSeries = Enumerable.Range(1, 49).OrderBy(x => rnd.Next()).ToList();
4338

4439
foreach (var item in testSeries)

Advanced.Algorithms.Tests/DataStructures/Heap/Min/D-aryMinHeap_Tests.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ public class AsD_aryMinTree_Tests
1616
[TestMethod]
1717
public void AsD_aryHeap_Test()
1818
{
19-
var initial = new List<int>();
20-
21-
for (int i = 0; i <= 50; i++)
22-
{
23-
initial.Add(i);
24-
}
19+
var rnd = new Random();
20+
var initial = Enumerable.Range(0, 51).OrderBy(x => rnd.Next()).ToList();
2521

2622
//insert test
2723
var tree = new D_aryMinHeap<int>(4, initial);
@@ -37,7 +33,6 @@ public void AsD_aryHeap_Test()
3733
Assert.AreEqual(min, i);
3834
}
3935

40-
var rnd = new Random();
4136
var testSeries = Enumerable.Range(1, 49).OrderBy(x => rnd.Next()).ToList();
4237

4338
foreach (var item in testSeries)

Advanced.Algorithms/DataStructures/Heap/Max/BMaxHeap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public BMaxHeap(IEnumerable<T> initial = null)
2222
var initArray = new T[initial.Count()];
2323

2424
int i = 0;
25-
foreach (var item in initial.OrderByDescending(x=>x))
25+
foreach (var item in initial)
2626
{
2727
initArray[i] = item;
2828
i++;

Advanced.Algorithms/DataStructures/Heap/Max/d-aryMaxHeap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public D_aryMaxHeap(int k, IEnumerable<T> initial = null)
2020
var initArray = new T[initial.Count()];
2121

2222
int i = 0;
23-
foreach (var item in initial.OrderByDescending(x=>x))
23+
foreach (var item in initial)
2424
{
2525
initArray[i] = item;
2626
i++;

Advanced.Algorithms/DataStructures/Heap/Min/BMinHeap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public BMinHeap(IEnumerable<T> initial = null)
2222
var initArray = new T[initial.Count()];
2323

2424
int i = 0;
25-
foreach(var item in initial.OrderBy(x=>x))
25+
foreach(var item in initial)
2626
{
2727
initArray[i] = item;
2828
i++;

0 commit comments

Comments
 (0)