Skip to content

Commit 1e0de5a

Browse files
Adjustment for gempyor.seir.write_seir args
Follow up to #585 to account for the arguments of `gempyor.seir.write_seir` taking the out dataframe instead of the states, leaving it to the user to call `gempyor.seir.states2DF`.
1 parent fda910d commit 1e0de5a

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

flepimop/gempyor_pkg/src/gempyor/inference.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ def simulation_atomic(
125125
seeding_amounts,
126126
)
127127
if save:
128-
seir.write_spar_snpi(sim_id=random_id, modinf=modinf, p_draw=p_draw, npi=npi_seir)
129-
seir.write_seir(sim_id=random_id, modinf=modinf, states=states)
128+
out_df = seir.states2Df(modinf, states)
129+
seir.write_spar_snpi(random_id, modinf, p_draw, npi_seir)
130+
seir.write_seir(random_id, modinf, out_df)
130131

131132
# Compute outcomes
132133
outcomes_df, hpar_df = outcomes.compute_all_multioutcomes(
@@ -616,7 +617,8 @@ def build_structure(self):
616617
def write_last_seir(self, sim_id2write=None):
617618
if sim_id2write is None:
618619
sim_id2write = self.lastsim_sim_id2write
619-
out_df = seir.write_seir(sim_id2write, self.modinf, self.lastsim_states)
620+
out_df = seir.states2Df(self.modinf, self.lastsim_states)
621+
seir.write_seir(sim_id2write, self.modinf, out_df)
620622
return out_df
621623

622624
# @profile()
@@ -783,7 +785,8 @@ def one_simulation(
783785
if self.modinf.write_csv or self.modinf.write_parquet:
784786
seir.write_spar_snpi(sim_id2write, self.modinf, p_draw, npi_seir)
785787
if self.autowrite_seir:
786-
out_df = seir.write_seir(sim_id2write, self.modinf, states)
788+
out_df = seir.states2Df(self.modinf, states)
789+
seir.write_seir(sim_id2write, self.modinf, out_df)
787790
self.lastsim_out_df = out_df
788791

789792
loaded_values = None

0 commit comments

Comments
 (0)