1.2.1

UrbsLab · May 17, 2020 · 4b79eda · 4b79eda
1 parent 0965e1a
commit 4b79eda
Show file tree

Hide file tree

Showing 13 changed files with 16,793 additions and 16,833 deletions.
diff --git a/defaultExportDir/fileRulePopulation.csv b/defaultExportDir/fileRulePopulation.csv
diff --git a/defaultExportDir/iterationData.csv b/defaultExportDir/iterationData.csv
diff --git a/defaultExportDir/popData2.csv b/defaultExportDir/popData2.csv
diff --git a/defaultExportDir/savedModel1 b/defaultExportDir/savedModel1
diff --git a/defaultExportDir/savedModel2 b/defaultExportDir/savedModel2
diff --git a/defaultExportDir/savedModel3 b/defaultExportDir/savedModel3
diff --git a/eLCS User Guide.ipynb b/eLCS User Guide.ipynb
diff --git a/eLCSPerformanceTests/.ipynb_checkpoints/eLCS Performance Comparison-checkpoint.ipynb b/eLCSPerformanceTests/.ipynb_checkpoints/eLCS Performance Comparison-checkpoint.ipynb
diff --git a/eLCSPerformanceTests/defaultExportDir/fileRulePopulation.csv b/eLCSPerformanceTests/defaultExportDir/fileRulePopulation.csv
diff --git a/eLCSPerformanceTests/defaultExportDir/iterationData.csv b/eLCSPerformanceTests/defaultExportDir/iterationData.csv
diff --git a/eLCSPerformanceTests/eLCS Performance Comparison.ipynb b/eLCSPerformanceTests/eLCS Performance Comparison.ipynb
diff --git a/setup.py b/setup.py
@@ -6,14 +6,14 @@
 setup(
   name = 'scikit-eLCS',
   packages = ['skeLCS'],
-  version = '1.2',
+  version = '1.2.1',
   license='License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
   description = 'Educational Learning Classifier System',
   long_description_content_type="text/markdown",
   author = 'Robert Zhang, Ryan J. Urbanowicz',
   author_email = 'robertzh@seas.upenn.edu,ryanurb@upenn.edu',
   url = 'https://github.com/UrbsLab/scikit-eLCS',
-  download_url = 'https://github.com/UrbsLab/scikit-eLCS/archive/v_1.2.tar.gz',
+  download_url = 'https://github.com/UrbsLab/scikit-eLCS/archive/v_1.2.1.tar.gz',
   keywords = ['machine learning','data analysis','data science','learning classifier systems'],
   install_requires=['numpy','pandas','scikit-learn'],
   classifiers=[

diff --git a/skeLCS/eLCS.py b/skeLCS/eLCS.py
@@ -190,8 +190,6 @@ def __init__(self, learning_iterations=10000, track_accuracy_while_fit = False,
             try:
                 if not self.checkIsInt(random_state):
                     raise Exception("random_state param must be integer or None")
-                random.seed(int(random_state))
-                np.random.seed(int(random_state))
             except:
                 raise Exception("random_state param must be integer or None")
 
@@ -285,6 +283,11 @@ def fit(self, X, y):
         except:
             raise Exception("X and y must be fully numeric")
 
+        #Set Random State
+        if self.random_state != None:
+            random.seed(int(self.random_state))
+            np.random.seed(int(self.random_state))
+
         # Handle repeated fit calls
         if self.learning_iterations == self.explorIter and self.reboot_filename != None:
             raise Exception("You cannot call fit(X,y) a second time with a rebooted population.")