Refractor(Main Pipeline): Refractored the two main steps and the data processing. (#156)

* refr: Took out main primary and secondary loops and data processing.

* feat: Tidied the code up.

* feat: Saving models and results now works in a type safe way.

* fix: There was error in the saving function.

* chore: Took out some remaining comments.

* fix: Fixed the previous data checking process.

* feat: Fixed model selection method. I will continue the inference after we merged.

Co-authored-by: Daniel Szemerey <szemereydaniel@gmail.com>
This commit is contained in:
Daniel Szemerey
2022-01-12 23:10:18 +01:00
committed by GitHub
parent c611481eb6
commit 3084f5e271
9 changed files with 277 additions and 161 deletions
+7 -4
View File
@@ -3,12 +3,15 @@ import datetime
from typing import Optional, Union
import os
import warnings
from utils.encapsulation import Asset
def save_models(all_models_for_all_assets: dict, data_config:dict, training_config:dict) -> None:
all_models_for_all_assets['training_config'] = training_config
all_models_for_all_assets['data_config'] = data_config
def save_models(all_models_for_all_assets: list[Asset], data_config:dict, training_config:dict) -> None:
dict_for_pickle = dict()
dict_for_pickle['training_config'] = training_config
dict_for_pickle['data_config'] = data_config
dict_for_pickle['all_models_for_all_assets'] = all_models_for_all_assets
date_string = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M")
@@ -16,7 +19,7 @@ def save_models(all_models_for_all_assets: dict, data_config:dict, training_conf
warnings.warn("No folder exists, creating one.")
os.makedirs('output/models')
pickle.dump( all_models_for_all_assets, open( "output/models/{}.p".format(date_string), "wb" ) )
pickle.dump( dict_for_pickle, open( "output/models/{}.p".format(date_string), "wb" ) )
def load_models(file_name:Union[str, None]) -> tuple[dict, dict, dict]: