From b21b401596f5c060402074b183ccc311281518d8 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 6 Feb 2017 22:40:53 -0500
Subject: Minor changes

---
 BJC-Utils2/src/main/java/bjc/utils/gen/WeightedGrammar.java   | 11 +----------
 BJC-Utils2/src/main/java/bjc/utils/gen/WeightedRandom.java    |  2 ++
 .../java/bjc/utils/parserutils/RuleBasedConfigReader.java     |  3 ++-
 3 files changed, 5 insertions(+), 11 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
@@ -59,11 +59,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.
 	 */
@@ -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<>();
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
index cbcc6d8..9418862 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java
@@ -130,7 +130,8 @@ public class RuleBasedConfigReader<E> {
 		E state = initialState;
 
 		// Prepare our input source
-		try (Scanner source = new Scanner(input, "\n")) {
+		try (Scanner source = new Scanner(input)) {
+			source.useDelimiter("\n");
 			// This is true when a rule's open
 			IHolder<Boolean> isRuleOpen = new Identity<>(false);
 
-- 
cgit v1.2.3