Skip to content

Fix TypeError when timesteps list has a gap in blending.steps.forecast #560

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.

Sign up for GitHub

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

Open
Yuxiang-Ren-HUB wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix TypeError when timesteps list has a gap in blending.steps.forecast #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pysteps/blending/steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,9 +711,9 @@ def worker(j):
)
)

final_blended_forecast_all_members_one_timestep[j] = (
final_blended_forecast_single_member
)
final_blended_forecast_all_members_one_timestep[j] = (
final_blended_forecast_single_member
)

dask_worker_collection = []

Expand Down
4 changes: 4 additions & 0 deletions pysteps/tests/test_blending_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
(1, 3, 4, 8,'steps', None, "mean", False, "spn", True, 4, False, False, 0, True, None, None, None),
(1, 3, 4, 8,'steps', None, "cdf", False, "spn", True, 4, False, False, 0, False, None, None, None),
(1, [1, 2, 3], 4, 8,'steps', None, "cdf", False, "spn", True, 4, False, False, 0, False, None, None, None),
# Regression test for a gap in the timesteps list (e.g. [1, 3] skips 2): this used to raise
# "TypeError: 'NoneType' object is not iterable" because the bin for the skipped step never
# got a value written to final_blended_forecast_all_members_one_timestep.
(1, [1, 3], 4, 8,'steps', None, "cdf", False, "spn", True, 4, False, False, 0, False, None, None, None),
(1, 3, 4, 8,'steps', "incremental", "cdf", False, "spn", True, 4, False, False, 0, False, None, None, None),
(1, 3, 4, 6,'steps', "incremental", "cdf", False, "bps", True, 4, False, False, 0, False, None, None, None),
(1, 3, 4, 6,'steps', "incremental", "cdf", False, "bps", False, 4, False, False, 0, False, None, None, None),
Expand Down