diff --git a/environment.yml b/environment.yml index 785d9fac..cd48fa57 100644 --- a/environment.yml +++ b/environment.yml @@ -27,4 +27,4 @@ dependencies: - xgboost - pip: - biosppy - - cr_features + - cr_features>=0.2 diff --git a/src/features/all_cleaning_individual/straw/main.py b/src/features/all_cleaning_individual/straw/main.py index 617defb4..dee4aba9 100644 --- a/src/features/all_cleaning_individual/straw/main.py +++ b/src/features/all_cleaning_individual/straw/main.py @@ -150,12 +150,14 @@ def straw_cleaning(sensor_data_files, provider): return features + +def k_nearest(df): + pd.set_option('display.max_columns', None) + imputer = KNNImputer(n_neighbors=3) + return pd.DataFrame(imputer.fit_transform(df), columns=df.columns) + + def impute(df, method='zero'): - - def k_nearest(df): - pd.set_option('display.max_columns', None) - imputer = KNNImputer(n_neighbors=3) - return pd.DataFrame(imputer.fit_transform(df), columns=df.columns) return { 'zero': df.fillna(0), @@ -165,6 +167,7 @@ def impute(df, method='zero'): 'knn': k_nearest(df) }[method] + def graph_bf_af(features, phase_name, plt_flag=False): if plt_flag: sns.set(rc={"figure.figsize":(16, 8)}) diff --git a/src/features/all_cleaning_overall/straw/main.py b/src/features/all_cleaning_overall/straw/main.py index 683cfa01..a94023dd 100644 --- a/src/features/all_cleaning_overall/straw/main.py +++ b/src/features/all_cleaning_overall/straw/main.py @@ -245,11 +245,13 @@ def straw_cleaning(sensor_data_files, provider, target): return features + +def k_nearest(df): + imputer = KNNImputer(n_neighbors=3) + return pd.DataFrame(imputer.fit_transform(df), columns=df.columns) + + def impute(df, method='zero'): - - def k_nearest(df): - imputer = KNNImputer(n_neighbors=3) - return pd.DataFrame(imputer.fit_transform(df), columns=df.columns) return { 'zero': df.fillna(0), @@ -259,6 +261,7 @@ def impute(df, method='zero'): 'knn': k_nearest(df) }[method] + def graph_bf_af(features, phase_name, plt_flag=False): if plt_flag: sns.set(rc={"figure.figsize":(16, 8)})