WIP: working config

tests/complete_converted.yml

@@ -0,0 +1,49 @@
+---
+version: '2'
+general:
+  id: simple
+  group: tests
+  dir_path: "/tmp/"
+  num_trials: 3
+  max_time: 100
+  interval: 1
+  seed: "CompleteSeed!"
+topologies:
+  default:
+    params:
+      generator: complete_graph
+      n: 10
+agents:
+  default:
+    agent_class: CounterModel
+    state:
+      times: 1
+  network:
+    topology: 'default'
+    distribution:
+      - agent_class: CounterModel
+        weight: 0.4
+        state:
+          state_id: 0
+      - agent_class: AggregatedCounter
+        weight: 0.6
+    override:
+      - filter:
+          id: 0
+        state:
+          name: 'The first node'
+      - filter:
+          id: 1
+        state:
+          name: 'The second node'
+
+  environment:
+    fixed:
+      - name: 'Environment Agent 1'
+        agent_class: CounterModel
+        state:
+          times: 10
+environment:
+  environment_class: Environment
+  params:
+    am_i_complete: true

tests/old_complete.yml

@@ -11,11 +11,11 @@ network_params:
   n: 10
 network_agents:
   - agent_type: CounterModel
-    weight: 1
+    weight: 0.4
     state:
       state_id: 0
   - agent_type: AggregatedCounter
-    weight: 0.2
+    weight: 0.6
 environment_agents:
   - agent_id: 'Environment Agent 1'
     agent_type: CounterModel

tests/test_config.py

@@ -2,7 +2,7 @@ from unittest import TestCase
 import os
 from os.path import join
 
-from soil import simulation, serialization, config, network
+from soil import simulation, serialization, config, network, agents
 
 ROOT = os.path.abspath(os.path.dirname(__file__))
 EXAMPLES = join(ROOT, '..', 'examples')
@@ -13,18 +13,22 @@ FORCE_TESTS = os.environ.get('FORCE_TESTS', '')
 class TestConfig(TestCase):
 
     def test_conversion(self):
-        new = serialization.load_file(join(ROOT, "complete_converted.yml"))[0]
+        expected = serialization.load_file(join(ROOT, "complete_converted.yml"))[0]
         old = serialization.load_file(join(ROOT, "old_complete.yml"))[0]
         converted_defaults = config.convert_old(old, strict=False)
         converted = converted_defaults.dict(skip_defaults=True)
-        def isequal(old, new):
-            if isinstance(old, dict):
-                for (k, v) in old.items():
-                    isequal(old[k], new[k])
-                return
-            assert old == new
 
-        isequal(new, converted)
+        def isequal(a, b):
+            if isinstance(a, dict):
+                for (k, v) in a.items():
+                    if v:
+                        isequal(a[k], b[k])
+                    else:
+                        assert not b.get(k, None)
+                return
+            assert a == b
+
+        isequal(converted, expected)
 
     def test_topology_config(self):
         netconfig = config.NetConfig(**{
@@ -60,6 +64,19 @@ class TestConfig(TestCase):
         assert env.agents[0].topology == env.topologies['default']
 
 
+    def test_agents_from_config(self):
+        '''We test that the known complete configuration produces
+        the right agents in the right groups'''
+        cfg = serialization.load_file(join(ROOT, "complete_converted.yml"))[0]
+        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 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
+
 def make_example_test(path, cfg):
     def wrapped(self):
         root = os.getcwd()

tests/test_examples.py

@@ -18,10 +18,10 @@ def make_example_test(path, config):
     def wrapped(self):
         root = os.getcwd()
         for s in simulation.all_from_config(path):
-            iterations = s.config.max_time * s.config.num_trials
+            iterations = s.config.general.max_time * s.config.general.num_trials
             if iterations > 1000:
-                s.config.max_time = 100
-                s.config.num_trials = 1
+                s.config.general.max_time = 100
+                s.config.general.num_trials = 1
             if config.get('skip_test', False) and not FORCE_TESTS:
                 self.skipTest('Example ignored.')
             envs = s.run_simulation(dry_run=True)