diff options
3 files changed, 93 insertions, 32 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/SingleIterator.java b/BJC-Utils2/src/main/java/bjc/utils/data/SingleIterator.java new file mode 100644 index 0000000..fde1197 --- /dev/null +++ b/BJC-Utils2/src/main/java/bjc/utils/data/SingleIterator.java @@ -0,0 +1,25 @@ +package bjc.utils.data; + +import java.util.Iterator; + +public class SingleIterator<T> implements Iterator<T> { + private T itm; + + private boolean yielded; + + public SingleIterator(T item) { + itm = item; + + yielded = false; + } + + public boolean hasNext() { + return !yielded; + } + + public T next() { + yielded = true; + + return itm; + } +} diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java b/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java index 4c5ec8a..d37123f 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/TopDownTransformIterator.java @@ -58,9 +58,48 @@ public class TopDownTransformIterator<ContainedType> implements Iterator<ITree<C return !done; } + public ITree<ContainedType> flushYields(ITree<ContainedType> val) { + if(curYield != null) { + toYield.add(new SingleIterator<>(val)); + + if(curYield.hasNext()) { + return curYield.next(); + } else { + while(toYield.size() != 0 && !curYield.hasNext()) { + curYield = toYield.pop(); + } + + if(toYield.size() == 0 && !curYield.hasNext()) { + curYield = null; + return val; + } else { + return curYield.next(); + } + } + } else { + return val; + } + } + public ITree<ContainedType> next() { if(done) throw new NoSuchElementException(); + if(curYield != null) { + if(curYield.hasNext()) { + return curYield.next(); + } else { + while(toYield.size() != 0 && !curYield.hasNext()) { + curYield = toYield.pop(); + } + + if(toYield.size() == 0 && !curYield.hasNext()) { + curYield = null; + } else { + return curYield.next(); + } + } + } + if(initial) { TopDownTransformResult res = picker.apply(preParent.getHead()); @@ -77,17 +116,17 @@ public class TopDownTransformIterator<ContainedType> implements Iterator<ITree<C break; } else { done = true; - return postParent; + return flushYields(postParent); } case SKIP: done = true; - return preParent; + return flushYields(preParent); case TRANSFORM: done = true; - return transform.apply(preParent, this::addYield); + return flushYields(transform.apply(preParent, this::addYield)); case RTRANSFORM: preParent = transform.apply(preParent, this::addYield); - break; + return flushYields(preParent); case PUSHDOWN: if(preParent.getChildrenCount() != 0) { for(int i = 0; i < preParent.getChildrenCount(); i++) { @@ -98,7 +137,7 @@ public class TopDownTransformIterator<ContainedType> implements Iterator<ITree<C break; } else { done = true; - return transform.apply(new Tree<>(preParent.getHead()), this::addYield); + return flushYields(transform.apply(new Tree<>(preParent.getHead()), this::addYield)); } case PULLUP: ITree<ContainedType> intRes = transform.apply(preParent, this::addYield); @@ -114,7 +153,7 @@ public class TopDownTransformIterator<ContainedType> implements Iterator<ITree<C break; } else { done = true; - return postParent; + return flushYields(postParent); } default: throw new IllegalArgumentException("Unknown result type " + res); @@ -123,55 +162,47 @@ public class TopDownTransformIterator<ContainedType> implements Iterator<ITree<C if(res != RTRANSFORM) initial = false; } - if(curYield != null) { - if(curYield.hasNext()) { - return curYield.next(); - } else { - while(toYield.size() != 0 && !curYield.hasNext()) { - curYield = toYield.pop(); - } - - if(toYield.size() == 0 && !curYield.hasNext()) { - curYield = null; - } - } - } if(curChild == null || !curChild.hasNext()) { if(preChildren.size() != 0) { curChild = new TopDownTransformIterator<>(picker, transform, preChildren.pop()); ITree<ContainedType> res = curChild.next(); + System.out.println("\t\tTRACE: adding node " + res + " to children"); postChildren.add(res); - return res; + return flushYields(res); } else { ITree<ContainedType> res = null; if(postParent == null) { res = new Tree<>(preParent.getHead()); + System.out.println("\t\tTRACE: adding nodes " + postChildren + " to " + res); + for(ITree<ContainedType> child : postChildren) { res.addChild(child); } - - res = transform.apply(res, this::addYield); + + // res = transform.apply(res, this::addYield); } else { res = postParent; + System.out.println("\t\tTRACE: adding nodes " + postChildren + " to " + res); for(ITree<ContainedType> child : postChildren) { res.addChild(child); } } done = true; - return res; + return flushYields(res); } } else { ITree<ContainedType> res = curChild.next(); + System.out.println("\t\tTRACE: adding node " + res + " to children"); postChildren.add(res); - return res; + return flushYields(res); } } } 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 757ffae..9018347 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/Tree.java @@ -24,6 +24,9 @@ public class Tree<ContainedType> implements ITree<ContainedType> { private boolean hasChildren; private int childCount = 0; + private int ID; + private static int nextID = 0; + /** * Create a new leaf node in a tree * @@ -34,6 +37,8 @@ public class Tree<ContainedType> implements ITree<ContainedType> { data = leaf; hasChildren = false; + + ID = nextID++; } /** @@ -45,9 +50,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> { * A list of children for this node */ public Tree(ContainedType leaf, IList<ITree<ContainedType>> childrn) { - data = leaf; - - hasChildren = true; + this(leaf); childCount = childrn.getSize(); @@ -64,7 +67,7 @@ public class Tree<ContainedType> implements ITree<ContainedType> { */ @SafeVarargs public Tree(ContainedType leaf, ITree<ContainedType>... childrn) { - data = leaf; + this(leaf); hasChildren = true; @@ -143,17 +146,19 @@ public class Tree<ContainedType> implements ITree<ContainedType> { } protected void internalToString(StringBuilder builder, int indentLevel, boolean initial) { - if (!initial) { - StringUtils.indentNLevels(builder, indentLevel); + for(int i = 0; i < indentLevel; i++) { + builder.append(">\t"); } - builder.append("Node: "); + builder.append("Node #"); + builder.append(ID); + builder.append(": "); builder.append(data == null ? "(null)" : data.toString()); builder.append("\n"); if (hasChildren) { children.forEach((child) -> { - ((Tree<ContainedType>) child).internalToString(builder, indentLevel + 2, false); + ((Tree<ContainedType>) child).internalToString(builder, indentLevel+1, false); }); } } |