refactor: replace entity references with updated class names for ambulance team, police force, and fire brigade

Author: shima004

adf_core_python/core/agent/communication/standard/bundle/information/message_ambulance_team.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 from bitarray import bitarray
-from rcrs_core.entities.ambulanceTeam import AmbulanceTeamEntity
+from rcrs_core.entities.ambulanceTeam import AmbulanceTeam
 from rcrs_core.worldmodel.entityID import EntityID
 
 from adf_core_python.core.agent.communication.standard.bundle.standard_message import (
@@ -36,7 +36,7 @@ class MessageAmbulanceTeam(StandardMessage):
     def __init__(
         self,
         is_wireless_message: bool,
-        ambulance_team: AmbulanceTeamEntity,
+        ambulance_team: AmbulanceTeam,
         action: int,
         target_entity_id: EntityID,
         priority: StandardMessagePriority,
@@ -152,7 +152,7 @@ def from_bits(
             else EntityID(-1)
         )
         action = read_with_exist_flag(bit_array, cls.SIZE_ACTION)
-        ambulance_team = AmbulanceTeamEntity(ambulance_team_id or -1)
+        ambulance_team = AmbulanceTeam(ambulance_team_id or -1)
         ambulance_team.set_hp(ambulance_team_hp)
         ambulance_team.set_buriedness(ambulance_team_buriedness)
         ambulance_team.set_damage(ambulance_team_damage)

adf_core_python/core/agent/communication/standard/bundle/information/message_fire_brigade.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 from bitarray import bitarray
-from rcrs_core.entities.fireBrigade import FireBrigadeEntity
+from rcrs_core.entities.fireBrigade import FireBrigade
 from rcrs_core.worldmodel.entityID import EntityID
 
 from adf_core_python.core.agent.communication.standard.bundle.standard_message import (
@@ -37,7 +37,7 @@ class MessageFireBrigade(StandardMessage):
     def __init__(
         self,
         is_wireless_message: bool,
-        fire_brigade: FireBrigadeEntity,
+        fire_brigade: FireBrigade,
         action: int,
         target_entity_id: EntityID,
         priority: StandardMessagePriority,
@@ -162,7 +162,7 @@ def from_bits(
             EntityID(raw_target_entity_id) if raw_target_entity_id else EntityID(-1)
         )
         action = read_with_exist_flag(bit_array, cls.SIZE_ACTION)
-        fire_brigade = FireBrigadeEntity(
+        fire_brigade = FireBrigade(
             fire_brigade_id or -1,
         )
         fire_brigade.set_hp(fire_brigade_hp)

adf_core_python/core/agent/communication/standard/bundle/information/message_police_force.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 from bitarray import bitarray
-from rcrs_core.entities.policeForce import PoliceForceEntity
+from rcrs_core.entities.policeForce import PoliceForce
 from rcrs_core.worldmodel.entityID import EntityID
 
 from adf_core_python.core.agent.communication.standard.bundle.standard_message import (
@@ -34,7 +34,7 @@ class MessagePoliceForce(StandardMessage):
     def __init__(
         self,
         is_wireless_message: bool,
-        police_force: PoliceForceEntity,
+        police_force: PoliceForce,
         action: int,
         target_entity_id: EntityID,
         priority: StandardMessagePriority,
@@ -147,7 +147,7 @@ def from_bits(
             EntityID(raw_target_entity_id) if raw_target_entity_id else EntityID(-1)
         )
         action = read_with_exist_flag(bit_array, cls.SIZE_ACTION)
-        police_force = PoliceForceEntity(police_force_id or -1)
+        police_force = PoliceForce(police_force_id or -1)
         police_force.set_hp(police_force_hp)
         police_force.set_buriedness(police_force_buriedness)
         police_force.set_damage(police_force_damage)

adf_core_python/core/agent/communication/standard/utility/apply_to_world_info.py

@@ -1,9 +1,9 @@
-from rcrs_core.entities.ambulanceTeam import AmbulanceTeamEntity
+from rcrs_core.entities.ambulanceTeam import AmbulanceTeam
 from rcrs_core.entities.blockade import Blockade
 from rcrs_core.entities.building import Building
 from rcrs_core.entities.civilian import Civilian
-from rcrs_core.entities.fireBrigade import FireBrigadeEntity
-from rcrs_core.entities.policeForce import PoliceForceEntity
+from rcrs_core.entities.fireBrigade import FireBrigade
+from rcrs_core.entities.policeForce import PoliceForce
 from rcrs_core.entities.road import Road
 
 from adf_core_python.core.agent.communication.standard.bundle.information.message_ambulance_team import (
@@ -80,7 +80,7 @@ def _apply_to_world_info_ambulance_team(
         return
     entity = world_info.get_entity(entity_id)
     if entity is None:
-        ambulance = AmbulanceTeamEntity(entity_id.get_value())
+        ambulance = AmbulanceTeam(entity_id.get_value())
         if (hp := message_ambulance_team.get_ambulance_team_hp()) is not None:
             ambulance.set_hp(hp)
         if (damege := message_ambulance_team.get_ambulance_team_damage()) is not None:
@@ -95,7 +95,7 @@ def _apply_to_world_info_ambulance_team(
             ambulance.set_position(position)
         world_info.add_entity(ambulance)
     else:
-        if isinstance(entity, AmbulanceTeamEntity):
+        if isinstance(entity, AmbulanceTeam):
             if (hp := message_ambulance_team.get_ambulance_team_hp()) is not None:
                 entity.set_hp(hp)
             if (
@@ -131,7 +131,7 @@ def _apply_to_world_info_fire_brigade(
         return
     entity = world_info.get_entity(entity_id)
     if entity is None:
-        fire_brigade = FireBrigadeEntity(entity_id.get_value())
+        fire_brigade = FireBrigade(entity_id.get_value())
         if (hp := message_fire_brigade.get_fire_brigade_hp()) is not None:
             fire_brigade.set_hp(hp)
         if (damage := message_fire_brigade.get_fire_brigade_damage()) is not None:
@@ -146,7 +146,7 @@ def _apply_to_world_info_fire_brigade(
             fire_brigade.set_water(water)
         world_info.add_entity(fire_brigade)
     else:
-        if isinstance(entity, FireBrigadeEntity):
+        if isinstance(entity, FireBrigade):
             if (hp := message_fire_brigade.get_fire_brigade_hp()) is not None:
                 entity.set_hp(hp)
             if (damage := message_fire_brigade.get_fire_brigade_damage()) is not None:
@@ -182,7 +182,7 @@ def _apply_to_world_info_police_force(
         return
     entity = world_info.get_entity(entity_id)
     if entity is None:
-        police_force = PoliceForceEntity(entity_id.get_value())
+        police_force = PoliceForce(entity_id.get_value())
         if (hp := message_police_force.get_police_force_hp()) is not None:
             police_force.set_hp(hp)
         if (damage := message_police_force.get_police_force_damage()) is not None:
@@ -195,7 +195,7 @@ def _apply_to_world_info_police_force(
             police_force.set_position(position)
         world_info.add_entity(police_force)
     else:
-        if isinstance(entity, PoliceForceEntity):
+        if isinstance(entity, PoliceForce):
             if (hp := message_police_force.get_police_force_hp()) is not None:
                 entity.set_hp(hp)
             if (damage := message_police_force.get_police_force_damage()) is not None:

adf_core_python/implement/action/default_extend_action_clear.py

@@ -2,13 +2,13 @@
 import sys
 from typing import Optional, cast
 
-from rcrs_core.entities.ambulanceTeam import AmbulanceTeamEntity
+from rcrs_core.entities.ambulanceTeam import AmbulanceTeam
 from rcrs_core.entities.area import Area
 from rcrs_core.entities.blockade import Blockade
 from rcrs_core.entities.building import Building
-from rcrs_core.entities.fireBrigade import FireBrigadeEntity
+from rcrs_core.entities.fireBrigade import FireBrigade
 from rcrs_core.entities.human import Human
-from rcrs_core.entities.policeForce import PoliceForceEntity
+from rcrs_core.entities.policeForce import PoliceForce
 from rcrs_core.entities.refuge import Refuge
 from rcrs_core.entities.road import Road
 from rcrs_core.worldmodel.entityID import EntityID
@@ -122,7 +122,7 @@ def set_target_entity_id(self, target_entity_id: EntityID) -> ExtendAction:
 
     def calculate(self) -> ExtendAction:
         self.result = None
-        police_force = cast(PoliceForceEntity, self.agent_info.get_myself())
+        police_force = cast(PoliceForce, self.agent_info.get_myself())
 
         if self._need_rest(police_force):
             target_entity_ids: list[EntityID] = []
@@ -193,7 +193,7 @@ def calculate(self) -> ExtendAction:
 
         return self
 
-    def _need_rest(self, police_force: PoliceForceEntity) -> bool:
+    def _need_rest(self, police_force: PoliceForce) -> bool:
         hp = police_force.get_hp()
         damage = police_force.get_damage()
 
@@ -210,7 +210,7 @@ def _need_rest(self, police_force: PoliceForceEntity) -> bool:
 
     def _calc_rest(
         self,
-        police_force: PoliceForceEntity,
+        police_force: PoliceForce,
         path_planning: PathPlanning,
         target_entity_ids: list[EntityID],
     ) -> Optional[Action]:
@@ -246,7 +246,7 @@ def _calc_rest(
         return ActionMove(first_result) if first_result != [] else None
 
     def _get_rescue_action(
-        self, police_entity: PoliceForceEntity, road: Road
+        self, police_entity: PoliceForce, road: Road
     ) -> Optional[Action]:
         blockades = set(
             []
@@ -257,9 +257,7 @@ def _get_rescue_action(
             ]
         )
         agent_entities = set(
-            self.world_info.get_entities_of_types(
-                [AmbulanceTeamEntity, FireBrigadeEntity]
-            )
+            self.world_info.get_entities_of_types([AmbulanceTeam, FireBrigade])
         )
 
         police_x = police_entity.get_x()
@@ -462,7 +460,7 @@ def _get_intersect_edge_action(
                 return action_move
 
         action = self._get_area_clear_action(
-            cast(PoliceForceEntity, self.agent_info.get_myself()), road
+            cast(PoliceForce, self.agent_info.get_myself()), road
         )
         if action is None:
             action = ActionMove([road.get_id()], int(point_x), int(point_y))
@@ -560,7 +558,7 @@ def _is_intersecting_blockades(
         return False
 
     def _get_area_clear_action(
-        self, police_entity: PoliceForceEntity, road: Road
+        self, police_entity: PoliceForce, road: Road
     ) -> Optional[Action]:
         if road.get_blockades() == []:
             return None
@@ -631,7 +629,7 @@ def _index_of(self, list: list[EntityID], x: EntityID) -> int:
         return list.index(x) if x in list else -1
 
     def _get_neighbour_position_action(
-        self, police_entity: PoliceForceEntity, target: Area
+        self, police_entity: PoliceForce, target: Area
     ) -> Optional[Action]:
         agent_x = police_entity.get_x()
         agent_y = police_entity.get_y()

adf_core_python/implement/action/default_extend_action_rescue.py

@@ -2,7 +2,7 @@
 
 from rcrs_core.entities.area import Area
 from rcrs_core.entities.blockade import Blockade
-from rcrs_core.entities.fireBrigade import FireBrigadeEntity
+from rcrs_core.entities.fireBrigade import FireBrigade
 from rcrs_core.entities.human import Human
 from rcrs_core.worldmodel.entityID import EntityID
 
@@ -104,7 +104,7 @@ def set_target_entity_id(self, target_entity_id: EntityID) -> ExtendAction:
 
     def calculate(self) -> ExtendAction:
         self.result = None
-        agent = cast(FireBrigadeEntity, self.agent_info.get_myself())
+        agent = cast(FireBrigade, self.agent_info.get_myself())
 
         if self._target_entity_id is not None:
             self.result = self._calc_rescue(
@@ -115,7 +115,7 @@ def calculate(self) -> ExtendAction:
 
     def _calc_rescue(
         self,
-        agent: FireBrigadeEntity,
+        agent: FireBrigade,
         path_planning: PathPlanning,
         target_entity_id: EntityID,
     ) -> Optional[Action]:

adf_core_python/implement/action/default_extend_action_transport.py

@@ -1,6 +1,6 @@
 from typing import Optional, Union, cast
 
-from rcrs_core.entities.ambulanceTeam import AmbulanceTeamEntity
+from rcrs_core.entities.ambulanceTeam import AmbulanceTeam
 from rcrs_core.entities.area import Area
 from rcrs_core.entities.civilian import Civilian
 from rcrs_core.entities.entity import Entity
@@ -102,9 +102,7 @@ def set_target_entity_id(self, target_entity_id: EntityID) -> ExtendAction:
 
     def calculate(self) -> ExtendAction:
         self._result = None
-        agent: AmbulanceTeamEntity = cast(
-            AmbulanceTeamEntity, self.agent_info.get_myself()
-        )
+        agent: AmbulanceTeam = cast(AmbulanceTeam, self.agent_info.get_myself())
         transport_human: Optional[Human] = self.agent_info.some_one_on_board()
         if transport_human is not None:
             self._logger.debug(f"transport_human: {transport_human.get_id()}")
@@ -123,7 +121,7 @@ def calculate(self) -> ExtendAction:
 
     def calc_rescue(
         self,
-        agent: AmbulanceTeamEntity,
+        agent: AmbulanceTeam,
         path_planning: PathPlanning,
         target_id: EntityID,
     ) -> Optional[Union[ActionMove, ActionLoad]]:
@@ -158,7 +156,7 @@ def calc_rescue(
 
     def calc_unload(
         self,
-        agent: AmbulanceTeamEntity,
+        agent: AmbulanceTeam,
         path_planning: PathPlanning,
         transport_human: Optional[Human],
         target_id: Optional[EntityID],

adf_core_python/implement/module/algorithm/k_means_clustering.py

@@ -1,12 +1,12 @@
 import numpy as np
 from rcrs_core.connection.URN import Entity as EntityURN
-from rcrs_core.entities.ambulanceCenter import AmbulanceCentreEntity
+from rcrs_core.entities.ambulanceCenter import AmbulanceCentre
 from rcrs_core.entities.building import Building
 from rcrs_core.entities.entity import Entity
-from rcrs_core.entities.fireStation import FireStationEntity
-from rcrs_core.entities.gassStation import GasStation
+from rcrs_core.entities.fireStation import FireStation
+from rcrs_core.entities.gasStation import GasStation
 from rcrs_core.entities.hydrant import Hydrant
-from rcrs_core.entities.policeOffice import PoliceOfficeEntity
+from rcrs_core.entities.policeOffice import PoliceOffice
 from rcrs_core.entities.refuge import Refuge
 from rcrs_core.entities.road import Road
 from rcrs_core.worldmodel.entityID import EntityID
@@ -72,11 +72,11 @@ def __init__(
         self.cluster_entities: list[list[Entity]] = []
         self.entities: list[Entity] = world_info.get_entities_of_types(
             [
-                AmbulanceCentreEntity,
-                FireStationEntity,
+                AmbulanceCentre,
+                FireStation,
                 GasStation,
                 Hydrant,
-                PoliceOfficeEntity,
+                PoliceOffice,
                 Refuge,
                 Road,
                 Building,

adf_core_python/implement/module/complex/default_ambulance_target_allocator.py

@@ -1,7 +1,7 @@
 from functools import cmp_to_key
 from typing import Callable, Optional
 
-from rcrs_core.entities.ambulanceTeam import AmbulanceTeamEntity
+from rcrs_core.entities.ambulanceTeam import AmbulanceTeam
 from rcrs_core.entities.entity import Entity
 from rcrs_core.entities.human import Human
 from rcrs_core.worldmodel.entityID import EntityID
@@ -40,19 +40,15 @@ def resume(self, precompute_data: PrecomputeData) -> AmbulanceTargetAllocator:
         super().resume(precompute_data)
         if self.get_count_resume() >= 2:
             return self
-        for entity_id in self._world_info.get_entity_ids_of_types(
-            [AmbulanceTeamEntity]
-        ):
+        for entity_id in self._world_info.get_entity_ids_of_types([AmbulanceTeam]):
             self._ambulance_team_info_map[entity_id] = self.AmbulanceTeamInfo(entity_id)
         return self
 
     def prepare(self) -> AmbulanceTargetAllocator:
         super().prepare()
         if self.get_count_prepare() >= 2:
             return self
-        for entity_id in self._world_info.get_entity_ids_of_types(
-            [AmbulanceTeamEntity]
-        ):
+        for entity_id in self._world_info.get_entity_ids_of_types([AmbulanceTeam]):
             self._ambulance_team_info_map[entity_id] = self.AmbulanceTeamInfo(entity_id)
         return self
 
@@ -113,9 +109,9 @@ def get_result(self) -> dict[EntityID, EntityID]:
     def _get_action_agents(
         self,
         info_map: dict[EntityID, "DefaultAmbulanceTargetAllocator.AmbulanceTeamInfo"],
-    ) -> list[AmbulanceTeamEntity]:
+    ) -> list[AmbulanceTeam]:
         result = []
-        for entity in self._world_info.get_entities_of_types([AmbulanceTeamEntity]):
+        for entity in self._world_info.get_entities_of_types([AmbulanceTeam]):
             info = info_map[entity.get_id()]
             if info is not None and info._can_new_action:
                 result.append(entity)