Merge pull request #510 from CodeForPhilly/PhilMiller/test-improvements

jlubken · web-flow · commit d4be8e599096 · 2020-04-08T11:35:15.000-04:00
Phil miller/test improvements
diff --git a/tests/penn_chime/test_models.py b/tests/penn_chime/test_models.py
@@ -194,8 +194,8 @@ def test_model_cumulative_census(param, model):
     )
     admits = df.cumsum()
 
-    # TODO: is 1.0 for ceil function?
+    # 1.0 is for the one hospital patient on the first day, who won't appear in the admissions
     diff = admits.hospitalized[1:-1] - (
-        0.05 * 0.05 * (raw_df.infected[1:-1] + raw_df.recovered[1:-1]) - 1.0
+        param.market_share * param.hospitalized.rate * (raw_df.infected[1:-1] + raw_df.recovered[1:-1]) - 1.0
     )
     assert (diff.abs() < 0.1).all()

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ def test_model_cumulative_census(param, model):`
`194`	`194`	`)`
`195`	`195`	`admits = df.cumsum()`
`196`	`196`
`197`		`- # TODO: is 1.0 for ceil function?`
	`197`	`+ # 1.0 is for the one hospital patient on the first day, who won't appear in the admissions`
`198`	`198`	`diff = admits.hospitalized[1:-1] - (`
`199`		`- 0.05 * 0.05 * (raw_df.infected[1:-1] + raw_df.recovered[1:-1]) - 1.0`
	`199`	`+ param.market_share * param.hospitalized.rate * (raw_df.infected[1:-1] + raw_df.recovered[1:-1]) - 1.0`
`200`	`200`	`)`
`201`	`201`	`assert (diff.abs() < 0.1).all()`