diff options
author | Florian Jung <flo@windfisch.org> | 2015-08-30 18:11:52 +0200 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2015-08-30 18:11:52 +0200 |
commit | c3623e098edce070b6e89f2c71638cec2efdd694 (patch) | |
tree | 0a27c6243caa81a506ae6fa507f99f87597a22d9 | |
parent | 4c1be522f6eddf7b36600119cfddf1c75b995864 (diff) |
updated Stats.merge()
-rw-r--r-- | stats.py | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -133,6 +133,11 @@ class Stats: for i in data2.eject_distlogs: self.data.eject_distlogs[i] += data2.eject_distlogs[i] + for i in self.data.observed_virus_sizes: + self.data.observed_virus_sizes[i] += data2.observed_virus_sizes[i] + + self.data.remerging.update(data2.remerging) + def log_mass(self, mass): self.data.mass_history.append((time.time(), mass)) self.data.current_mass = mass |