Merge pull request #41 from ECRL/dev

Bug fixes

docs/conf.py

@@ -32,7 +32,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '3.2.2'
+release = '3.2.3'
 
 
 # -- General configuration ---------------------------------------------------

ecnet/__init__.py

@@ -1,2 +1,2 @@
 from ecnet.server import Server
-__version__ = '3.2.2'
+__version__ = '3.2.3'

ecnet/models/mlp.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/models/mlp.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains the "MultilayerPerceptron" (feed-forward neural network) class

ecnet/server.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/server.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains the "Server" class, which handles ECNet project creation, neural
@@ -141,6 +141,7 @@ def limit_inputs(self, limit_num: int, num_estimators: int=None,
             self._df.save(output_filename)
             logger.log('info', 'Resulting database saved to {}'.format(
                        output_filename), call_loc='LIMIT')
+        return result
 
     def tune_hyperparameters(self, num_employers: int, num_iterations: int,
                              shuffle: bool=None, split: list=None,

ecnet/tasks/limit_inputs.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/tasks/limit_inputs.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions for selecting influential input parameters
@@ -40,8 +40,15 @@ def limit_rforest(df: DataFrame, limit_num: int, num_estimators: int=None,
                .format(limit_num), call_loc='LIMIT')
 
     pd = df.package_sets()
-    X = concatenate((pd.learn_x, pd.valid_x, pd.test_x))
-    y = ravel(concatenate((pd.learn_y, pd.valid_y, pd.test_y)))
+    X = pd.learn_x
+    y = pd.learn_y
+    if len(pd.valid_x) > 0:
+        X = concatenate((X, pd.valid_x))
+        y = concatenate((y, pd.valid_y))
+    if len(pd.test_x) > 0:
+        X = concatenate((X, pd.test_x))
+        y = concatenate((y, pd.test_y))
+    y = ravel(y)
 
     if num_estimators is None:
         num_estimators = len(X[0])

ecnet/tasks/training.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/tasks/training.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains function for project training (multiprocessed training)

ecnet/tasks/tuning.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/tasks/tuning.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions/fitness functions for tuning hyperparameters

ecnet/tools/database.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/tools/database.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions for creating ECNet-formatted databases

ecnet/tools/plotting.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/tools/plotting.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions/classes for creating various plots

ecnet/tools/project.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/tools/project.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions for predicting data using pre-existing .prj files

ecnet/utils/data_utils.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/utils/data_utils.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions/classes for loading data, saving data, saving results

ecnet/utils/error_utils.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/utils/error_utils.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions for error calculations

ecnet/utils/logging.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/utils/logging.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains logger used by ECNet

ecnet/utils/server_utils.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # ecnet/utils/server_utils.py
-# v.3.2.2
+# v.3.2.3
 # Developed in 2019 by Travis Kessler <[email protected]>
 #
 # Contains functions used by ecnet.Server

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='ecnet',
-    version='3.2.2',
+    version='3.2.3',
     description='UMass Lowell Energy and Combustion Research Laboratory Neural'
                 ' Network Software',
     url='http://github.com/tjkessler/ecnet',