From c3623e098edce070b6e89f2c71638cec2efdd694 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Sun, 30 Aug 2015 18:11:52 +0200
Subject: updated Stats.merge()

---
 stats.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/stats.py b/stats.py
index a10ea1d..4827d8a 100644
--- a/stats.py
+++ b/stats.py
@@ -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
-- 
cgit v1.2.3