revert

Flocking/PyPDEVS/benchmark_flocking.py

@@ -90,7 +90,7 @@ def verify_flocking():
 setup = ("from Flocking import Flocking\n"
          "from benchmark_flocking import runthemodel")
 
-n_run = 25
+n_run = 100
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()

WolfSheep/PyPDEVS/Animal.py

@@ -50,7 +50,8 @@ class Animal(AtomicDEVS):
     def extTransition(self, inputs):
         """Reacts to the Environment's resolution of the turn."""
         if self.in_response in inputs:
-            ate_successfully = inputs[self.in_response][0]
+            eaters_list = inputs[self.in_response][0]
+            ate_successfully = self.state.aid in eaters_list
 
             self.state.pos = self.state.target_pos
             self.state.target_pos = None
@@ -65,6 +66,8 @@ class Animal(AtomicDEVS):
             else:
                 self.state.phase = Phase.ALIVE
 
+        return self.state
+
     def intTransition(self):
         if self.state.phase == Phase.JUST_BORN:
             self.state.phase = Phase.ALIVE

WolfSheep/PyPDEVS/Environment.py

@@ -45,7 +45,7 @@ class Environment(AtomicDEVS):
         self.sheep_move = self.addInPort("Sheep Move")
         self.wolf_move = self.addInPort("Wolf Move")
 
-        self.animal_ports = {}
+        self.out_broadcast = self.addOutPort("Animal Broadcast")
 
     def extTransition(self, inputs):
         if self.animal_born in inputs:
@@ -81,10 +81,7 @@ class Environment(AtomicDEVS):
     def outputFnc(self):
         out_bag = {}
         if self.state.phase == Phase.RESOLVING:
-            for aid in self.state.animal_positions:
-                port = self.animal_ports.get(aid)
-                if port:
-                    out_bag[port] = [aid in self.state.successful_eaters]
+            out_bag[self.out_broadcast] = [self.state.successful_eaters]
         return out_bag
 
     def modelTransition(self, state):

WolfSheep/PyPDEVS/WolfSheep.py

@@ -48,10 +48,7 @@ class WolfSheepEcosystem(CoupledDEVS):
         self.connectPorts(agent.out_born, self.environment.animal_born)
         self.connectPorts(agent.out_died, self.environment.animal_died)
 
-        out_port = self.environment.addOutPort(f"out_animal_{aid}")
-        self.environment.animal_ports[aid] = out_port
-        self.connectPorts(out_port, agent.in_response)
-
+        self.connectPorts(self.environment.out_broadcast, agent.in_response)
         self.agents[aid] = agent
 
     def modelTransition(self, state):
@@ -59,10 +56,6 @@ class WolfSheepEcosystem(CoupledDEVS):
             for aid in state["Dead"]:
                 if aid in self.agents:
                     agent = self.agents.pop(aid)
-                    # if aid in self.environment.animal_ports:
-                    #     env_port = self.environment.animal_ports.pop(aid)
-                    #     # self.disconnectPorts(env_port, agent.in_response)
-                    #     # self.environment.removePort(env_port)
                     self.removeSubModel(agent)
             state["Dead"] = []
 

WolfSheep/PyPDEVS/benchmark_wolfsheep.py

@@ -25,7 +25,7 @@ def runthemodel(seed: int, dimensions: tuple[int, int], sheep: int, wolves: int,
 setup = ("from WolfSheep import WolfSheepEcosystem\n"
          "from benchmark_wolfsheep import runthemodel")
 
-n_run = 10
+n_run = 100
 
 if __name__ == '__main__':
     # import cProfile