fix conflicts in model
@@ -111,7 +111,6 @@ class Sim(cova.Sim):
''' Initialize results '''
self.results = {}
-<<<<<<< HEAD
self.results['n_susceptible'] = Result('Number susceptible')
self.results['n_exposed'] = Result('Number exposed')
self.results['n_infectious'] = Result('Number infectious')
@@ -134,15 +133,10 @@ class Sim(cova.Sim):
for key in self.reskeys:
self.results[key].values = np.zeros(int(self.npts))
- self.results['t'] = np.arange(int(self.npts))
-=======
- for key in self.results_keys:
- self.results[key] = np.zeros(self.npts)
self.results['t'] = self.tvec
self.results['date'] = []
for t in self.tvec:
self.results['date'].append(self['start_day'] + dt.timedelta(days=int(t)))
->>>>>>> develop
self.results['transtree'] = {} # For storing the transmission tree
self.results['ready'] = False
return
