WIP: removed stats

tests/complete_converted.yml

@@ -29,11 +29,11 @@ agents:
         weight: 0.6
     override:
       - filter:
-          id: 0
+          node_id: 0
         state:
           name: 'The first node'
       - filter:
-          id: 1
+          node_id: 1
         state:
           name: 'The second node'
 

tests/test_config.py

@@ -71,11 +71,11 @@ class TestConfig(TestCase):
         s = simulation.from_config(cfg)
         env = s.get_env()
         assert len(env.topologies['default'].nodes) == 10
-        assert len(env.agents('network')) == 10
-        assert len(env.agents('environment')) == 1
+        assert len(env.agents(group='network')) == 10
+        assert len(env.agents(group='environment')) == 1
         
-        assert sum(1 for a in env.agents('network') if isinstance(a, agents.CounterModel)) == 4
-        assert sum(1 for a in env.agents('network') if isinstance(a, agents.AggregatedCounter)) == 6
+        assert sum(1 for a in env.agents(group='network', agent_type=agents.CounterModel)) == 4
+        assert sum(1 for a in env.agents(group='network', agent_type=agents.AggregatedCounter)) == 6
 
 def make_example_test(path, cfg):
     def wrapped(self):

tests/test_exporters.py

@@ -7,8 +7,6 @@ from unittest import TestCase
 from soil import exporters
 from soil import simulation
 
-from soil.stats import distribution
-
 class Dummy(exporters.Exporter):
     started = False
     trials = 0
@@ -22,13 +20,13 @@ class Dummy(exporters.Exporter):
         self.__class__.called_start += 1
         self.__class__.started = True
 
-    def trial_end(self, env, stats):
+    def trial_end(self, env):
         assert env
         self.__class__.trials += 1
         self.__class__.total_time += env.now
         self.__class__.called_trial += 1
 
-    def sim_end(self, stats):
+    def sim_end(self):
         self.__class__.ended = True
         self.__class__.called_end += 1
 
@@ -78,7 +76,6 @@ class Exporters(TestCase):
                                     exporters.csv,
                                     exporters.gexf,
                                 ],
-                                stats=[distribution,],
                                 dry_run=False,
                                 outdir=tmpdir,
                                 exporter_params={'copy_to': output})

tests/test_main.py

@@ -10,7 +10,7 @@ from functools import partial
 
 from os.path import join
 from soil import (simulation, Environment, agents, network, serialization,
-                  utils)
+                  utils, config)
 from soil.time import Delta
 
 ROOT = os.path.abspath(os.path.dirname(__file__))
@@ -200,7 +200,6 @@ class TestMain(TestCase):
             recovered = yaml.load(serial, Loader=yaml.SafeLoader)
         for (k, v) in config.items():
             assert recovered[k] == v
-        # assert config == recovered
 
     def test_configuration_changes(self):
         """
@@ -294,11 +293,13 @@ class TestMain(TestCase):
         G.add_node(3)
         G.add_edge(1, 2)
         distro = agents.calculate_distribution(agent_type=agents.NetworkAgent)
-        env = Environment(name='Test', topology=G, network_agents=distro)
+        distro[0]['topology'] = 'default'
+        aconfig = config.AgentConfig(distribution=distro, topology='default')
+        env = Environment(name='Test', topologies={'default': G}, agents={'network': aconfig})
         lst = list(env.network_agents)
 
-        a2 = env.get_agent(2)
-        a3 = env.get_agent(3)
+        a2 = env.find_one(node_id=2)
+        a3 = env.find_one(node_id=3)
         assert len(a2.subgraph(limit_neighbors=True)) == 2
         assert len(a3.subgraph(limit_neighbors=True)) == 1
         assert len(a3.subgraph(limit_neighbors=True, center=False)) == 0

tests/test_stats.py

@@ -1,34 +0,0 @@
-from unittest import TestCase
-
-from soil import simulation, stats
-from soil.utils import unflatten_dict
-
-class Stats(TestCase):
-
-    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': {}
-        }
-        s = simulation.from_config(config)
-        for env in s.run_simulation(stats=[stats.distribution]):
-            pass
-            # stats_res = unflatten_dict(dict(env._history['stats', -1, None]))
-        allstats = s.get_stats()
-        for stat in allstats:
-            assert 'count' in stat
-            assert 'mean' in stat
-            if 'trial_id' in stat:
-                assert stat['mean']['neighbors'] == 3
-                assert stat['count']['total']['4'] == 4
-            else:
-                assert stat['count']['count']['neighbors']['3'] == 20
-                assert stat['mean']['min']['neighbors'] == stat['mean']['max']['neighbors']