Merge pull request #410 from CodeForPhilly/fix_default_settings_current_date

Replace DEFAULTS with function call

Author: quinn-dougherty

src/app.py

@@ -12,7 +12,7 @@
     write_definitions,
     write_footer,
 )
-from penn_chime.settings import DEFAULTS
+from penn_chime.settings import get_defaults
 from penn_chime.models import SimSirModel
 from penn_chime.charts import (
     build_admits_chart,
@@ -28,14 +28,15 @@
 # In dev, this should be shown
 st.markdown(hide_menu_style, unsafe_allow_html=True)
 
-p = display_sidebar(st, DEFAULTS)
+d = get_defaults()
+p = display_sidebar(st, d)
 m = SimSirModel(p)
 
 display_header(st, m, p)
 
 if st.checkbox("Show more info about this tool"):
     notes = "The total size of the susceptible population will be the entire catchment area for our hospitals."
-    display_more_info(st=st, model=m, parameters=p, defaults=DEFAULTS, notes=notes)
+    display_more_info(st=st, model=m, parameters=p, defaults=d, notes=notes)
 
 st.subheader("New Admissions")
 st.markdown("Projected number of **daily** COVID-19 admissions. \n\n _NOTE: Now including estimates of prior admissions for comparison._")

src/penn_chime/settings.py

@@ -4,16 +4,18 @@
 
 from .parameters import Parameters, Regions, Disposition
 
-DEFAULTS = Parameters(
-    population=3600000,
-    current_hospitalized=69,
-    date_first_hospitalized=date(2020,3,7),
-    doubling_time=4.0,
-    hospitalized=Disposition(0.025, 7),
-    icu=Disposition(0.0075, 9),
-    infectious_days=14,
-    market_share=0.15,
-    n_days=100,
-    relative_contact_rate=0.3,
-    ventilated=Disposition(0.005, 10),
-)
+
+def get_defaults():
+    return Parameters(
+        population=3600000,
+        current_hospitalized=69,
+        date_first_hospitalized=date(2020,3,7),
+        doubling_time=4.0,
+        hospitalized=Disposition(0.025, 7),
+        icu=Disposition(0.0075, 9),
+        infectious_days=14,
+        market_share=0.15,
+        n_days=100,
+        relative_contact_rate=0.3,
+        ventilated=Disposition(0.005, 10),
+    )