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
+41
View File
@@ -0,0 +1,41 @@
import pandas as pd
from operator import itemgetter
from utils.helpers import has_enough_samples_to_train
from feature_selection.dim_reduction import reduce_dimensionality
from models.model_map import default_feature_selector_regression, default_feature_selector_classification
from feature_selection.feature_selection import select_features
import warnings
def process_data(X:pd.DataFrame, y:pd.Series, configs: dict) -> tuple[pd.DataFrame,pd.DataFrame,pd.DataFrame]:
model_config, training_config, data_config = itemgetter('model_config', 'training_config', 'data_config')(configs)
original_X = X.copy()
# 2a. Dimensionality Reduction (optional)
if training_config['dimensionality_reduction']:
X_pca = reduce_dimensionality(X, int(len(X.columns) / 2))
X = X_pca.copy()
else:
X_pca = X.copy()
# 2b. Feature Selection
print("Feature Selection started")
# TODO: this needs to be done per model!
backup_model = default_feature_selector_regression if data_config['method'] == 'regression' else default_feature_selector_classification
X = select_features(X = X, y = y, model = model_config['primary_models'][0][1], n_features_to_select = training_config['n_features_to_select'], backup_model = backup_model, scaling = training_config['scaler'])
return X, original_X, X_pca
def check_data(X:pd.DataFrame, y:pd.Series, training_config:dict):
""" Returns True if data is valid, else returns False."""
if has_enough_samples_to_train(X, y, training_config) == False:
warnings.warn("Not enough samples to train")
return False
return True