1 files changed, 142 insertions, 134 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
index 3f8d258..d8e6e39 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java
@@ -3,6 +3,7 @@ package bjc.utils.data;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.bst.TreeLinearizationMethod;
+import bjc.utils.functypes.ListFlattener;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -27,10 +28,10 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	private static int	nextID	= 0;
 
 	/**
-	 * Create a new leaf node in a tree
+	 * Create a new leaf node in a tree.
 	 *
 	 * @param leaf
-	 *                The data to store as a leaf node
+	 *                The data to store as a leaf node.
 	 */
 	public Tree(ContainedType leaf) {
 		data = leaf;
@@ -41,12 +42,13 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	}
 
 	/**
-	 * Create a new tree node with the specified children
+	 * Create a new tree node with the specified children.
 	 *
 	 * @param leaf
-	 *                The data to hold in this node
+	 *                The data to hold in this node.
+	 * 
 	 * @param childrn
-	 *                A list of children for this node
+	 *                A list of children for this node.
 	 */
 	public Tree(ContainedType leaf, IList<ITree<ContainedType>> childrn) {
 		this(leaf);
@@ -59,12 +61,13 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	}
 
 	/**
-	 * Create a new tree node with the specified children
+	 * Create a new tree node with the specified children.
 	 *
 	 * @param leaf
-	 *                The data to hold in this node
+	 *                The data to hold in this node.
+	 * 
 	 * @param childrn
-	 *                A list of children for this node
+	 *                A list of children for this node.
 	 */
 	@SafeVarargs
 	public Tree(ContainedType leaf, ITree<ContainedType>... childrn) {
@@ -76,7 +79,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 
 		children = new FunctionalList<>();
 
-		for(ITree<ContainedType> child : childrn) {
+		for (ITree<ContainedType> child : childrn) {
 			children.add(child);
 
 			childCount++;
@@ -85,7 +88,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 
 	@Override
 	public void addChild(ITree<ContainedType> child) {
-		if(hasChildren == false) {
+		if (hasChildren == false) {
 			hasChildren = true;
 
 			children = new FunctionalList<>();
@@ -97,27 +100,92 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	}
 
 	@Override
-	public <NewType, ReturnedType> ReturnedType collapse(Function<ContainedType, NewType> leafTransform,
-			Function<ContainedType, Function<IList<NewType>, NewType>> nodeCollapser,
-			Function<NewType, ReturnedType> resultTransformer) {
-
-		return resultTransformer.apply(internalCollapse(leafTransform, nodeCollapser));
+	public void prependChild(ITree<ContainedType> child) {
+		if (hasChildren == false) {
+			hasChildren = true;
+	
+			children = new FunctionalList<>();
+		}
+	
+		childCount++;
+	
+		children.prepend(child);
 	}
 
 	@Override
 	public void doForChildren(Consumer<ITree<ContainedType>> action) {
-		if(childCount > 0) {
+		if (childCount > 0) {
 			children.forEach(action);
 		}
 	}
 
 	@Override
+	public int getChildrenCount() {
+		return childCount;
+	}
+
+	@Override
+	public int revFind(Predicate<ITree<ContainedType>> childPred) {
+		if (childCount == 0) {
+			return -1;
+		} else {
+			for (int i = childCount - 1; i >= 0; i--) {
+				if (childPred.test(getChild(i))) {
+					return i;
+				}
+			}
+		}
+	
+		return -1;
+	}
+
+	@Override
+	public void traverse(TreeLinearizationMethod linearizationMethod, Consumer<ContainedType> action) {
+		if (hasChildren) {
+			switch (linearizationMethod) {
+			case INORDER:
+				if (childCount != 2) throw new IllegalArgumentException(
+						"Can only do in-order traversal for binary trees.");
+	
+				children.getByIndex(0).traverse(linearizationMethod, action);
+	
+				action.accept(data);
+	
+				children.getByIndex(1).traverse(linearizationMethod, action);
+				break;
+			case POSTORDER:
+				children.forEach((child) -> child.traverse(linearizationMethod, action));
+	
+				action.accept(data);
+				break;
+			case PREORDER:
+				action.accept(data);
+	
+				children.forEach((child) -> child.traverse(linearizationMethod, action));
+				break;
+			default:
+				break;
+	
+			}
+		} else {
+			action.accept(data);
+		}
+	}
+
+	@Override
+	public <NewType, ReturnedType> ReturnedType collapse(Function<ContainedType, NewType> leafTransform,
+			Function<ContainedType, ListFlattener<NewType>> nodeCollapser,
+			Function<NewType, ReturnedType> resultTransformer) {
+		return resultTransformer.apply(internalCollapse(leafTransform, nodeCollapser));
+	}
+
+	@Override
 	public ITree<ContainedType> flatMapTree(Function<ContainedType, ITree<ContainedType>> mapper) {
-		if(hasChildren) {
+		if (hasChildren) {
 			ITree<ContainedType> flatMappedData = mapper.apply(data);
 
-			children.map((child) -> child.flatMapTree(mapper))
-					.forEach((child) -> flatMappedData.addChild(child));
+			IList<ITree<ContainedType>> mappedChildren = children.map((child) -> child.flatMapTree(mapper));
+			mappedChildren.forEach((child) -> flatMappedData.addChild(child));
 
 			return flatMappedData;
 		}
@@ -125,14 +193,9 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 		return mapper.apply(data);
 	}
 
-	@Override
-	public int getChildrenCount() {
-		return childCount;
-	}
-
 	protected <NewType> NewType internalCollapse(Function<ContainedType, NewType> leafTransform,
-			Function<ContainedType, Function<IList<NewType>, NewType>> nodeCollapser) {
-		if(hasChildren) {
+			Function<ContainedType, ListFlattener<NewType>> nodeCollapser) {
+		if (hasChildren) {
 			Function<IList<NewType>, NewType> nodeTransformer = nodeCollapser.apply(data);
 
 			IList<NewType> collapsedChildren = children.map((child) -> {
@@ -149,7 +212,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	}
 
 	protected void internalToString(StringBuilder builder, int indentLevel, boolean initial) {
-		for(int i = 0; i < indentLevel; i++) {
+		for (int i = 0; i < indentLevel; i++) {
 			builder.append(">\t");
 		}
 
@@ -159,9 +222,19 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 		builder.append(data == null ? "(null)" : data.toString());
 		builder.append("\n");
 
-		if(hasChildren) {
+		if (hasChildren) {
 			children.forEach((child) -> {
-				((Tree<ContainedType>) child).internalToString(builder, indentLevel + 1, false);
+				if (child instanceof Tree<?>) {
+					Tree<ContainedType> kid = (Tree<ContainedType>) child;
+
+					kid.internalToString(builder, indentLevel + 1, false);
+				} else {
+					for (int i = 0; i < indentLevel + 1; i++) {
+						builder.append(">\t");
+					}
+
+					builder.append("Unknown node\n");
+				}
 			});
 		}
 	}
@@ -169,7 +242,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	@Override
 	public <MappedType> ITree<MappedType> rebuildTree(Function<ContainedType, MappedType> leafTransformer,
 			Function<ContainedType, MappedType> operatorTransformer) {
-		if(hasChildren) {
+		if (hasChildren) {
 			IList<ITree<MappedType>> mappedChildren = children.map((child) -> {
 				return child.rebuildTree(leafTransformer, operatorTransformer);
 			});
@@ -182,7 +255,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 
 	@Override
 	public void selectiveTransform(Predicate<ContainedType> nodePicker, UnaryOperator<ContainedType> transformer) {
-		if(hasChildren) {
+		if (hasChildren) {
 			children.forEach((child) -> child.selectiveTransform(nodePicker, transformer));
 		} else {
 			data = transformer.apply(data);
@@ -194,13 +267,15 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 			UnaryOperator<ITree<ContainedType>> transformer) {
 		TopDownTransformResult transformResult = transformPicker.apply(data);
 
-		switch(transformResult) {
+		switch (transformResult) {
 		case PASSTHROUGH:
 			ITree<ContainedType> result = new Tree<>(data);
 
-			if(hasChildren) {
+			if (hasChildren) {
 				children.forEach((child) -> {
-					result.addChild(child.topDownTransform(transformPicker, transformer));
+					ITree<ContainedType> kid = child.topDownTransform(transformPicker, transformer);
+
+					result.addChild(kid);
 				});
 			}
 
@@ -214,9 +289,11 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 		case PUSHDOWN:
 			result = new Tree<>(data);
 
-			if(hasChildren) {
+			if (hasChildren) {
 				children.forEach((child) -> {
-					result.addChild(child.topDownTransform(transformPicker, transformer));
+					ITree<ContainedType> kid = child.topDownTransform(transformPicker, transformer);
+
+					result.addChild(kid);
 				});
 			}
 
@@ -227,7 +304,9 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 			result = new Tree<>(intermediateResult.getHead());
 
 			intermediateResult.doForChildren((child) -> {
-				result.addChild(child.topDownTransform(transformPicker, transformer));
+				ITree<ContainedType> kid = child.topDownTransform(transformPicker, transformer);
+
+				result.addChild(kid);
 			});
 
 			return result;
@@ -238,23 +317,14 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	}
 
 	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-
-		internalToString(builder, 1, true);
-
-		builder.deleteCharAt(builder.length() - 1);
-
-		return builder.toString();
-	}
-
-	@Override
 	public <TransformedType> TransformedType transformChild(int childNo,
 			Function<ITree<ContainedType>, TransformedType> transformer) {
-		if(childNo < 0 || childNo > childCount - 1)
+		if (childNo < 0 || childNo > childCount - 1)
 			throw new IllegalArgumentException("Child index #" + childNo + " is invalid");
 
-		return transformer.apply(children.getByIndex(childNo));
+		ITree<ContainedType> selectedKid = children.getByIndex(childNo);
+
+		return transformer.apply(selectedKid);
 	}
 
 	@Override
@@ -263,51 +333,6 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	}
 
 	@Override
-	public <MappedType> ITree<MappedType> transformTree(Function<ContainedType, MappedType> transformer) {
-		if(hasChildren) {
-			IList<ITree<MappedType>> transformedChildren = children
-					.map((child) -> child.transformTree(transformer));
-
-			return new Tree<>(transformer.apply(data), transformedChildren);
-		}
-
-		return new Tree<>(transformer.apply(data));
-	}
-
-	@Override
-	public void traverse(TreeLinearizationMethod linearizationMethod, Consumer<ContainedType> action) {
-		if(hasChildren) {
-			switch(linearizationMethod) {
-			case INORDER:
-				if(childCount != 2) throw new IllegalArgumentException(
-						"Can only do in-order traversal for binary trees.");
-
-				children.getByIndex(0).traverse(linearizationMethod, action);
-
-				action.accept(data);
-
-				children.getByIndex(1).traverse(linearizationMethod, action);
-				break;
-			case POSTORDER:
-				children.forEach((child) -> child.traverse(linearizationMethod, action));
-
-				action.accept(data);
-				break;
-			case PREORDER:
-				action.accept(data);
-
-				children.forEach((child) -> child.traverse(linearizationMethod, action));
-				break;
-			default:
-				break;
-
-			}
-		} else {
-			action.accept(data);
-		}
-	}
-
-	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
@@ -320,51 +345,34 @@ public class Tree<ContainedType> implements ITree<ContainedType> {
 	}
 
 	@Override
-	public boolean equals(Object obj) {
-		if(this == obj) return true;
-		if(obj == null) return false;
-		if(getClass() != obj.getClass()) return false;
-
-		Tree<?> other = (Tree<?>) obj;
-
-		if(data == null) {
-			if(other.data != null) return false;
-		} else if(!data.equals(other.data)) return false;
-
-		if(childCount != other.childCount) return false;
-
-		if(children == null) {
-			if(other.children != null) return false;
-		} else if(!children.equals(other.children)) return false;
-
-		return true;
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+	
+		internalToString(builder, 1, true);
+	
+		builder.deleteCharAt(builder.length() - 1);
+	
+		return builder.toString();
 	}
 
 	@Override
-	public int revFind(Predicate<ITree<ContainedType>> childPred) {
-		if(childCount == 0) {
-			return -1;
-		} else {
-			for(int i = childCount - 1; i >= 0; i--) {
-				if(childPred.test(getChild(i))) {
-					return i;
-				}
-			}
-		}
+	public boolean equals(Object obj) {
+		if (this == obj) return true;
+		if (obj == null) return false;
+		if (getClass() != obj.getClass()) return false;
 
-		return -1;
-	}
+		Tree<?> other = (Tree<?>) obj;
 
-	@Override
-	public void prependChild(ITree<ContainedType> child) {
-		if(hasChildren == false) {
-			hasChildren = true;
+		if (data == null) {
+			if (other.data != null) return false;
+		} else if (!data.equals(other.data)) return false;
 
-			children = new FunctionalList<>();
-		}
+		if (childCount != other.childCount) return false;
 
-		childCount++;
+		if (children == null) {
+			if (other.children != null) return false;
+		} else if (!children.equals(other.children)) return false;
 
-		children.prepend(child);
+		return true;
 	}
-}
+}
\ No newline at end of file