Big refactor v0.30

All test pass, except for the TestConfig suite, which is not too critical as the
plan for this version onwards is to avoid configuration as much as possible.

examples/rabbits/basic/rabbits.yml

@@ -1,42 +0,0 @@
----
-version: '2'
-name: rabbits_basic
-num_trials: 1
-seed: MySeed
-description: null
-group: null
-interval: 1.0
-max_time: 100
-model_class: rabbit_agents.RabbitEnv
-model_params:
-  agents:
-    topology: true
-    distribution:
-    - agent_class: rabbit_agents.Male
-      weight: 1
-    - agent_class: rabbit_agents.Female
-      weight: 1
-    fixed:
-    - agent_class: rabbit_agents.RandomAccident
-      topology: false
-      hidden: true
-      state:
-        group: environment
-    state:
-      group: network
-      mating_prob: 0.1
-  prob_death: 0.001
-  topology:
-    fixed:
-      directed: true
-      links: []
-      nodes:
-      - id: 1
-      - id: 0
-  model_reporters:
-    num_males: 'num_males'
-    num_females: 'num_females'
-    num_rabbits: |
-      py:lambda env: env.num_males + env.num_females
-extra:
-  visualization_params: {}

examples/rabbits/improved/rabbits.yml

@@ -1,42 +0,0 @@
----
-version: '2'
-name: rabbits_improved
-num_trials: 1
-seed: MySeed
-description: null
-group: null
-interval: 1.0
-max_time: 100
-model_class: rabbit_agents.RabbitEnv
-model_params:
-  agents:
-    topology: true
-    distribution:
-    - agent_class: rabbit_agents.Male
-      weight: 1
-    - agent_class: rabbit_agents.Female
-      weight: 1
-    fixed:
-    - agent_class: rabbit_agents.RandomAccident
-      topology: false
-      hidden: true
-      state:
-        group: environment
-    state:
-      group: network
-      mating_prob: 0.1
-  prob_death: 0.001
-  topology:
-    fixed:
-      directed: true
-      links: []
-      nodes:
-      - id: 1
-      - id: 0
-  model_reporters:
-    num_males: 'num_males'
-    num_females: 'num_females'
-    num_rabbits: |
-      py:lambda env: env.num_males + env.num_females
-extra:
-  visualization_params: {}

examples/rabbits/rabbit_improved_sim.py

@@ -1,23 +1,20 @@
-from soil import FSM, state, default_state, BaseAgent, NetworkAgent, Environment
+from soil import FSM, state, default_state, BaseAgent, NetworkAgent, Environment, Simulation
 from soil.time import Delta
 from enum import Enum
 from collections import Counter
 import logging
 import math
 
+from rabbits_basic_sim import RabbitEnv
 
-class RabbitEnv(Environment):
-    @property
-    def num_rabbits(self):
-        return self.count_agents(agent_class=Rabbit)
 
-    @property
-    def num_males(self):
-        return self.count_agents(agent_class=Male)
-
-    @property
-    def num_females(self):
-        return self.count_agents(agent_class=Female)
+class RabbitsImprovedEnv(RabbitEnv):
+    def init(self):
+        """Initialize the environment with the new versions of the agents"""
+        a1 = self.add_node(Male)
+        a2 = self.add_node(Female)
+        a1.add_edge(a2)
+        self.add_agent(RandomAccident)
 
 
 class Rabbit(FSM, NetworkAgent):
@@ -150,8 +147,7 @@ class RandomAccident(BaseAgent):
         self.debug("Rabbits alive: {}".format(rabbits_alive))
 
 
-if __name__ == "__main__":
-    from soil import easy
+sim = Simulation(model=RabbitsImprovedEnv, max_time=100, seed="MySeed", num_trials=1)
 
-    with easy("rabbits.yml") as sim:
-        sim.run()
+if __name__ == "__main__":
+    sim.run()

examples/rabbits/rabbits_basic_sim.py

@@ -1,20 +1,29 @@
-from soil import FSM, state, default_state, BaseAgent, NetworkAgent, Environment
+from soil import FSM, state, default_state, BaseAgent, NetworkAgent, Environment, Simulation, report, parameters as params
 from collections import Counter
 import logging
 import math
 
 
 class RabbitEnv(Environment):
-    prob_death = 1e-100
+    prob_death: params.probability = 1e-100
 
+    def init(self):
+        a1 = self.add_node(Male)
+        a2 = self.add_node(Female)
+        a1.add_edge(a2)
+        self.add_agent(RandomAccident)
+
+    @report
     @property
     def num_rabbits(self):
         return self.count_agents(agent_class=Rabbit)
 
+    @report
     @property
     def num_males(self):
         return self.count_agents(agent_class=Male)
 
+    @report
     @property
     def num_females(self):
         return self.count_agents(agent_class=Female)
@@ -145,8 +154,8 @@ class RandomAccident(BaseAgent):
         self.debug("Rabbits alive: {}".format(rabbits_alive))
 
 
-if __name__ == "__main__":
-    from soil import easy
 
-    with easy("rabbits.yml") as sim:
-        sim.run()
+sim = Simulation(model=RabbitEnv, max_time=100, seed="MySeed", num_trials=1)
+
+if __name__ == "__main__":
+    sim.run()