diff options
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/gen')
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java b/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java index cdfe056..5d61201 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java +++ b/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java @@ -106,14 +106,14 @@ public class WeightedGrammar<E> { if (subgrammars.containsKey(alias)) { return false; - } else { - if (subgrammars.containsKey(name)) { - subgrammars.put(alias, subgrammars.get(name)); - return true; - } else { - return false; - } } + + if (subgrammars.containsKey(name)) { + subgrammars.put(alias, subgrammars.get(name)); + return true; + } + + return false; } /** @@ -154,10 +154,10 @@ public class WeightedGrammar<E> { if (rules.containsKey(name)) { return false; - } else { - rules.put(name, cases); - return true; } + + rules.put(name, cases); + return true; } /** @@ -179,10 +179,10 @@ public class WeightedGrammar<E> { if (subgrammars.containsKey(name)) { return false; - } else { - subgrammars.put(name, subgrammar); - return true; } + + subgrammars.put(name, subgrammar); + return true; } /** @@ -193,17 +193,16 @@ public class WeightedGrammar<E> { * The rule to test. * @return A set of sentances generated by the specified rule. */ - public FunctionalList<FunctionalList<E>> - generateDebugValues(E ruleName) { + public FunctionalList<FunctionalList<E>> generateDebugValues( + E ruleName) { if (ruleName == null) { throw new NullPointerException("Rule name must not be null"); } - FunctionalList<FunctionalList<E>> returnedList = - new FunctionalList<>(); + FunctionalList<FunctionalList<E>> returnedList = new FunctionalList<>(); - WeightedRandom<FunctionalList<E>> ruleGenerator = - rules.get(ruleName); + WeightedRandom<FunctionalList<E>> ruleGenerator = rules + .get(ruleName); for (int i = 0; i < 10; i++) { returnedList.add(ruleGenerator.generateValue()); @@ -345,16 +344,14 @@ public class WeightedGrammar<E> { WeightedRandom<FunctionalList<E>> rule = rules.get(ruleName); - FunctionalList<Pair<Integer, FunctionalList<E>>> newResults = - new FunctionalList<>(); + FunctionalList<Pair<Integer, FunctionalList<E>>> newResults = new FunctionalList<>(); rule.getValues().forEach((pair) -> { - FunctionalList<FunctionalList<E>> newRule = - new FunctionalList<>(); + FunctionalList<FunctionalList<E>> newRule = new FunctionalList<>(); for (int i = 1; i <= numberOfTimes; i++) { - FunctionalList<E> newCase = - pair.merge((left, right) -> right.clone()); + FunctionalList<E> newCase = pair + .merge((left, right) -> right.clone()); for (int j = 1; j <= i; j++) { newCase.prepend(prefixToken); @@ -397,12 +394,11 @@ public class WeightedGrammar<E> { WeightedRandom<FunctionalList<E>> rule = rules.get(ruleName); - FunctionalList<Pair<Integer, FunctionalList<E>>> newResults = - new FunctionalList<>(); + FunctionalList<Pair<Integer, FunctionalList<E>>> newResults = new FunctionalList<>(); rule.getValues().forEach((pair) -> { - FunctionalList<E> newCase = - pair.merge((left, right) -> right.clone()); + FunctionalList<E> newCase = pair + .merge((left, right) -> right.clone()); newCase.prepend(prefixToken); newResults.add(new Pair<>(pair.merge((left, right) -> left) @@ -490,12 +486,11 @@ public class WeightedGrammar<E> { WeightedRandom<FunctionalList<E>> rule = rules.get(ruleName); - FunctionalList<Pair<Integer, FunctionalList<E>>> newResults = - new FunctionalList<>(); + FunctionalList<Pair<Integer, FunctionalList<E>>> newResults = new FunctionalList<>(); rule.getValues().forEach((par) -> { - FunctionalList<E> newCase = - par.merge((left, right) -> right.clone()); + FunctionalList<E> newCase = par + .merge((left, right) -> right.clone()); newCase.add(suffixToken); newResults.add(new Pair<>(par.merge((left, right) -> left) |