From bada13a2ccedd860dfd7a45683e8e8f4ba8a038d Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Sun, 17 Apr 2016 20:51:38 -0400 Subject: Added new tree traversal option, and some minor changes --- .../main/java/bjc/utils/data/BoundLazyPair.java | 21 ++++++++++----- .../src/main/java/bjc/utils/data/LazyPair.java | 27 +++++++++++++++++-- BJC-Utils2/src/main/java/bjc/utils/data/Pair.java | 10 +++++-- .../src/main/java/bjc/utils/funcdata/ITree.java | 17 ++++++++++-- .../bjc/utils/funcdata/TopDownTransformResult.java | 22 +++++++++++++++ .../src/main/java/bjc/utils/funcdata/Tree.java | 31 ++++++++++++++++++++++ .../main/java/bjc/utils/funcutils/ListUtils.java | 11 +++++--- .../main/java/bjc/utils/graph/AdjacencyMap.java | 5 +--- 8 files changed, 124 insertions(+), 20 deletions(-) create mode 100644 BJC-Utils2/src/main/java/bjc/utils/funcdata/TopDownTransformResult.java (limited to 'BJC-Utils2/src') diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java index 41ab99b..40c502c 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/BoundLazyPair.java @@ -60,8 +60,8 @@ class BoundLazyPair @Override public IPair bind( BiFunction> bindr) { - IHolder> newPair = new Identity<>( - boundPair); + IHolder> newPair = + new Identity<>(boundPair); IHolder newPairMade = new Identity<>(pairBound); Supplier leftSupp = () -> { @@ -90,15 +90,24 @@ class BoundLazyPair } @Override - public MergedType merge( - BiFunction merger) { + public MergedType + merge(BiFunction merger) { if (!pairBound) { - boundPair = binder.apply(leftSupplier.get(), - rightSupplier.get()); + boundPair = + binder.apply(leftSupplier.get(), rightSupplier.get()); pairBound = true; } return boundPair.merge(merger); } + + @Override + public String toString() { + if (pairBound) { + return boundPair.toString(); + } + + return "(un-materialized)"; + } } \ No newline at end of file diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java b/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java index fd432c1..7ae5e96 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/LazyPair.java @@ -93,8 +93,8 @@ public class LazyPair } @Override - public MergedType merge( - BiFunction merger) { + public MergedType + merge(BiFunction merger) { if (!leftMaterialized) { leftValue = leftSupplier.get(); @@ -131,4 +131,27 @@ public class LazyPair return rightValue; } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("pair[l="); + + if (leftMaterialized) { + sb.append(leftValue.toString()); + } else { + sb.append("(un-materialized)"); + } + + sb.append(", r="); + + if (rightMaterialized) { + sb.append(rightValue.toString()); + } else { + sb.append("(un-materialized)"); + } + + sb.append("]"); + + return sb.toString(); + } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java b/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java index 958df40..94affd0 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/Pair.java @@ -56,8 +56,14 @@ public class Pair } @Override - public MergedType merge( - BiFunction merger) { + public MergedType + merge(BiFunction merger) { return merger.apply(leftValue, rightValue); } + + @Override + public String toString() { + return "pair[l=" + leftValue.toString() + ", r=" + + rightValue.toString() + "]"; + } } \ No newline at end of file diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITree.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITree.java index 624c9d6..7f28682 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITree.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITree.java @@ -114,8 +114,8 @@ public interface ITree { * The function to use to transform tokens * @return A tree with the token types transformed */ - public ITree transformTree( - Function transformer); + public ITree + transformTree(Function transformer); /** * Perform an action on each part of the tree @@ -142,4 +142,17 @@ public interface ITree { public ITree rebuildTree( Function leafTransformer, Function operatorTransformer); + + /** + * Do a top-down transform of the tree + * + * @param transformPicker + * The function to use to pick how to progress + * @param transformer + * The function used to transform picked subtrees + * @return The tree with the transform applied to picked subtrees + */ + public ITree topDownTransform( + Function transformPicker, + UnaryOperator> transformer); } diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/TopDownTransformResult.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/TopDownTransformResult.java new file mode 100644 index 0000000..9aec2b9 --- /dev/null +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/TopDownTransformResult.java @@ -0,0 +1,22 @@ +package bjc.utils.funcdata; + +/** + * Represents the results for doing a top-down transform of a tree + * + * @author ben + * + */ +public enum TopDownTransformResult { + /** + * Do not do anything to this node, and ignore it's children + */ + SKIP, + /** + * Transform this node, and don't touch its children + */ + TRANSFORM, + /** + * Ignore this node, and traverse its children + */ + PASSTHROUGH; +} diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/Tree.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/Tree.java index 5ee4200..03a1f93 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/Tree.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/Tree.java @@ -262,4 +262,35 @@ public class Tree implements ITree { }); } } + + @Override + public ITree topDownTransform( + Function transformPicker, + UnaryOperator> transformer) { + TopDownTransformResult transformResult = + transformPicker.apply(data); + + switch (transformResult) { + case PASSTHROUGH: + ITree result = new Tree<>(data); + + if (hasChildren) { + children.forEach((child) -> { + result.addChild(child.topDownTransform( + transformPicker, transformer)); + }); + } + + return result; + case SKIP: + return this; + case TRANSFORM: + return transformer.apply(this); + default: + throw new IllegalArgumentException( + "Recieved unknown transform result " + + transformResult); + + } + } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java index 95873e9..828f4c3 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java @@ -128,12 +128,15 @@ public class ListUtils { IHolder> returnedList = new Identity<>(input); - operators.forEach((operator) -> returnedList - .transform((oldReturn) -> oldReturn.flatMap((token) -> { + operators.forEach((operator) -> { + returnedList.transform((oldReturn) -> { + return oldReturn.flatMap((token) -> { return operator.merge(new TokenSplitter(token)); - }))); + }); + }); + }); - return returnedList.unwrap((list) -> list); + return returnedList.getValue(); } /** diff --git a/BJC-Utils2/src/main/java/bjc/utils/graph/AdjacencyMap.java b/BJC-Utils2/src/main/java/bjc/utils/graph/AdjacencyMap.java index 7b240b8..8386474 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/graph/AdjacencyMap.java +++ b/BJC-Utils2/src/main/java/bjc/utils/graph/AdjacencyMap.java @@ -5,8 +5,6 @@ import java.io.OutputStream; import java.io.PrintStream; import java.util.InputMismatchException; import java.util.Scanner; -import java.util.stream.IntStream; - import bjc.utils.data.IHolder; import bjc.utils.data.Identity; import bjc.utils.funcdata.FunctionalList; @@ -109,8 +107,7 @@ public class AdjacencyMap { throw imex; } - adjacencyMap.setWeight(row.getValue(), column, - columnWeight); + adjacencyMap.setWeight(row.getValue(), column, columnWeight); column++; } -- cgit v1.2.3