more updates, still nowhere near functional
@@ -365,9 +365,10 @@ class Sim(cvbase.BaseSim):
self =self['interv_func'](self)
# Update counts for this time step: stocks
- # for key in cvd.result_stocks.keys():
- # self.results[f'n_{key}'][t] = self.people.count_in(key)
- # self.results['bed_capacity'][t] = self.results['n_severe'][t]/n_beds if n_beds>0 else np.nan
+ for key in cvd.result_stocks.keys():
+ self.people.filter_in(key)
+ self.results[f'n_{key}'][t] = 0
+ self.results['bed_capacity'][t] = self.results['n_severe'][t]/n_beds if n_beds>0 else np.nan
# Update counts for this time step: flows
self.results['new_infections'][t] = new_infections # New infections on this timestep
