Add rescheduling for received

benchmarks/virusonnetwork/_config.py

@@ -1,8 +1,9 @@
 import os
+from soil import simulation
 
 NUM_AGENTS = int(os.environ.get('NUM_AGENTS', 100))
 NUM_ITERS = int(os.environ.get('NUM_ITERS', 10))
-MAX_STEPS = int(os.environ.get('MAX_STEPS', 1000))
+MAX_STEPS = int(os.environ.get('MAX_STEPS', 500))
 
 
 def run_sim(model, **kwargs):
@@ -22,11 +23,16 @@ def run_sim(model, **kwargs):
                 iterations=NUM_ITERS)
     opts.update(kwargs)
     its = Simulation(**opts).run()
+    assert len(its) == NUM_ITERS
 
-    assert all(it.schedule.steps == MAX_STEPS for it in its)
-    ratios = list(it.resistant_susceptible_ratio() for it in its)
-    print("Max - Avg - Min ratio:", max(ratios), sum(ratios)/len(ratios), min(ratios))
-    assert all(sum([it.number_susceptible,
-                    it.number_infected,
-                    it.number_resistant]) == NUM_AGENTS for it in its)
-    return its
+    if not simulation._AVOID_RUNNING:
+        ratios = list(it.resistant_susceptible_ratio for it in its)
+        print("Max - Avg - Min ratio:", max(ratios), sum(ratios)/len(ratios), min(ratios))
+        infected = list(it.number_infected for it in its)
+        print("Max - Avg - Min infected:", max(infected), sum(infected)/len(infected), min(infected))
+
+        assert all((it.schedule.steps == MAX_STEPS or it.number_infected == 0) for it in its)
+        assert all(sum([it.number_susceptible,
+                        it.number_infected,
+                        it.number_resistant]) == NUM_AGENTS for it in its)
+    return its

benchmarks/virusonnetwork/mesa_basic.py

@@ -100,6 +100,7 @@ class VirusOnNetwork(mesa.Model):
     def number_infected(self):
         return number_infected(self)
 
+    @property
     def resistant_susceptible_ratio(self):
         try:
             return number_state(self, State.RESISTANT) / number_state(
@@ -176,5 +177,4 @@ class VirusAgent(mesa.Agent):
 
 
 from _config import run_sim
-
 run_sim(model=VirusOnNetwork)

benchmarks/virusonnetwork/soil_states.py

@@ -30,8 +30,12 @@ class VirusOnNetwork(Environment):
         for a in self.agents(node_id=infected_nodes):
             a.set_state(VirusAgent.infected)
         assert self.number_infected == self.initial_outbreak_size
+    
+    def step(self):
+        super().step()
 
     @report
+    @property
     def resistant_susceptible_ratio(self):
         try:
             return self.number_resistant / self.number_susceptible
@@ -59,34 +63,29 @@ class VirusAgent(Agent):
     virus_check_frequency = None # Inherit from model
     recovery_chance = None # Inherit from model
     gain_resistance_chance = None # Inherit from model
-    just_been_infected = False
 
     @state(default=True)
-    def susceptible(self):
-        if self.just_been_infected:
-            self.just_been_infected = False
-            return self.infected
+    async def susceptible(self):
+        await self.received()
+        return self.infected
 
     @state
     def infected(self):
         susceptible_neighbors = self.get_neighbors(state_id=self.susceptible.id)
         for a in susceptible_neighbors:
             if self.prob(self.virus_spread_chance):
-                a.just_been_infected = True
+                a.tell(True, sender=self)
         if self.prob(self.virus_check_frequency):
             if self.prob(self.recovery_chance):
                 if self.prob(self.gain_resistance_chance):
                     return self.resistant
                 else:
                     return self.susceptible
-            else:
-                return self.infected
 
     @state
     def resistant(self):
         return self.at(INFINITY)
 
 
-if __name__ == "__main__":
-    from _config import run_sim
-    run_sim(model=VirusOnNetwork)
+from _config import run_sim
+run_sim(model=VirusOnNetwork)

benchmarks/virusonnetwork/soil_step.py

@@ -38,6 +38,7 @@ class VirusOnNetwork(Environment):
         assert self.number_infected == self.initial_outbreak_size
 
     @report
+    @property
     def resistant_susceptible_ratio(self):
         try:
             return self.number_resistant / self.number_susceptible
@@ -99,6 +100,5 @@ class VirusAgent(Agent):
 
 
 
-if __name__ == "__main__":
-    from _config import run_sim
-    run_sim(model=VirusOnNetwork)
+from _config import run_sim
+run_sim(model=VirusOnNetwork)