diff --git a/model_data/analysis/SapModel.py b/model_data/analysis/SapModel.py index 66382f87..ca2d45b2 100644 --- a/model_data/analysis/SapModel.py +++ b/model_data/analysis/SapModel.py @@ -282,9 +282,13 @@ class SapModel: train_x = train_x.drop(columns=["idx"]) test_x = test_x.drop(columns=["idx"]) - importance_df = self.make_importance(train_x) + # importance_df = self.make_importance(train_x) # Test dropping the least important features - to_drop = importance_df.tail(1)["Feature"].values + # to_drop = importance_df.tail(2)["Feature"].values + # Dropping this is a good idea + to_drop = [ + "hotwater-description_Electric immersion, off-peak", + ] train_x = train_x.drop(columns=to_drop) test_x = test_x[train_x.columns] @@ -353,6 +357,8 @@ class SapModel: fit_success = check_successes(self.fit_error, best_fit) predict_success = check_successes(self.predict_error, best_predict) + print(self.results.summary()) + self.model_data['fit'] = self.results.fittedvalues # The worst errors over index heavily for flats self.worst["x"] = self.model_data[self.model_data.index.isin(self.worst["errors"].index)]