From 3819027f642df549622c478331391ad3a25a9c4f Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Sun, 12 Apr 2020 13:11:11 -0400
Subject: Finish esodata extraction

Finished extracting the old version of esodata, and fixed all the local
issues
---
 base/src/main/java/bjc/utils/gen/RandomGrammar.java   | 4 ++--
 base/src/main/java/bjc/utils/gen/WeightedGrammar.java | 8 ++++----
 base/src/main/java/bjc/utils/gen/WeightedRandom.java  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'base/src/main/java/bjc/utils/gen')

diff --git a/base/src/main/java/bjc/utils/gen/RandomGrammar.java b/base/src/main/java/bjc/utils/gen/RandomGrammar.java
index b418c79..d0a71c5 100644
--- a/base/src/main/java/bjc/utils/gen/RandomGrammar.java
+++ b/base/src/main/java/bjc/utils/gen/RandomGrammar.java
@@ -1,7 +1,7 @@
 package bjc.utils.gen;
 
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.IList;
 
 /**
  * A weighted grammar where all the rules have a equal chance of occuring.
diff --git a/base/src/main/java/bjc/utils/gen/WeightedGrammar.java b/base/src/main/java/bjc/utils/gen/WeightedGrammar.java
index 87888bd..774d694 100644
--- a/base/src/main/java/bjc/utils/gen/WeightedGrammar.java
+++ b/base/src/main/java/bjc/utils/gen/WeightedGrammar.java
@@ -8,10 +8,10 @@ import java.util.function.Supplier;
 
 import bjc.data.IPair;
 import bjc.data.Pair;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.IList;
-import bjc.utils.funcdata.IMap;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.FunctionalMap;
+import bjc.funcdata.IList;
+import bjc.funcdata.IMap;
 
 /**
  * A random grammar, where certain rules will come up more often than others.
diff --git a/base/src/main/java/bjc/utils/gen/WeightedRandom.java b/base/src/main/java/bjc/utils/gen/WeightedRandom.java
index c1c1714..15f5821 100644
--- a/base/src/main/java/bjc/utils/gen/WeightedRandom.java
+++ b/base/src/main/java/bjc/utils/gen/WeightedRandom.java
@@ -4,8 +4,8 @@ import java.util.Random;
 
 import bjc.data.IPair;
 import bjc.data.Pair;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
+import bjc.funcdata.FunctionalList;
+import bjc.funcdata.IList;
 
 /**
  * Represents a random number generator where certain results are weighted more
-- 
cgit v1.2.3