-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Config file is now saved and recalled correctly when using projects
- Loading branch information
Showing
1 changed file
with
24 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# -*- coding: utf-8 -*- | ||
# | ||
# ecnet/server.py | ||
# v.1.4.4 | ||
# v.1.4.5 | ||
# Developed in 2018 by Travis Kessler <[email protected]> | ||
# | ||
# This file contains the "Server" class, which handles ECNet project creation, | ||
|
@@ -130,13 +130,13 @@ def import_data(self, data_filename = None): | |
self.packaged_data = self.DataFrame.package_sets() | ||
|
||
def limit_parameters(self, | ||
limit_num, | ||
output_filename, | ||
use_genetic = False, | ||
population_size = 500, | ||
num_survivors = 200, | ||
num_generations = 25, | ||
shuffle = False): | ||
limit_num, | ||
output_filename, | ||
use_genetic = False, | ||
population_size = 500, | ||
num_survivors = 200, | ||
num_generations = 25, | ||
shuffle = False): | ||
''' | ||
Limits the input dimensionality of the currently loaded DataFrame to a dimension of *limit_num*. | ||
Saves the resulting limited DataFrame to *output_filename*. Option to *shuffle* data sets between | ||
|
@@ -148,12 +148,12 @@ def limit_parameters(self, | |
|
||
if use_genetic: | ||
params = ecnet.limit_parameters.limit_genetic(self.DataFrame, | ||
limit_num, | ||
population_size, | ||
num_survivors, | ||
num_generations, | ||
shuffle = shuffle, | ||
print_feedback = self.vars['project_print_feedback']) | ||
limit_num, | ||
population_size, | ||
num_survivors, | ||
num_generations, | ||
shuffle = shuffle, | ||
print_feedback = self.vars['project_print_feedback']) | ||
else: | ||
params = ecnet.limit_parameters.limit_iterative_include(self.DataFrame, limit_num) | ||
ecnet.limit_parameters.output(self.DataFrame, params, output_filename) | ||
|
@@ -451,7 +451,7 @@ def save_project(self, clean_up = True): | |
os.remove(os.path.join(path_n, file)) | ||
|
||
# Save Server configuration to configuration YAML file | ||
with open(self.config_filename, 'w') as config_file: | ||
with open(os.path.join(self.vars['project_name'], self.config_filename), 'w') as config_file: | ||
yaml.dump(self.vars, | ||
config_file, | ||
default_flow_style = False, | ||
|
@@ -486,10 +486,18 @@ def open_project(self, filename): | |
zip_file.close() | ||
|
||
# Import project configuration | ||
with open(self.config_filename, 'r') as config_file: | ||
with open(os.path.join(self.vars['project_name'], self.config_filename), 'r') as config_file: | ||
self.vars.update(yaml.load(config_file)) | ||
config_file.close() | ||
|
||
# Re-save Server configuration to working directory | ||
with open(self.config_filename, 'w') as config_file: | ||
yaml.dump(self.vars, | ||
config_file, | ||
default_flow_style = False, | ||
explicit_start = True) | ||
config_file.close() | ||
|
||
# Import last used DataFrame | ||
with open(os.path.join(self.vars['project_name'], 'data.d'), 'rb') as data_file: | ||
self.DataFrame = pickle.load(data_file) | ||
|