Skip to content

Commit 32610a4

Browse files
#561 Limit forecasting window to one month
2 parents 8a8c569 + 97af4dc commit 32610a4

File tree

8 files changed

+125
-118
lines changed

8 files changed

+125
-118
lines changed

Pipfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ PyYAML = "*"
1919
python-i18n = "*"
2020
gspread="*"
2121
oauth2client="*"
22+
penn-chime = {path = "."}
2223

2324
[requires]
2425
python_version = "3.7"

Pipfile.lock

Lines changed: 115 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

defaults/cli.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
--icu-rate 0.0075
77
--infectious-days 10
88
--market-share 0.15
9-
--n-days 100
9+
--n-days 30
1010
--population 3600000
1111
--recovered 0
1212
--relative-contact-rate 0.45

defaults/cypress.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
--icu-rate 0.0075
88
--infectious-days 14
99
--market-share 0.15
10-
--n-days 100
10+
--n-days 30
1111
--population 3600000
1212
--recovered 0
1313
--relative-contact-rate 0.3

defaults/webapp.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
--icu-rate 0.0075
88
--infectious-days 10
99
--market-share 0.15
10-
--n-days 100
10+
--n-days 30
1111
--population 3600000
1212
--recovered 0
1313
--relative-contact-rate 0.45

src/penn_chime/model/parameters.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def validate(string):
153153
"mitigation_date": "Date on which social distancing measures too effect",
154154
"market_share": "Hospital market share (0.00001 - 1.0)",
155155
"max_y_axis": "Max y-axis",
156-
"n_days": "Number of days to project >= 0",
156+
"n_days": "Number of days to project >= 1 and less than 30",
157157
"parameters": "Parameters file",
158158
"population": "Regional population >= 1",
159159
"recovered": "Number of patients already recovered (not yet implemented)",
@@ -259,8 +259,8 @@ def validate(string):
259259
(
260260
"n-days",
261261
int,
262-
0,
263-
None,
262+
1,
263+
30,
264264
True,
265265
),
266266
(

src/penn_chime/view/st_display.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ def display_sidebar(st, d: Parameters) -> Parameters:
171171
n_days_input = NumberInput(
172172
st_obj,
173173
i18n.t("presentation-n-days"),
174-
min_value=30,
174+
min_value=1,
175+
max_value=30,
175176
value=d.n_days,
176177
step=1,
177178
format="%i",

tests/penn_chime/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_main_with_doubling_time():
2020
"--market-share", "0.1",
2121
"--infectious-days", "5",
2222
"--max-y-axis", "10000",
23-
"--n-days", "200",
23+
"--n-days", "30",
2424
"--recovered", "10",
2525
"--relative-contact-rate", "0.1",
2626
"--population", "1000000",

0 commit comments

Comments
 (0)