Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 98c9394

Browse files
Code cleanup in Interval sum and rooted tree
1 parent 75661cb commit 98c9394

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
11
package com.jwetherell.algorithms.data_structures;
22

3-
import org.junit.Test;
3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertTrue;
45

56
import java.util.ArrayList;
67
import java.util.List;
78
import java.util.Random;
89

9-
import staticorg.junit.Assert.*;
10+
import org.junit.Test;
1011

1112
public class IntervalSumArrayTest {
1213

1314
@Test
1415
public void properSumAllElementsTest() {
15-
IntervalSumArray sub = new IntervalSumArray();
16-
for(int i = 0; i<=100; i++)
16+
finalIntervalSumArray sub = new IntervalSumArray();
17+
for(int i = 0; i<=100; i++)
1718
sub.add(i);
18-
for(int i = 0; i<=100; i++)
19+
for(int i = 0; i<=100; i++)
1920
assertEquals(i*(i+1)/2, sub.sum(i));
2021
assertEquals(100*101/2, sub.sum());
2122
}
2223

2324
@Test
2425
public void randomGeneratedTest() {
25-
Random generator = new Random(42);
26-
List<Integer> list = new ArrayList<>();
27-
for(int i = 0; i<=100; i++)
26+
finalRandom generator = new Random(42);
27+
finalList<Integer> list = new ArrayList<Integer>();
28+
for(int i = 0; i<=100; i++)
2829
list.add(i);
29-
IntervalSumArray sum = new IntervalSumArray(list);
30-
for(int i = 0; i<1000000; i++) {
31-
int pos = generator.nextInt(100);
32-
int val = generator.nextInt(2000000) - 1000000;
30+
finalIntervalSumArray sum = new IntervalSumArray(list);
31+
for(int i = 0; i<1000000; i++) {
32+
finalint pos = generator.nextInt(100);
33+
finalint val = generator.nextInt(2000000) - 1000000;
3334
sum.set(pos, val);
3435
list.set(pos, val);
3536
assertEquals(val, sum.get(pos));
3637
}
3738

3839
int s = 0;
39-
List<Integer> prefSum = new ArrayList<>();
40+
finalList<Integer> prefSum = new ArrayList<Integer>();
4041
prefSum.add(s);
41-
for(Integer val: list) {
42+
for(Integer val: list) {
4243
s += val;
4344
prefSum.add(s);
4445
}
@@ -52,7 +53,7 @@ public void randomGeneratedTest() {
5253

5354
@Test
5455
public void setIndexOutOfRangeTest() {
55-
IntervalSumArray sum = new IntervalSumArray(100);
56+
finalIntervalSumArray sum = new IntervalSumArray(100);
5657
boolean thrown = false;
5758
try {
5859
sum.set(101, 10);
@@ -64,7 +65,7 @@ public void setIndexOutOfRangeTest() {
6465

6566
@Test
6667
public void sumIndexOutOfRangeTest() {
67-
IntervalSumArray sum = new IntervalSumArray(100);
68+
finalIntervalSumArray sum = new IntervalSumArray(100);
6869
boolean thrown = false;
6970
try {
7071
sum.sum(101);
@@ -76,7 +77,7 @@ public void sumIndexOutOfRangeTest() {
7677

7778
@Test
7879
public void endBeforeStartTest() {
79-
IntervalSumArray sum = new IntervalSumArray(100);
80+
finalIntervalSumArray sum = new IntervalSumArray(100);
8081
boolean thrown = false;
8182
try {
8283
sum.sum(101, 100);
@@ -85,5 +86,4 @@ public void endBeforeStartTest() {
8586
}
8687
assertTrue(thrown);
8788
}
88-
89-
}
89+
}

‎test/com/jwetherell/algorithms/data_structures/RootedTreeTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,29 @@ public class RootedTreeTest {
88

99
@Test
1010
public void largeTreeTest() throws RootedTree.NodesNotInSameTreeException {
11-
RootedTree<Integer> root = new RootedTree<>();
12-
RootedTree<Integer> left = root.addChild();
13-
RootedTree<Integer> middle = root.addChild();
14-
RootedTree<Integer> right = root.addChild();
11+
12+
final RootedTree<Integer> root = new RootedTree<Integer>();
13+
final RootedTree<Integer> left = root.addChild();
14+
final RootedTree<Integer> middle = root.addChild();
15+
final RootedTree<Integer> right = root.addChild();
1516

1617
//long path
1718
RootedTree<Integer> v = left;
18-
for(int i = 0; i<1000; i++)
19+
for(int i = 0; i<1000; i++)
1920
v = v.addChild();
2021
RootedTree<Integer> leftRight = left.addChild();
21-
2222
assertEquals(RootedTree.lowestCommonAncestor(v, leftRight), left);
2323

24-
for(int i = 0; i<2000; i++) {
24+
for(int i = 0; i<2000; i++) {
2525
leftRight = leftRight.addChild();
26-
2726
assertEquals(RootedTree.lowestCommonAncestor(v, leftRight), left);
2827
}
2928

3029
assertEquals(RootedTree.lowestCommonAncestor(middle, right), root);
3130
assertEquals(RootedTree.lowestCommonAncestor(root, right), root);
3231
assertEquals(RootedTree.lowestCommonAncestor(root, root), root);
3332

34-
RootedTree<Integer> root2 = new RootedTree<>();
33+
finalRootedTree<Integer> root2 = new RootedTree<Integer>();
3534
boolean thrownException = false;
3635
try {
3736
RootedTree.lowestCommonAncestor(v, root2);
@@ -40,11 +39,11 @@ public void largeTreeTest() throws RootedTree.NodesNotInSameTreeException {
4039
}
4140
assertTrue(thrownException);
4241

43-
RootedTree<Integer> deepChild = v.addChild(101);
42+
finalRootedTree<Integer> deepChild = v.addChild(101);
4443
assertEquals(deepChild, root.find(101));
4544
assertTrue(root.contains(101));
4645

4746
assertNull(root.find(102));
4847
assertFalse(root.contains(102));
4948
}
50-
}
49+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /