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 | 11 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/gen/WeightedRandom.java | 2 |
2 files changed, 3 insertions, 10 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 dbec7d0..63b9ca6 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java +++ b/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java @@ -60,11 +60,6 @@ public class WeightedGrammar<E> { private BiFunction<E, WeightedGrammar<E>, IList<E>> specialAction; /** - * Action to reset grammar - */ - private Runnable resetSpecial; - - /** * Create a new weighted grammar. */ public WeightedGrammar() { @@ -91,11 +86,9 @@ public class WeightedGrammar<E> { } public void configureSpecial(Predicate<E> marker, - BiFunction<E, WeightedGrammar<E>, IList<E>> action, - Runnable reset) { + BiFunction<E, WeightedGrammar<E>, IList<E>> action) { specialMarker = marker; specialAction = action; - resetSpecial = reset; } public void addSpecialRule(E ruleName, Supplier<IList<E>> cse) { @@ -370,8 +363,6 @@ public class WeightedGrammar<E> { public IList<E> generateListValues(E initRule, E spacer) { IList<E> retList = generateGenericValues(initRule, strang -> strang, spacer); - resetSpecial.run(); - return retList; } diff --git a/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedRandom.java b/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedRandom.java index 4819ca2..b73b205 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedRandom.java +++ b/BJC-Utils2/src/main/java/bjc/utils/gen/WeightedRandom.java @@ -75,6 +75,8 @@ public class WeightedRandom<E> { * @return A random value selected in a weighted fashion. */ public E generateValue() { + System.out.println("Total chance is " + totalChance); + IHolder<Integer> randomValue = new Identity<>( source.nextInt(totalChance)); IHolder<E> currentResult = new Identity<>(); |
