From f822458f4e2b6e2d91dc6924f9271f31539c01f3 Mon Sep 17 00:00:00 2001 From: shima004 Date: Fri, 11 Apr 2025 19:11:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E3=83=91=E3=82=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cli/template/config/module.yaml | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/adf_core_python/cli/template/config/module.yaml b/adf_core_python/cli/template/config/module.yaml index efec4c6..4ee5b0d 100644 --- a/adf_core_python/cli/template/config/module.yaml +++ b/adf_core_python/cli/template/config/module.yaml @@ -3,45 +3,45 @@ DefaultTacticsAmbulanceTeam: Search: src.team_name.module.complex.sample_search.SampleSearch ExtendActionTransport: adf_core_python.implement.action.default_extend_action_transport.DefaultExtendActionTransport ExtendActionMove: adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove - CommandExecutorAmbulance: adf_core_python.implement.centralized.DefaultCommandExecutorAmbulance - CommandExecutorScout: adf_core_python.implement.centralized.DefaultCommandExecutorScout + CommandExecutorAmbulance: adf_core_python.implement.centralized.default_command_executor_ambulance.DefaultCommandExecutorAmbulance + CommandExecutorScout: adf_core_python.implement.centralized.default_command_executor_scout.DefaultCommandExecutorScout DefaultTacticsFireBrigade: HumanDetector: src.team_name.module.complex.sample_human_detector.SampleHumanDetector Search: src.team_name.module.complex.sample_search.SampleSearch ExtendActionRescue: adf_core_python.implement.action.default_extend_action_rescue.DefaultExtendActionRescue ExtendActionMove: adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove - CommandExecutorFire: adf_core_python.implement.centralized.DefaultCommandExecutorFire - CommandExecutorScout: adf_core_python.implement.centralized.DefaultCommandExecutorScout + CommandExecutorFire: adf_core_python.implement.centralized.default_command_executor_fire.DefaultCommandExecutorFire + CommandExecutorScout: adf_core_python.implement.centralized.default_command_executor_scout.DefaultCommandExecutorScout DefaultTacticsPoliceForce: RoadDetector: src.team_name.module.complex.sample_road_detector.SampleRoadDetector Search: src.team_name.module.complex.sample_search.SampleSearch ExtendActionClear: adf_core_python.implement.action.default_extend_action_clear.DefaultExtendActionClear ExtendActionMove: adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove - CommandExecutorPolice: adf_core_python.implement.centralized.DefaultCommandExecutorPolice - CommandExecutorScout: adf_core_python.implement.centralized.DefaultCommandExecutorScoutPolice + CommandExecutorPolice: adf_core_python.implement.centralized.default_command_executor_police.DefaultCommandExecutorPolice + CommandExecutorScout: adf_core_python.implement.centralized.default_command_executor_scout.DefaultCommandExecutorScout DefaultTacticsAmbulanceCenter: TargetAllocator: adf_core_python.implement.module.complex.default_ambulance_target_allocator.DefaultAmbulanceTargetAllocator - # CommandPicker: adf_core_python.implement.centralized.DefaultCommandPickerAmbulance + CommandPicker: adf_core_python.implement.centralized.default_command_picker_ambulance.DefaultCommandPickerAmbulance DefaultTacticsFireStation: TargetAllocator: adf_core_python.implement.module.complex.default_fire_target_allocator.DefaultFireTargetAllocator - # CommandPicker: adf_core_python.implement.centralized.DefaultCommandPickerFire + CommandPicker: adf_core_python.implement.centralized.default_command_picker_fire.DefaultCommandPickerFire DefaultTacticsPoliceOffice: TargetAllocator: adf_core_python.implement.module.complex.default_police_target_allocator.DefaultPoliceTargetAllocator - # CommandPicker: adf_core_python.implement.centralized.DefaultCommandPickerPolice + CommandPicker: adf_core_python.implement.centralized.default_command_picker_police.DefaultCommandPickerPolice -SampleSearch: +DefaultSearch: PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning Clustering: adf_core_python.implement.module.algorithm.k_means_clustering.KMeansClustering -SampleRoadDetector: +DefaultRoadDetector: PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -SampleHumanDetector: +DefaultHumanDetector: Clustering: adf_core_python.implement.module.algorithm.k_means_clustering.KMeansClustering DefaultExtendActionClear: @@ -56,28 +56,27 @@ DefaultExtendActionMove: DefaultExtendActionTransport: PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -# DefaultCommandExecutorAmbulance: -# PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -# ExtendActionTransport: adf_core_python.implement.action.DefaultExtendActionTransport -# ExtendActionMove: adf_core_python.implement.action.DefaultExtendActionMove +DefaultCommandExecutorAmbulance: + PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning + ExtendActionTransport: adf_core_python.implement.action.default_extend_action_transport.DefaultExtendActionTransport + ExtendActionMove: adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove -# DefaultCommandExecutorFire: -# PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -# EtxActionFireRescue: adf_core_python.implement.action.DefaultExtendActionRescue -# EtxActionFireFighting: adf_core_python.implement.action.DefaultExtendActionFireFighting -# ExtendActionMove: adf_core_python.implement.action.DefaultExtendActionMove +DefaultCommandExecutorFire: + PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning + ExtendActionFireRescue: adf_core_python.implement.action.default_extend_action_rescue.DefaultExtendActionRescue + ExtendActionMove: adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove -# DefaultCommandExecutorPolice: -# PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -# ExtendActionClear: adf_core_python.implement.action.DefaultExtendActionClear -# ExtendActionMove: adf_core_python.implement.action.DefaultExtendActionMove +DefaultCommandExecutorPolice: + PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning + ExtendActionClear: adf_core_python.implement.action.default_extend_action_clear.DefaultExtendActionClear + ExtendActionMove: adf_core_python.implement.action.default_extend_action_move.DefaultExtendActionMove -# DefaultCommandExecutorScout: -# PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning +DefaultCommandExecutorScout: + PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -# DefaultCommandExecutorScoutPolice: -# PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -# ExtendActionClear: adf_core_python.implement.action.DefaultExtendActionClear +DefaultCommandExecutorScoutPolice: + PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning + ExtendActionClear: adf_core_python.implement.action.default_extend_action_clear.DefaultExtendActionClear MessageManager: PlatoonChannelSubscriber: adf_core_python.implement.module.communication.default_channel_subscriber.DefaultChannelSubscriber From 13060ae9d8568405ad31ed9fa4cb4d3b72057983 Mon Sep 17 00:00:00 2001 From: shima004 Date: Fri, 11 Apr 2025 19:15:22 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E3=83=87=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=AB=E3=83=88=E8=A8=AD=E5=AE=9A=E3=82=92=E3=82=B5=E3=83=B3?= =?UTF-8?q?=E3=83=97=E3=83=AB=E8=A8=AD=E5=AE=9A=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adf_core_python/cli/template/config/module.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adf_core_python/cli/template/config/module.yaml b/adf_core_python/cli/template/config/module.yaml index 4ee5b0d..0079ab9 100644 --- a/adf_core_python/cli/template/config/module.yaml +++ b/adf_core_python/cli/template/config/module.yaml @@ -34,14 +34,14 @@ DefaultTacticsPoliceOffice: TargetAllocator: adf_core_python.implement.module.complex.default_police_target_allocator.DefaultPoliceTargetAllocator CommandPicker: adf_core_python.implement.centralized.default_command_picker_police.DefaultCommandPickerPolice -DefaultSearch: +SampleSearch: PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning Clustering: adf_core_python.implement.module.algorithm.k_means_clustering.KMeansClustering -DefaultRoadDetector: +SampleRoadDetector: PathPlanning: adf_core_python.implement.module.algorithm.a_star_path_planning.AStarPathPlanning -DefaultHumanDetector: +SampleHumanDetector: Clustering: adf_core_python.implement.module.algorithm.k_means_clustering.KMeansClustering DefaultExtendActionClear: From d34de0b6bea89533c0c20ebb9cde7b8da4ef31c1 Mon Sep 17 00:00:00 2001 From: shima004 Date: Fri, 11 Apr 2025 19:18:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=920.1.2=E3=81=AB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3f3522a..9ae40d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "adf_core_python" -version = "0.1.1" +version = "0.1.2" description = "Agent Development Framework for Python" authors = [ "Haruki Uehara ",