Refactoring v0.15.1

See CHANGELOG.md for a full list of changes

* Removed nxsim
* Refactored `agents.NetworkAgent` and `agents.BaseAgent`
* Refactored exporters
* Added stats to history

tests/test_exporters.py

@@ -6,26 +6,32 @@ from time import time
 
 from unittest import TestCase
 from soil import exporters
-from soil.utils import safe_open
 from soil import simulation
 
+from soil.stats import distribution
 
 class Dummy(exporters.Exporter):
     started = False
     trials = 0
     ended = False
     total_time = 0
+    called_start = 0
+    called_trial = 0
+    called_end = 0
 
     def start(self):
+        self.__class__.called_start += 1
         self.__class__.started = True
 
-    def trial_end(self, env):
+    def trial(self, env, stats):
         assert env
         self.__class__.trials += 1
         self.__class__.total_time += env.now
+        self.__class__.called_trial += 1
 
-    def end(self):
+    def end(self, stats):
         self.__class__.ended = True
+        self.__class__.called_end += 1
 
 
 class Exporters(TestCase):
@@ -39,32 +45,17 @@ class Exporters(TestCase):
             'environment_params': {}
         }
         s = simulation.from_config(config)
-        s.run_simulation(exporters=[Dummy], dry_run=True)
+        for env in s.run_simulation(exporters=[Dummy], dry_run=True):
+            assert env.now <= 2
+
         assert Dummy.started
         assert Dummy.ended
+        assert Dummy.called_start == 1
+        assert Dummy.called_end == 1
+        assert Dummy.called_trial == 5
         assert Dummy.trials == 5
         assert Dummy.total_time == 2*5
 
-    def test_distribution(self):
-        '''The distribution exporter should write the number of agents in each state'''
-        config = {
-            'name': 'exporter_sim',
-            'network_params': {
-                'generator': 'complete_graph',
-                'n': 4
-            },
-            'agent_type': 'CounterModel',
-            'max_time': 2,
-            'num_trials': 5,
-            'environment_params': {}
-        }
-        output = io.StringIO()
-        s = simulation.from_config(config)
-        s.run_simulation(exporters=[exporters.distribution], dry_run=True, exporter_params={'copy_to': output})
-        result = output.getvalue()
-        assert 'count' in result
-        assert 'SEED,Noneexporter_sim_trial_3,1,,1,1,1,1' in result
-
     def test_writing(self):
         '''Try to write CSV, GEXF, sqlite and YAML (without dry_run)'''
         n_trials = 5
@@ -86,8 +77,8 @@ class Exporters(TestCase):
             exporters.default,
             exporters.csv,
             exporters.gexf,
-            exporters.distribution,
         ],
+                                stats=[distribution,],
                                 outdir=tmpdir,
                                 exporter_params={'copy_to': output})
         result = output.getvalue()