Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/ensemble historical forecasts #1616

Merged
merged 22 commits into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
84973a3
add correct extreme_lags override and test
JanFidor Mar 4, 2023
3c252d9
add required extreme_lags override
JanFidor Mar 4, 2023
743c6ae
Merge branch 'master' into fix/ensemble-historical-forecasts
JanFidor Mar 4, 2023
eb92f9c
delete logging print
JanFidor Mar 4, 2023
b92971a
Merge branch 'fix/ensemble-historical-forecasts' of https://github.co…
JanFidor Mar 4, 2023
a5d80c7
Merge branch 'master' into fix/ensemble-historical-forecasts
madtoinou Mar 8, 2023
5cc2571
Merge branch 'master' into fix/ensemble-historical-forecasts
JanFidor Mar 18, 2023
c56f9d1
Merge branch 'master' into fix/ensemble-historical-forecasts
dennisbader Mar 20, 2023
3a9c4c7
Merge branch 'master' into fix/ensemble-historical-forecasts
madtoinou Mar 23, 2023
847c0d6
change lag priorities
JanFidor Mar 26, 2023
e86bca3
Merge branch 'master' into fix/ensemble-historical-forecasts
JanFidor Mar 26, 2023
028ecc8
Merge branch 'master' into fix/ensemble-historical-forecasts
dennisbader Mar 28, 2023
1a9e7ed
add a test + use switch to tuple
JanFidor Mar 29, 2023
14cba78
Merge branch 'fix/ensemble-historical-forecasts' of https://github.co…
JanFidor Mar 29, 2023
d84ca9a
Merge branch 'master' into fix/ensemble-historical-forecasts
JanFidor Mar 29, 2023
0300d84
Merge branch 'master' into fix/ensemble-historical-forecasts
dennisbader Apr 2, 2023
c67ff16
Merge branch 'master' into fix/ensemble-historical-forecasts
dennisbader Apr 5, 2023
200ebc6
fix extreme lags from other PR
dennisbader Apr 7, 2023
8411bed
Merge branch 'master' into fix/ensemble-historical-forecasts
dennisbader Apr 10, 2023
d58b1b1
make RegressionEnsembleModel work
dennisbader Apr 10, 2023
b30206f
Merge branch 'master' into fix/ensemble-historical-forecasts
dennisbader Apr 10, 2023
b958132
small unit test fix
dennisbader Apr 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions darts/models/forecasting/ensemble_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,5 +197,21 @@ def ensemble(
def min_train_series_length(self) -> int:
return max(model.min_train_series_length for model in self.models)

@property
def extreme_lags(self):
extreme_lags_length = len(super().extreme_lags)

return [self._find_max_lag_or_none(i) for i in range(extreme_lags_length)]

def _find_max_lag_or_none(self, lag_id):
max_lag = None
for model in self.models:
curr_lag = model.extreme_lags[lag_id]
if max_lag is None or (
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this respects the actual min/max of all extreme lags.

For example lags_future_covariates for one regression models could be [-3, -2], and for a second one [-1, 1].
The min lag for both models should be -3, and max lag +1.
However, the current implementation would give min/max lags of -3 and -2

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I assumed that for a given lag all values must either be positive or negative, and abs() would be working then. I checked out the docs and I think that the new implementation fixes the problem

curr_lag is not None and abs(curr_lag) > abs(max_lag)
):
max_lag = curr_lag
return max_lag

def _is_probabilistic(self) -> bool:
return all([model._is_probabilistic() for model in self.models])
8 changes: 8 additions & 0 deletions darts/models/forecasting/theta.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ def min_train_series_length(self) -> int:
else:
return 3

@property
def extreme_lags(self):
return (-self.min_train_series_length, 1, None, None, None)


class FourTheta(LocalForecastingModel):
def __init__(
Expand Down Expand Up @@ -484,3 +488,7 @@ def min_train_series_length(self) -> int:
return 2 * self.seasonality_period
else:
return 3

@property
def extreme_lags(self):
return (-self.min_train_series_length, 1, None, None, None)
5 changes: 5 additions & 0 deletions darts/tests/models/forecasting/test_ensemble_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ def test_call_predict_local_models(self):
naive_ensemble.fit(self.series1)
naive_ensemble.predict(5)

def test_call_backtest_local_models(self):
naive_ensemble = NaiveEnsembleModel([NaiveSeasonal(5), Theta(2, 5)])
naive_ensemble.fit(self.series1)
naive_ensemble.backtest(self.series1)

def test_predict_ensemble_local_models(self):
naive = NaiveSeasonal(K=5)
theta = Theta()
Expand Down