From 7c47961e21eafc98f92158f7f85c6b147e7c34e4 Mon Sep 17 00:00:00 2001 From: John Vivian Date: Sun, 4 Feb 2024 18:08:28 -0800 Subject: [PATCH 1/2] Revert "Revert "Fix unifactor error and maxiter propagation"" This reverts commit 066a9e45fe5360580dafc6df6dc9ea8bdd055f99. --- covid19_drdfm/streamlit/runner.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/covid19_drdfm/streamlit/runner.py b/covid19_drdfm/streamlit/runner.py index fc768e8..a54ebd4 100644 --- a/covid19_drdfm/streamlit/runner.py +++ b/covid19_drdfm/streamlit/runner.py @@ -58,6 +58,7 @@ def run_parameterized_model( variables = list(factors.keys()) _ = [factors.pop(var) for var in variables if var not in columns] # Save input data + st.write(factors) outdir.mkdir(exist_ok=True) out = outdir / state # pprint(f"Saving state input information to {out}") @@ -67,9 +68,9 @@ def run_parameterized_model( # Run Model if (out / "model.csv").exists(): return - model = sm.tsa.DynamicFactorMQ(new, factors=FACTORS, factor_multiplicities=factor_multiplicities) + model = sm.tsa.DynamicFactorMQ(new, factors=factors, factor_multiplicities=factor_multiplicities) try: - results = model.fit(disp=10, maxiter=10_000) + results = model.fit(disp=10, maxiter=maxiter) except Exception as e: with open(outdir / "failed.txt", "a") as f: f.write(f"{state}\t{e}\n") @@ -161,7 +162,7 @@ def get_data(): _, c, _ = st.columns([0.3, 0.4, 0.3]) c.write("Creating output directory and starting model run(s)") columns = [] -for x in selectors: +for x in [x for x in selectors if selectors[x]]: columns.extend(selectors[x]) selectors.update({"global_multiplier": mult_sel, "outdir": outdir}) outdir = Path(outdir) @@ -183,7 +184,7 @@ def get_data(): subdir / "filtered-factors.csv" for subdir in outdir.iterdir() if (subdir / "filtered-factors.csv").exists() ] dfs = [pd.read_csv(x) for x in filt_paths] -filt_df = pd.concat(dfs) +filt_df = pd.concat([x for x in dfs if ~x.empty]) filt_df.to_csv(outdir / "filtered-factors.csv") st.dataframe(filt_df) From e65252750382390a304a42633bb0d44eaf17410f Mon Sep 17 00:00:00 2001 From: John Vivian Date: Sun, 4 Feb 2024 18:11:43 -0800 Subject: [PATCH 2/2] Update runner.py --- covid19_drdfm/streamlit/runner.py | 1 - 1 file changed, 1 deletion(-) diff --git a/covid19_drdfm/streamlit/runner.py b/covid19_drdfm/streamlit/runner.py index a54ebd4..c6c24f0 100644 --- a/covid19_drdfm/streamlit/runner.py +++ b/covid19_drdfm/streamlit/runner.py @@ -58,7 +58,6 @@ def run_parameterized_model( variables = list(factors.keys()) _ = [factors.pop(var) for var in variables if var not in columns] # Save input data - st.write(factors) outdir.mkdir(exist_ok=True) out = outdir / state # pprint(f"Saving state input information to {out}")