diff --git a/docs/conf.py b/docs/conf.py index 7619aef..e70d003 100644 --- a/docs/conf.py +++ b/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 --------------------------------------------------- diff --git a/ecnet/__init__.py b/ecnet/__init__.py index cdd21cb..af01be1 100644 --- a/ecnet/__init__.py +++ b/ecnet/__init__.py @@ -1,2 +1,2 @@ from ecnet.server import Server -__version__ = '3.2.2' +__version__ = '3.2.3' diff --git a/ecnet/models/mlp.py b/ecnet/models/mlp.py index 6fb1ef8..2ef2eab 100644 --- a/ecnet/models/mlp.py +++ b/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 # # Contains the "MultilayerPerceptron" (feed-forward neural network) class diff --git a/ecnet/server.py b/ecnet/server.py index a007279..226ae55 100644 --- a/ecnet/server.py +++ b/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 # # 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, diff --git a/ecnet/tasks/limit_inputs.py b/ecnet/tasks/limit_inputs.py index 00ca81b..3902730 100644 --- a/ecnet/tasks/limit_inputs.py +++ b/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 # # 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]) diff --git a/ecnet/tasks/training.py b/ecnet/tasks/training.py index beb9b9a..606054d 100644 --- a/ecnet/tasks/training.py +++ b/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 # # Contains function for project training (multiprocessed training) diff --git a/ecnet/tasks/tuning.py b/ecnet/tasks/tuning.py index f14c94a..dbc41ee 100644 --- a/ecnet/tasks/tuning.py +++ b/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 # # Contains functions/fitness functions for tuning hyperparameters diff --git a/ecnet/tools/database.py b/ecnet/tools/database.py index 2b337ae..5385481 100644 --- a/ecnet/tools/database.py +++ b/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 # # Contains functions for creating ECNet-formatted databases diff --git a/ecnet/tools/plotting.py b/ecnet/tools/plotting.py index dc29b33..441db81 100644 --- a/ecnet/tools/plotting.py +++ b/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 # # Contains functions/classes for creating various plots diff --git a/ecnet/tools/project.py b/ecnet/tools/project.py index fc90972..b09a7d2 100644 --- a/ecnet/tools/project.py +++ b/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 # # Contains functions for predicting data using pre-existing .prj files diff --git a/ecnet/utils/data_utils.py b/ecnet/utils/data_utils.py index 8863eaa..bbdee25 100644 --- a/ecnet/utils/data_utils.py +++ b/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 # # Contains functions/classes for loading data, saving data, saving results diff --git a/ecnet/utils/error_utils.py b/ecnet/utils/error_utils.py index 7266bda..4546c39 100644 --- a/ecnet/utils/error_utils.py +++ b/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 # # Contains functions for error calculations diff --git a/ecnet/utils/logging.py b/ecnet/utils/logging.py index 30825d7..f4cc13d 100644 --- a/ecnet/utils/logging.py +++ b/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 # # Contains logger used by ECNet diff --git a/ecnet/utils/server_utils.py b/ecnet/utils/server_utils.py index e33020a..12ec84f 100644 --- a/ecnet/utils/server_utils.py +++ b/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 # # Contains functions used by ecnet.Server diff --git a/setup.py b/setup.py index af32395..76539f4 100644 --- a/setup.py +++ b/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',