8000 给部分方法添加有界通配符。 · fatherican/javaalgorithm@d6e0d0a · GitHub
[go: up one dir, main page]

Skip to content

Commit d6e0d0a

Browse files
author
shengshijun
committed
给部分方法添加有界通配符。
1 parent ed7cb37 commit d6e0d0a

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

src/main/java/ssj/algorithm/SearchTree.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package ssj.algorithm;
22

3+
import com.google.common.base.Preconditions;
4+
35
import java.util.Iterator;
46

57
/**
@@ -8,6 +10,13 @@
810
public interface SearchTree<T extends Comparable<T>> extends Iterable<T> {
911
void add(T ele);
1012

13+
default void addAll(Iterable<? extends T> iter) {
14+
Preconditions.checkNotNull(iter);
15+
for (T ele : iter) {
16+
add(ele);
17+
}
18+
}
19+
1120
int size();
1221

1322
Iterator<T> preIterator();

src/main/java/ssj/algorithm/collections/AVLTree.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private int pathLength(Node node) {
203203
return result;
204204
}
205205

206-
private Node getCommonNode(Stack<Node> one, Stack<Node> other) {
206+
private Node getCommonNode(Stack<?extends Node> one, Stack<? extends Node> other) {
207207
Preconditions.checkNotNull(one);
208208
Preconditions.checkNotNull(other);
209209
Preconditions.checkArgument(!one.equals(other));
@@ -276,6 +276,7 @@ private Vector<LinkedList<Node>> createLevelLinkedList() {
276276
* @param tree
277277
* @return
278278
*/
279+
@SuppressWarnings("unused")
279280
public boolean isSubTree(AVLTree<T> tree) {
280281
Preconditions.checkNotNull(tree);
281282
if (_head.getValue() == null && tree._head.getValue() == null) {

src/test/java/ssj/algorithm/collections/AVLTreeTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,22 @@ public void testPathIterator() {
176176
public void testCommonParent() {
177177
int[] tree_data = new int[]{10, 4, 6, 14, 4, 8, 9, 12, 16, 11};
178178
AVLTree<Integer> tree = new AVLTree<>();
179-
assertTrue(tree.commonParent(4, 8) == null);
179+
assertTrue(tree.commonParent(8) == null);
180180
for (int i : tree_data) {
181181
tree.add(i);
182182
}
183183
//这个测试依赖于树的实现,并不通用
184-
assertTrue(tree.commonParent(4, 8).equals(6));
185-
assertTrue(tree.commonParent(9, 11).equals(10));
186-
assertTrue(tree.commonParent(9, 4).equals(6));
187-
assertTrue(tree.commonParent(16, 11).equals(14));
184+
assertTrue(tree.commonParent(8).equals(6));
185+
assertTrue(tree.commonParent(11).equals(10));
186+
assertTrue(tree.commonParent(4).equals(6));
187+
assertTrue(tree.commonParent(11).equals(14));
188188
}
189189

190190
@Test
191191
public void testGetCommonParent() {
192192
int[] tree_data = new int[]{10, 4, 6, 14, 4, 8, 9, 12, 16, 11};
193193
AVLTree<Integer> tree = new AVLTree<>();
194-
assertTrue(tree.commonParent(4, 8) == null);
194+
assertTrue(tree.commonParent(8) == null);
195195
for (int i : tree_data) {
196196
tree.add(i);
197197
}

0 commit comments

Comments
 (0)
0