summaryrefslogtreecommitdiff
path: root/src/main/java/bjc/funcdata/bst
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/bjc/funcdata/bst')
-rw-r--r--src/main/java/bjc/funcdata/bst/BinarySearchTree.java10
-rw-r--r--src/main/java/bjc/funcdata/bst/BinarySearchTreeLeaf.java2
-rw-r--r--src/main/java/bjc/funcdata/bst/BinarySearchTreeNode.java8
-rw-r--r--src/main/java/bjc/funcdata/bst/TreePart.java (renamed from src/main/java/bjc/funcdata/bst/ITreePart.java)2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/bjc/funcdata/bst/BinarySearchTree.java b/src/main/java/bjc/funcdata/bst/BinarySearchTree.java
index 2c5b4d8..99b67cd 100644
--- a/src/main/java/bjc/funcdata/bst/BinarySearchTree.java
+++ b/src/main/java/bjc/funcdata/bst/BinarySearchTree.java
@@ -6,7 +6,7 @@ import java.util.List;
import java.util.function.Predicate;
import bjc.funcdata.FunctionalList;
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
/**
* A binary search tree, with some mild support for functional traversal.
@@ -24,7 +24,7 @@ public class BinarySearchTree<T> {
private int elementCount;
/* The root element of the tree */
- private ITreePart<T> root;
+ private TreePart<T> root;
/**
* Create a new tree using the specified way to compare elements.
@@ -66,7 +66,7 @@ public class BinarySearchTree<T> {
*
* @return Whether the adjusted pivot is with the list.
*/
- private boolean adjustedPivotInBounds(final IList<T> elements, final int pivot,
+ private boolean adjustedPivotInBounds(final ListEx<T> elements, final int pivot,
final int pivotAdjustment) {
return ((pivot - pivotAdjustment) >= 0)
&& ((pivot + pivotAdjustment) < elements.getSize());
@@ -78,7 +78,7 @@ public class BinarySearchTree<T> {
* Takes O(N) time, but also O(N) space.
*/
public void balance() {
- final IList<T> elements = new FunctionalList<>();
+ final ListEx<T> elements = new FunctionalList<>();
/* Add each element to the list in sorted order. */
root.forEach(TreeLinearizationMethod.INORDER, element -> elements.add(element));
@@ -135,7 +135,7 @@ public class BinarySearchTree<T> {
*
* @return The root of the tree.
*/
- public ITreePart<T> getRoot() {
+ public TreePart<T> getRoot() {
return root;
}
diff --git a/src/main/java/bjc/funcdata/bst/BinarySearchTreeLeaf.java b/src/main/java/bjc/funcdata/bst/BinarySearchTreeLeaf.java
index 0b99cad..9532555 100644
--- a/src/main/java/bjc/funcdata/bst/BinarySearchTreeLeaf.java
+++ b/src/main/java/bjc/funcdata/bst/BinarySearchTreeLeaf.java
@@ -13,7 +13,7 @@ import java.util.function.Predicate;
* @param <T>
* The data stored in the tree.
*/
-public class BinarySearchTreeLeaf<T> implements ITreePart<T> {
+public class BinarySearchTreeLeaf<T> implements TreePart<T> {
/** The data held in this tree leaf */
protected T data;
diff --git a/src/main/java/bjc/funcdata/bst/BinarySearchTreeNode.java b/src/main/java/bjc/funcdata/bst/BinarySearchTreeNode.java
index a73f81a..0eef92a 100644
--- a/src/main/java/bjc/funcdata/bst/BinarySearchTreeNode.java
+++ b/src/main/java/bjc/funcdata/bst/BinarySearchTreeNode.java
@@ -20,10 +20,10 @@ import java.util.function.Predicate;
*/
public class BinarySearchTreeNode<T> extends BinarySearchTreeLeaf<T> {
/* The left child of this node */
- private ITreePart<T> left;
+ private TreePart<T> left;
/* The right child of this node */
- private ITreePart<T> right;
+ private TreePart<T> right;
/**
* Create a new node with the specified data and children.
@@ -37,8 +37,8 @@ public class BinarySearchTreeNode<T> extends BinarySearchTreeLeaf<T> {
* @param rght
* The right child of this node.
*/
- public BinarySearchTreeNode(final T element, final ITreePart<T> lft,
- final ITreePart<T> rght) {
+ public BinarySearchTreeNode(final T element, final TreePart<T> lft,
+ final TreePart<T> rght) {
super(element);
this.left = lft;
this.right = rght;
diff --git a/src/main/java/bjc/funcdata/bst/ITreePart.java b/src/main/java/bjc/funcdata/bst/TreePart.java
index bac640d..b451463 100644
--- a/src/main/java/bjc/funcdata/bst/ITreePart.java
+++ b/src/main/java/bjc/funcdata/bst/TreePart.java
@@ -13,7 +13,7 @@ import java.util.function.Predicate;
* @param <T>
* The data contained in this part of the tree.
*/
-public interface ITreePart<T> {
+public interface TreePart<T> {
/**
* Add a element below this tree part somewhere.
*