Consolidate code to mesa 2.4 state

Author: anitagraser

mesa/examples/basic/ships_hybrid_algorithm/agents/obstacle.py

@@ -2,7 +2,7 @@
 
 class Obstacle(Agent):
     def __init__(self, model, shape):
-        super().__init__(model)
+        super().__init__(self, model)
         self.shape = shape  # Store the obstacle as a polygon
 
     def step(self):

mesa/examples/basic/ships_hybrid_algorithm/agents/port.py

@@ -2,7 +2,7 @@
 
 class Port(Agent):
     def __init__(self, model):
-        super().__init__(model)
+        super().__init__(self, model)
 
     def step(self):
         """Ports remain static."""

mesa/examples/basic/ships_hybrid_algorithm/agents/ship.py

@@ -8,8 +8,9 @@
 from dynamic_window_approach import dwa_control, motion
 
 class Ship(Agent):
-    def __init__(self, model, start_port, all_ports, dwa_config):
-        super().__init__(model)
+    def __init__(self, model, id, start_port, all_ports, dwa_config):
+        super().__init__(self, model)
+        self.unique_id = id
         self.destination_port = self.assign_destination(all_ports, start_port)
         self.global_path = self.calculate_global_path(start_port.pos, self.destination_port.pos)
         self.dwa_config = dwa_config

mesa/examples/basic/ships_hybrid_algorithm/model.py

@@ -71,9 +71,9 @@ def create_ports(self, ports):
 
     def create_ships(self, num_ships, port_agents):
         """Create ship agents and assign them a start and destination port."""
-        for _ in range(num_ships):
+        for id in range(num_ships):
             start_port = random.choice(port_agents)
-            ship = Ship(self, start_port, port_agents, self.dwa_config)
+            ship = Ship(self, id, start_port, port_agents, self.dwa_config)
             self.space.place_agent(ship, start_port.pos)
             self.schedule.add(ship)