From dca8e9f586fd595a7995f07788318fb92b8cce79 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 28 Jul 2016 16:44:36 -0400 Subject: Format/Cleanup pass --- .../java/bjc/utils/funcutils/CollectorUtils.java | 8 ++--- .../bjc/utils/funcutils/CompoundCollector.java | 38 ++++++++++------------ .../bjc/utils/funcutils/GroupPartIteration.java | 18 +++++----- .../main/java/bjc/utils/funcutils/ListUtils.java | 30 +++++++---------- .../main/java/bjc/utils/funcutils/StringUtils.java | 13 +++++--- .../java/bjc/utils/funcutils/TokenDeaffixer.java | 3 +- .../java/bjc/utils/funcutils/TokenSplitter.java | 3 +- 7 files changed, 52 insertions(+), 61 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/funcutils') diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/CollectorUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/CollectorUtils.java index a44059b..f7210b5 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/CollectorUtils.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/CollectorUtils.java @@ -31,11 +31,9 @@ public class CollectorUtils { * The second collector to use * @return A collector that functions as mentioned above */ - public static - Collector>, IPair> - compoundCollect( - Collector firstCollector, - Collector secondCollector) { + public static Collector>, IPair> compoundCollect( + Collector firstCollector, + Collector secondCollector) { return new CompoundCollector<>(firstCollector, secondCollector); } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java index ed8d05f..60eb163 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/CompoundCollector.java @@ -6,6 +6,7 @@ import java.util.function.BinaryOperator; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; + import bjc.utils.data.IHolder; import bjc.utils.data.IPair; import bjc.utils.data.Identity; @@ -30,19 +31,11 @@ final class CompoundCollector>> supplier() { - return () -> new Identity<>( - new Pair<>(firstCollector.supplier().get(), - secondCollector.supplier().get())); - } - - @Override - public BiConsumer>, InitialType> - accumulator() { - BiConsumer firstAccumulator = - firstCollector.accumulator(); - BiConsumer secondAccumulator = - secondCollector.accumulator(); + public BiConsumer>, InitialType> accumulator() { + BiConsumer firstAccumulator = firstCollector + .accumulator(); + BiConsumer secondAccumulator = secondCollector + .accumulator(); return (state, value) -> { state.doWith((statePair) -> { @@ -54,11 +47,16 @@ final class CompoundCollector characteristics() { + return characteristicSet; + } + @Override public BinaryOperator>> combiner() { BinaryOperator firstCombiner = firstCollector.combiner(); - BinaryOperator secondCombiner = - secondCollector.combiner(); + BinaryOperator secondCombiner = secondCollector + .combiner(); return (leftState, rightState) -> { return leftState.unwrap((leftPair) -> { @@ -71,8 +69,7 @@ final class CompoundCollector>, IPair> - finisher() { + public Function>, IPair> finisher() { return (state) -> { return state.unwrap((pair) -> { return pair.bind((leftVal, rightVal) -> { @@ -85,8 +82,9 @@ final class CompoundCollector - characteristics() { - return characteristicSet; + public Supplier>> supplier() { + return () -> new Identity<>( + new Pair<>(firstCollector.supplier().get(), + secondCollector.supplier().get())); } } \ No newline at end of file diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java index 34a7ee0..81781f6 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/GroupPartIteration.java @@ -16,17 +16,17 @@ import bjc.utils.funcdata.IList; * The type of element in the list being partitioned */ final class GroupPartIteration implements Consumer { - private IList> returnedList; - private IHolder> currentPartition; - private IList rejectedItems; - private IHolder numberInCurrentPartition; - private int numberPerPartition; - private Function elementCounter; + private IList> returnedList; + private IHolder> currentPartition; + private IList rejectedItems; + private IHolder numberInCurrentPartition; + private int numberPerPartition; + private Function elementCounter; public GroupPartIteration(IList> returned, - IHolder> currPart, - IList rejects, IHolder numInCurrPart, - int nPerPart, Function eleCount) { + IHolder> currPart, IList rejects, + IHolder numInCurrPart, int nPerPart, + Function eleCount) { this.returnedList = returned; this.currentPartition = currPart; this.rejectedItems = rejects; 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 913ccc4..f09a794 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/ListUtils.java @@ -78,8 +78,7 @@ public class ListUtils { * @return The tokens that have been deaffixed * */ - public static IList deAffixTokens( - IList input, + public static IList deAffixTokens(IList input, Deque> operators) { if (input == null) { throw new NullPointerException("Input must not be null"); @@ -88,8 +87,7 @@ public class ListUtils { "Set of operators must not be null"); } - IHolder> returnedList = new Identity<>( - input); + IHolder> returnedList = new Identity<>(input); operators.forEach((operator) -> returnedList .transform((oldReturn) -> oldReturn.flatMap((token) -> { @@ -115,9 +113,8 @@ public class ListUtils { * selected from the specified list without replacement */ - public static IList drawWithoutReplacement( - IList list, int numberOfItems, - Function rng) { + public static IList drawWithoutReplacement(IList list, + int numberOfItems, Function rng) { IList selectedItems = new FunctionalList<>( new ArrayList<>(numberOfItems)); @@ -153,9 +150,8 @@ public class ListUtils { * @return A new list containing the desired number of items randomly * selected from the specified list */ - public static IList drawWithReplacement( - IList list, int numberOfItems, - Function rng) { + public static IList drawWithReplacement(IList list, + int numberOfItems, Function rng) { IList selectedItems = new FunctionalList<>( new ArrayList<>(numberOfItems)); @@ -181,9 +177,8 @@ public class ListUtils { * The number of elements to put in each partition * @return A list partitioned according to the above rules */ - public static IList> groupPartition( - IList input, Function elementCounter, - int numberPerPartition) { + public static IList> groupPartition(IList input, + Function elementCounter, int numberPerPartition) { if (input == null) { throw new NullPointerException("Input list must not be null"); } else if (elementCounter == null) { @@ -254,8 +249,7 @@ public class ListUtils { * @return A list containing all the elements of the lists */ @SafeVarargs - public static IList mergeLists( - IList... lists) { + public static IList mergeLists(IList... lists) { IList returnedList = new FunctionalList<>(); for (IList list : lists) { @@ -279,8 +273,7 @@ public class ListUtils { * @return A list of tokens split on all the operators * */ - public static IList splitTokens( - IList input, + public static IList splitTokens(IList input, Deque> operators) { if (input == null) { throw new NullPointerException("Input must not be null"); @@ -289,8 +282,7 @@ public class ListUtils { "Set of operators must not be null"); } - IHolder> returnedList = new Identity<>( - input); + IHolder> returnedList = new Identity<>(input); operators.forEach((operator) -> { returnedList.transform((oldReturn) -> { diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java index 9401b7e..6ddf420 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringUtils.java @@ -75,10 +75,15 @@ public class StringUtils { } /** - * Print out a deque with a special case for easily showing a deque is empty - * @param The type in the deque - * @param queue The deque to print - * @return A string version of the deque, with allowance for an empty deque + * Print out a deque with a special case for easily showing a deque is + * empty + * + * @param + * The type in the deque + * @param queue + * The deque to print + * @return A string version of the deque, with allowance for an empty + * deque */ public static String printDeque( Deque queue) { diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java index 6ed4ecf..709538b 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenDeaffixer.java @@ -14,8 +14,7 @@ final class TokenDeaffixer } @Override - public IList apply(String operatorName, - String operatorRegex) { + public IList apply(String operatorName, String operatorRegex) { if (operatorName == null) { throw new NullPointerException( "Operator name must not be null"); diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java index b9693a7..e2d59d3 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java @@ -14,8 +14,7 @@ final class TokenSplitter } @Override - public IList apply(String operatorName, - String operatorRegex) { + public IList apply(String operatorName, String operatorRegex) { if (operatorName == null) { throw new NullPointerException( "Operator name must not be null"); -- cgit v1.2.3