diff options
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/funcdata/bst')
3 files changed, 10 insertions, 8 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java index 3f65481..0bd0119 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTree.java @@ -53,7 +53,7 @@ public class BinarySearchTree<T> { nCount++; if (root == null) { - root = new BinarySearchTreeNode<T>(dat, null, null); + root = new BinarySearchTreeNode<>(dat, null, null); } else { root.add(dat, comp); } @@ -75,7 +75,8 @@ public class BinarySearchTree<T> { while ((piv - adj) >= 0 && (piv + adj) < elms.getSize()) { if (root == null) { - root = new BinarySearchTreeNode<T>(elms.getByIndex(piv), null, null); + root = new BinarySearchTreeNode<>(elms.getByIndex(piv), + null, null); } else { root.add(elms.getByIndex(piv + adj), comp); root.add(elms.getByIndex(piv - adj), comp); diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeLeaf.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeLeaf.java index 02b9c7a..9befd17 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeLeaf.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeLeaf.java @@ -66,8 +66,8 @@ public class BinarySearchTreeLeaf<T> implements ITreePart<T> { * java.util.Comparator) */ @Override - public boolean contains(T data, Comparator<T> cmp) { - return this.data.equals(data); + public boolean contains(T dat, Comparator<T> cmp) { + return this.data.equals(dat); } /* @@ -117,6 +117,7 @@ public class BinarySearchTreeLeaf<T> implements ITreePart<T> { * bjc.utils.data.bst.ITreePart#forEach(bjc.utils.data.bst.ITreePart. * TreeLinearizationMethod, java.util.function.Predicate) */ + @Override public boolean forEach(TreeLinearizationMethod tlm, Predicate<T> c) { return c.test(data); } diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java index 30a9fbd..715456c 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/bst/BinarySearchTreeNode.java @@ -55,7 +55,7 @@ public class BinarySearchTreeNode<T> extends BinarySearchTreeLeaf<T> { switch (comp.compare(data, dat)) { case -1: if (left == null) { - left = new BinarySearchTreeNode<T>(dat, null, null); + left = new BinarySearchTreeNode<>(dat, null, null); } else { left.add(dat, comp); } @@ -68,7 +68,7 @@ public class BinarySearchTreeNode<T> extends BinarySearchTreeLeaf<T> { } case 1: if (right == null) { - right = new BinarySearchTreeNode<T>(dat, null, null); + right = new BinarySearchTreeNode<>(dat, null, null); } else { right.add(dat, comp); } @@ -96,9 +96,9 @@ public class BinarySearchTreeNode<T> extends BinarySearchTreeLeaf<T> { } @Override - public boolean contains(T data, Comparator<T> cmp) { + public boolean contains(T dat, Comparator<T> cmp) { return directedWalk(ds -> { - switch (cmp.compare(data, ds)) { + switch (cmp.compare(dat, ds)) { case -1: return LEFT; case 0: |