Merge pull request #40 from adf-python/adf/core/launcher/agent_launcher

adf/core/launcher/agent_launcherとその依存モジュールの実装

Author: shima004

adf_core_python/core/component/abstract_loader.py

@@ -1,37 +1,54 @@
 from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING, Optional
+
+if TYPE_CHECKING:
+    from adf_core_python.core.component.tactics.tactics_ambulance_center import (
+        TacticsAmbulanceCenter,
+    )
+    from adf_core_python.core.component.tactics.tactics_ambulance_team import (
+        TacticsAmbulanceTeam,
+    )
+    from adf_core_python.core.component.tactics.tactics_fire_brigade import (
+        TacticsFireBrigade,
+    )
+    from adf_core_python.core.component.tactics.tactics_fire_station import (
+        TacticsFireStation,
+    )
+    from adf_core_python.core.component.tactics.tactics_police_force import (
+        TacticsPoliceForce,
+    )
+    from adf_core_python.core.component.tactics.tactics_police_office import (
+        TacticsPoliceOffice,
+    )
 
 
 class AbstractLoader(ABC):
-    def __init__(self) -> None:
-        self._team_name: str = ""
+    def __init__(self, team_name: Optional[str] = None):
+        self._team_name: str = "" if team_name is None else team_name
 
     def get_team_name(self) -> str:
         return self._team_name
 
-    def set_team_name(self, team_name: str) -> None:
-        self._team_name = team_name
-
-    # TODO: Add more abstract methods here
     @abstractmethod
-    def get_tactics_ambulance_team(self) -> None:
+    def get_tactics_ambulance_team(self) -> TacticsAmbulanceTeam:
         raise NotImplementedError
 
     @abstractmethod
-    def get_tactics_fire_brigade(self) -> None:
+    def get_tactics_fire_brigade(self) -> TacticsFireBrigade:
         raise NotImplementedError
 
     @abstractmethod
-    def get_tactics_police_force(self) -> None:
+    def get_tactics_police_force(self) -> TacticsPoliceForce:
         raise NotImplementedError
 
     @abstractmethod
-    def get_tactics_ambulance_centre(self) -> None:
+    def get_tactics_ambulance_center(self) -> TacticsAmbulanceCenter:
         raise NotImplementedError
 
     @abstractmethod
-    def get_tactics_fire_station(self) -> None:
+    def get_tactics_fire_station(self) -> TacticsFireStation:
         raise NotImplementedError
 
     @abstractmethod
-    def get_tactics_police_office(self) -> None:
+    def get_tactics_police_office(self) -> TacticsPoliceOffice:
         raise NotImplementedError

adf_core_python/core/component/module/complex/human_detector.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+from abc import abstractmethod
+from typing import TYPE_CHECKING
+
+from rcrs_core.entities.human import Human
+
+if TYPE_CHECKING:
+    from adf_core_python.core.agent.develop.develop_data import DevelopData
+    from adf_core_python.core.agent.info.agent_info import AgentInfo
+    from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+    from adf_core_python.core.agent.info.world_info import WorldInfo
+    from adf_core_python.core.agent.module.module_manager import ModuleManager
+    from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+    from adf_core_python.core.component.module.complex.target_detector import (
+        TargetDetector,
+    )
+
+
+class HumanDetector(TargetDetector[Human]):
+    def __init__(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        develop_data: DevelopData,
+    ) -> None:
+        super().__init__(
+            agent_info, world_info, scenario_info, module_manager, develop_data
+        )
+
+    def precompute(self, precompute_data: PrecomputeData) -> HumanDetector:
+        super().precompute(precompute_data)
+        return self
+
+    def resume(self, precompute_data: PrecomputeData) -> HumanDetector:
+        super().resume(precompute_data)
+        return self
+
+    def prepare(self) -> HumanDetector:
+        super().prepare()
+        return self
+
+    @abstractmethod
+    def calculate(self) -> HumanDetector:
+        return self

adf_core_python/core/component/module/complex/search.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+from abc import abstractmethod
+from typing import TYPE_CHECKING
+
+from rcrs_core.entities.area import Area
+
+if TYPE_CHECKING:
+    from adf_core_python.core.agent.develop.develop_data import DevelopData
+    from adf_core_python.core.agent.info.agent_info import AgentInfo
+    from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+    from adf_core_python.core.agent.info.world_info import WorldInfo
+    from adf_core_python.core.agent.module.module_manager import ModuleManager
+    from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+    from adf_core_python.core.component.module.complex.target_detector import (
+        TargetDetector,
+    )
+
+
+class Search(TargetDetector[Area]):
+    def __init__(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        develop_data: DevelopData,
+    ) -> None:
+        super().__init__(
+            agent_info, world_info, scenario_info, module_manager, develop_data
+        )
+
+    def precompute(self, precompute_data: PrecomputeData) -> Search:
+        super().precompute(precompute_data)
+        return self
+
+    def resume(self, precompute_data: PrecomputeData) -> Search:
+        super().resume(precompute_data)
+        return self
+
+    def prepare(self) -> Search:
+        super().prepare()
+        return self
+
+    @abstractmethod
+    def calculate(self) -> Search:
+        return self

adf_core_python/core/component/module/complex/target_detector.py

@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+from abc import abstractmethod
+from typing import TYPE_CHECKING, Generic, TypeVar
+
+from rcrs_core.entities.entity import Entity
+
+from adf_core_python.core.component.module.abstract_module import AbstractModule
+
+if TYPE_CHECKING:
+    from rcrs_core.worldmodel.entityID import EntityID
+
+    from adf_core_python.core.agent.communication.message_manager import MessageManager
+    from adf_core_python.core.agent.develop.develop_data import DevelopData
+    from adf_core_python.core.agent.info.agent_info import AgentInfo
+    from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+    from adf_core_python.core.agent.info.world_info import WorldInfo
+    from adf_core_python.core.agent.module.module_manager import ModuleManager
+    from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+
+T = TypeVar("T", bound=Entity)
+
+
+class TargetDetector(AbstractModule, Generic[T]):
+    def __init__(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        develop_data: DevelopData,
+    ) -> None:
+        super().__init__(
+            agent_info, world_info, scenario_info, module_manager, develop_data
+        )
+
+    @abstractmethod
+    def get_target_entity_id(self) -> EntityID:
+        pass
+
+    @abstractmethod
+    def calculate(self) -> TargetDetector[T]:
+        pass
+
+    def precompute(self, precompute_data: PrecomputeData) -> TargetDetector[T]:
+        super().precompute(precompute_data)
+        return self
+
+    def resume(self, precompute_data: PrecomputeData) -> TargetDetector[T]:
+        super().resume(precompute_data)
+        return self
+
+    def prepare(self) -> TargetDetector[T]:
+        super().prepare()
+        return self
+
+    def update_info(self, message_manager: MessageManager) -> TargetDetector[T]:
+        super().update_info(message_manager)
+        return self

adf_core_python/core/component/tactics/tactics_agent.py

@@ -4,6 +4,7 @@
 from typing import TYPE_CHECKING, Any, Optional
 
 if TYPE_CHECKING:
+    from adf_core_python.core.agent.action.action import Action
     from adf_core_python.core.agent.communication.message_manager import MessageManager
     from adf_core_python.core.agent.develop.develop_data import DevelopData
     from adf_core_python.core.agent.info.agent_info import AgentInfo
@@ -74,7 +75,7 @@ def prepare(
         raise NotImplementedError
 
     @abstractmethod
-    def update_info(
+    def think(
         self,
         agent_info: AgentInfo,
         world_info: WorldInfo,
@@ -83,7 +84,7 @@ def update_info(
         precompute_data: PrecomputeData,
         message_manager: MessageManager,
         develop_data: DevelopData,
-    ) -> None:
+    ) -> Action:
         raise NotImplementedError
 
     def get_parent_tactics(self) -> Optional[TacticsAgent]:

adf_core_python/core/component/tactics/tactics_ambulance_center.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
-if TYPE_CHECKING:
-    from adf_core_python.core.component.tactics.tactics_center import TacticsCenter
+from adf_core_python.core.component.tactics.tactics_center import TacticsCenter
 
 
 class TacticsAmbulanceCenter(TacticsCenter):

adf_core_python/core/component/tactics/tactics_ambulance_team.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
-if TYPE_CHECKING:
-    from adf_core_python.core.component.tactics.tactics_agent import TacticsAgent
+from adf_core_python.core.component.tactics.tactics_agent import TacticsAgent
 
 
 class TacticsAmbulanceTeam(TacticsAgent):

adf_core_python/core/component/tactics/tactics_fire_brigade.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
-if TYPE_CHECKING:
-    from adf_core_python.core.component.tactics.tactics_agent import TacticsAgent
+from adf_core_python.core.component.tactics.tactics_agent import TacticsAgent
 
 
 class TacticsFireBrigade(TacticsAgent):

adf_core_python/core/component/tactics/tactics_fire_station.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
-if TYPE_CHECKING:
-    from adf_core_python.core.component.tactics.tactics_center import TacticsCenter
+from adf_core_python.core.component.tactics.tactics_center import TacticsCenter
 
 
 class TacticsFireStation(TacticsCenter):

adf_core_python/core/component/tactics/tactics_police_force.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
-if TYPE_CHECKING:
-    from adf_core_python.core.component.tactics.tactics_agent import TacticsAgent
+from adf_core_python.core.component.tactics.tactics_agent import TacticsAgent
 
 
 class TacticsPoliceForce(TacticsAgent):