From f7a10e0e57d6f0ea83643c3d5763ff405af73337 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Wed, 28 Sep 2016 13:44:04 -0400 Subject: Formatting pass --- .../main/java/bjc/utils/funcdata/ExtendedMap.java | 10 ++--- .../java/bjc/utils/funcdata/FunctionalList.java | 5 +-- .../java/bjc/utils/funcdata/FunctionalMap.java | 10 ++--- .../src/main/java/bjc/utils/funcdata/IList.java | 11 ++--- .../src/main/java/bjc/utils/funcdata/IMap.java | 30 +++++++------- .../src/main/java/bjc/utils/funcdata/ITree.java | 6 ++- .../bjc/utils/funcdata/TransformedValueMap.java | 10 ++--- .../src/main/java/bjc/utils/funcdata/Tree.java | 23 ++++++----- .../utils/funcdata/bst/BinarySearchTreeNode.java | 3 +- .../java/bjc/utils/funcdata/theory/Bifunctor.java | 48 ++++++++++++++-------- .../java/bjc/utils/funcdata/theory/Functor.java | 6 ++- 11 files changed, 92 insertions(+), 70 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/funcdata') diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java index 4d50c56..0a2ee39 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ExtendedMap.java @@ -17,6 +17,11 @@ class ExtendedMap implements IMap { this.store = store; } + @Override + public void clear() { + store.clear(); + } + @Override public boolean containsKey(KeyType key) { if (store.containsKey(key)) { @@ -92,9 +97,4 @@ class ExtendedMap implements IMap { return ListUtils.mergeLists(store.valueList(), delegate.valueList()); } - - @Override - public void clear() { - store.clear(); - } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java index 590ed1d..b902207 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalList.java @@ -180,9 +180,8 @@ public class FunctionalList implements Cloneable, IList { // Get the iterator for the other list Iterator rightIterator = rightList.toIterable().iterator(); - for (Iterator leftIterator = wrappedList - .iterator(); leftIterator.hasNext() - && rightIterator.hasNext();) { + for (Iterator leftIterator = wrappedList.iterator(); + leftIterator.hasNext() && rightIterator.hasNext();) { // Add the transformed items to the result list E leftVal = leftIterator.next(); T rightVal = rightIterator.next(); diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java index ce64519..dfe02dc 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/FunctionalMap.java @@ -60,6 +60,11 @@ public class FunctionalMap wrappedMap = wrap; } + @Override + public void clear() { + wrappedMap.clear(); + } + /* * (non-Javadoc) * @@ -175,9 +180,4 @@ public class FunctionalMap return values; } - - @Override - public void clear() { - wrappedMap.clear(); - } } \ No newline at end of file diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/IList.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/IList.java index e446b64..47acf1a 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/IList.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/IList.java @@ -62,8 +62,8 @@ public interface IList { */ public default ReducedType collect( Collector collector) { - BiConsumer accumulator = collector - .accumulator(); + BiConsumer accumulator = collector.accumulator(); return reduceAux(collector.supplier().get(), (value, state) -> { accumulator.accept(state, value); @@ -92,8 +92,8 @@ public interface IList { * @return A new list containing the merged pairs of lists. */ IList combineWith( - IList rightList, - BiFunction itemCombiner); + IList rightList, BiFunction itemCombiner); /** * Check if the list contains the specified item @@ -261,7 +261,8 @@ public interface IList { * its final state. */ ReducedType reduceAux(StateType initialValue, - BiFunction stateAccumulator, + BiFunction stateAccumulator, Function resultTransformer); /** diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/IMap.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/IMap.java index 4fb7c2b..8522058 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/IMap.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/IMap.java @@ -16,6 +16,11 @@ import java.util.function.Function; * */ public interface IMap { + /** + * Delete all the values in the map + */ + void clear(); + /** * Check if this map contains the specified key * @@ -68,6 +73,16 @@ public interface IMap { */ ValueType get(KeyType key); + default ValueType getOrDefault(KeyType key, ValueType defaultValue) { + try { + return get(key); + } catch (IllegalArgumentException iaex) { + // We don't care about this, because it indicates a key is + // missing + return defaultValue; + } + } + /** * Get the number of entries in this map * @@ -132,19 +147,4 @@ public interface IMap { * @return A list of values in this map */ IList valueList(); - - /** - * Delete all the values in the map - */ - void clear(); - - default ValueType getOrDefault(KeyType key, ValueType defaultValue) { - try { - return get(key); - } catch (IllegalArgumentException iaex) { - // We don't care about this, because it indicates a key is - // missing - return defaultValue; - } - } } \ 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 e0c63e3..c773f4e 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITree.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/ITree.java @@ -43,7 +43,8 @@ public interface ITree { */ public ReturnedType collapse( Function leafTransform, - Function, NewType>> nodeCollapser, + Function, NewType>> nodeCollapser, Function resultTransformer); /** @@ -128,7 +129,8 @@ public interface ITree { * @return The tree with the transform applied to picked subtrees */ public ITree topDownTransform( - Function transformPicker, + Function transformPicker, UnaryOperator> transformer); /** diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/TransformedValueMap.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/TransformedValueMap.java index cc60dab..d43e8d5 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/TransformedValueMap.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/TransformedValueMap.java @@ -27,6 +27,11 @@ final class TransformedValueMap transformer = transform; } + @Override + public void clear() { + mapToTransform.clear(); + } + @Override public boolean containsKey(OldKey key) { return mapToTransform.containsKey(key); @@ -97,9 +102,4 @@ final class TransformedValueMap public IList valueList() { return mapToTransform.valueList().map(transformer); } - - @Override - public void clear() { - mapToTransform.clear(); - } } \ No newline at end of file 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 77b5673..68a0ae1 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/Tree.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/Tree.java @@ -95,7 +95,8 @@ public class Tree implements ITree { @Override public ReturnedType collapse( Function leafTransform, - Function, NewType>> nodeCollapser, + Function, NewType>> nodeCollapser, Function resultTransformer) { return resultTransformer @@ -129,16 +130,17 @@ public class Tree implements ITree { protected NewType internalCollapse( Function leafTransform, - Function, NewType>> nodeCollapser) { + Function, NewType>> nodeCollapser) { if (hasChildren) { - Function, NewType> nodeTransformer = nodeCollapser - .apply(data); + Function, + NewType> nodeTransformer = nodeCollapser.apply(data); - @SuppressWarnings("unchecked") - IList collapsedChildren = (IList) children.map((child) -> { - return child.collapse(leafTransform, nodeCollapser, - (subTreeVal) -> subTreeVal); - }); + IList collapsedChildren = (IList) children + .map((child) -> { + return child.collapse(leafTransform, nodeCollapser, + (subTreeVal) -> subTreeVal); + }); return nodeTransformer.apply(collapsedChildren); } @@ -195,7 +197,8 @@ public class Tree implements ITree { @Override public ITree topDownTransform( - Function transformPicker, + Function transformPicker, UnaryOperator> transformer) { TopDownTransformResult transformResult = transformPicker .apply(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 a6d08a2..9817f91 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 @@ -81,7 +81,8 @@ public class BinarySearchTreeNode extends BinarySearchTreeLeaf { rightBranch.add(element, comparator); } default: - throw new IllegalStateException("Error: Comparator yielded invalid value"); + throw new IllegalStateException( + "Error: Comparator yielded invalid value"); } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java index d3ebdac..a8f27c6 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java @@ -31,21 +31,31 @@ public interface Bifunctor { * The function that maps over the right of the pair * @return A function that maps over both parts of the pair */ - public default Function, Bifunctor> bimap( - Function leftFunc, - Function rightFunc) { - Function, Bifunctor> bimappedFunc = ( - argPair) -> { - Function, Bifunctor> leftMapper = argPair - . fmapLeft(leftFunc); + public default Function, + Bifunctor> bimap( + Function leftFunc, + Function rightFunc) { + Function, + Bifunctor> bimappedFunc = (argPair) -> { + Function, + Bifunctor> leftMapper = argPair.< + OldLeft, OldRight, + NewLeft> fmapLeft(leftFunc); - Bifunctor leftMappedFunctor = leftMapper - .apply(argPair); - Function, Bifunctor> rightMapper = leftMappedFunctor - . fmapRight(rightFunc); + Bifunctor leftMappedFunctor = leftMapper + .apply(argPair); + Function, + Bifunctor> rightMapper = leftMappedFunctor + . fmapRight( + rightFunc); - return rightMapper.apply(leftMappedFunctor); - }; + return rightMapper.apply(leftMappedFunctor); + }; return bimappedFunc; } @@ -64,8 +74,10 @@ public interface Bifunctor { * pair * @return The function lifted to work over the left side of bifunctors */ - public Function, Bifunctor> fmapLeft( - Function func); + public Function, + Bifunctor> fmapLeft( + Function func); /** * Lift a function to operate over the right part of this pair @@ -82,8 +94,10 @@ public interface Bifunctor { * @return The function lifted to work over the right side of * bifunctors */ - public Function, Bifunctor> fmapRight( - Function func); + public Function, + Bifunctor> fmapRight( + Function func); /** * Get the value contained on the left of this bifunctor diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Functor.java b/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Functor.java index 76f48e2..10cfffe 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Functor.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcdata/theory/Functor.java @@ -27,8 +27,10 @@ public interface Functor { * @return The passed in function converted to work over a particular * type of functors */ - public Function, Functor> fmap( - Function func); + public Function, + Functor> fmap( + Function func); /** * Retrieve the thing inside this functor -- cgit v1.2.3