From 3d7810f6e126c34f499bbebf8f6b33d2cddcec55 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 4 Oct 2024 18:28:00 -0700 Subject: [PATCH] Rename `tactic/stop` folder to `tactic/halt`, renaming addresses where necessary --- src/software/ai/hl/stp/play/BUILD | 8 ++++---- src/software/ai/hl/stp/play/enemy_free_kick/BUILD | 2 +- src/software/ai/hl/stp/play/halt_play.cpp | 2 +- .../ai/hl/stp/play/penalty_kick/penalty_kick_play_fsm.h | 2 +- src/software/ai/hl/stp/play/play.cpp | 2 +- src/software/ai/hl/stp/play/shoot_or_chip_play.cpp | 2 +- src/software/ai/hl/stp/play/test_plays/BUILD | 2 +- src/software/ai/hl/stp/play/test_plays/halt_test_play.cpp | 2 +- src/software/ai/hl/stp/stp_tactic_assignment_test.cpp | 2 +- src/software/ai/hl/stp/tactic/BUILD | 2 +- src/software/ai/hl/stp/tactic/all_tactics.h | 2 +- src/software/ai/hl/stp/tactic/{stop => halt}/BUILD | 0 src/software/ai/hl/stp/tactic/{stop => halt}/halt_fsm.cpp | 2 +- src/software/ai/hl/stp/tactic/{stop => halt}/halt_fsm.h | 4 ++-- .../ai/hl/stp/tactic/{stop => halt}/halt_fsm_test.cpp | 2 +- .../ai/hl/stp/tactic/{stop => halt}/halt_tactic.cpp | 2 +- .../ai/hl/stp/tactic/{stop => halt}/halt_tactic.h | 2 +- .../ai/hl/stp/tactic/{stop => halt}/halt_tactic_test.cpp | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) rename src/software/ai/hl/stp/tactic/{stop => halt}/BUILD (100%) rename src/software/ai/hl/stp/tactic/{stop => halt}/halt_fsm.cpp (80%) rename src/software/ai/hl/stp/tactic/{stop => halt}/halt_fsm.h (94%) rename src/software/ai/hl/stp/tactic/{stop => halt}/halt_fsm_test.cpp (96%) rename src/software/ai/hl/stp/tactic/{stop => halt}/halt_tactic.cpp (91%) rename src/software/ai/hl/stp/tactic/{stop => halt}/halt_tactic.h (91%) rename src/software/ai/hl/stp/tactic/{stop => halt}/halt_tactic_test.cpp (97%) diff --git a/src/software/ai/hl/stp/play/BUILD b/src/software/ai/hl/stp/play/BUILD index 202459084e..094bc3eb83 100644 --- a/src/software/ai/hl/stp/play/BUILD +++ b/src/software/ai/hl/stp/play/BUILD @@ -27,7 +27,7 @@ cc_library( deps = [ ":play", "//shared:constants", - "//software/ai/hl/stp/tactic/stop:halt_tactic", + "//software/ai/hl/stp/tactic/halt:halt_tactic", "//software/logger", "//software/util/generic_factory", ], @@ -84,7 +84,7 @@ cc_library( "//software/ai/hl/stp/tactic/goalie:goalie_tactic", "//software/ai/hl/stp/tactic/move:move_tactic", "//software/ai/hl/stp/tactic/shadow_enemy:shadow_enemy_tactic", - "//software/ai/hl/stp/tactic/stop:halt_tactic", + "//software/ai/hl/stp/tactic/halt:halt_tactic", "//software/logger", "//software/util/generic_factory", "//software/world:game_state", @@ -119,7 +119,7 @@ cc_library( deps = [ "//software/ai/hl/stp/tactic", "//software/ai/hl/stp/tactic/goalie:goalie_tactic", - "//software/ai/hl/stp/tactic/stop:halt_tactic", + "//software/ai/hl/stp/tactic/halt:halt_tactic", "//software/ai/motion_constraint:motion_constraint_set_builder", "//software/ai/navigator/trajectory:trajectory_planner", "//software/ai/passing:pass_with_rating", @@ -303,7 +303,7 @@ cc_library( deps = [ ":play", "//shared:constants", - "//software/ai/hl/stp/tactic/stop:halt_tactic", + "//software/ai/hl/stp/tactic/halt:halt_tactic", "//software/logger", "//software/util/generic_factory", ], diff --git a/src/software/ai/hl/stp/play/enemy_free_kick/BUILD b/src/software/ai/hl/stp/play/enemy_free_kick/BUILD index 716c7d3036..15cf532bca 100644 --- a/src/software/ai/hl/stp/play/enemy_free_kick/BUILD +++ b/src/software/ai/hl/stp/play/enemy_free_kick/BUILD @@ -26,7 +26,7 @@ cc_library( "//software/ai/hl/stp/tactic/goalie:goalie_tactic", "//software/ai/hl/stp/tactic/move:move_tactic", "//software/ai/hl/stp/tactic/pass_defender:pass_defender_tactic", - "//software/ai/hl/stp/tactic/stop:halt_tactic", + "//software/ai/hl/stp/tactic/halt:halt_tactic", "//software/logger", "//software/util/generic_factory", "//software/world:game_state", diff --git a/src/software/ai/hl/stp/play/halt_play.cpp b/src/software/ai/hl/stp/play/halt_play.cpp index 2facb6ff53..0aa2e8ad87 100644 --- a/src/software/ai/hl/stp/play/halt_play.cpp +++ b/src/software/ai/hl/stp/play/halt_play.cpp @@ -1,6 +1,6 @@ #include "software/ai/hl/stp/play/halt_play.h" -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include "software/util/generic_factory/generic_factory.h" HaltPlay::HaltPlay(TbotsProto::AiConfig config) : Play(config, false) {} diff --git a/src/software/ai/hl/stp/play/penalty_kick/penalty_kick_play_fsm.h b/src/software/ai/hl/stp/play/penalty_kick/penalty_kick_play_fsm.h index ae18c2ef51..b7a21546eb 100644 --- a/src/software/ai/hl/stp/play/penalty_kick/penalty_kick_play_fsm.h +++ b/src/software/ai/hl/stp/play/penalty_kick/penalty_kick_play_fsm.h @@ -5,7 +5,7 @@ #include "software/ai/hl/stp/play/play_fsm.h" #include "software/ai/hl/stp/tactic/move/move_tactic.h" #include "software/ai/hl/stp/tactic/penalty_kick/penalty_kick_tactic.h" -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include "software/logger/logger.h" diff --git a/src/software/ai/hl/stp/play/play.cpp b/src/software/ai/hl/stp/play/play.cpp index 82a3c66af3..0150e313c6 100644 --- a/src/software/ai/hl/stp/play/play.cpp +++ b/src/software/ai/hl/stp/play/play.cpp @@ -5,7 +5,7 @@ #include #include "proto/message_translation/tbots_protobuf.h" -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include "software/ai/motion_constraint/motion_constraint_set_builder.h" #include "software/logger/logger.h" diff --git a/src/software/ai/hl/stp/play/shoot_or_chip_play.cpp b/src/software/ai/hl/stp/play/shoot_or_chip_play.cpp index a36c88c75f..f3a17c65cb 100644 --- a/src/software/ai/hl/stp/play/shoot_or_chip_play.cpp +++ b/src/software/ai/hl/stp/play/shoot_or_chip_play.cpp @@ -9,7 +9,7 @@ #include "software/ai/hl/stp/tactic/crease_defender/crease_defender_tactic.h" #include "software/ai/hl/stp/tactic/move/move_tactic.h" #include "software/ai/hl/stp/tactic/shadow_enemy/shadow_enemy_tactic.h" -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include "software/logger/logger.h" #include "software/util/generic_factory/generic_factory.h" #include "software/world/game_state.h" diff --git a/src/software/ai/hl/stp/play/test_plays/BUILD b/src/software/ai/hl/stp/play/test_plays/BUILD index aa24703cce..bc08c72b17 100644 --- a/src/software/ai/hl/stp/play/test_plays/BUILD +++ b/src/software/ai/hl/stp/play/test_plays/BUILD @@ -6,7 +6,7 @@ cc_library( hdrs = ["halt_test_play.h"], deps = [ "//software/ai/hl/stp/play", - "//software/ai/hl/stp/tactic/stop:halt_tactic", + "//software/ai/hl/stp/tactic/halt:halt_tactic", "//software/util/generic_factory", ], alwayslink = True, diff --git a/src/software/ai/hl/stp/play/test_plays/halt_test_play.cpp b/src/software/ai/hl/stp/play/test_plays/halt_test_play.cpp index a7f83c13e7..95b84e9af0 100644 --- a/src/software/ai/hl/stp/play/test_plays/halt_test_play.cpp +++ b/src/software/ai/hl/stp/play/test_plays/halt_test_play.cpp @@ -1,6 +1,6 @@ #include "software/ai/hl/stp/play/test_plays/halt_test_play.h" -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include "software/geom/algorithms/contains.h" #include "software/util/generic_factory/generic_factory.h" diff --git a/src/software/ai/hl/stp/stp_tactic_assignment_test.cpp b/src/software/ai/hl/stp/stp_tactic_assignment_test.cpp index 3957f15a21..78a5cce5b0 100644 --- a/src/software/ai/hl/stp/stp_tactic_assignment_test.cpp +++ b/src/software/ai/hl/stp/stp_tactic_assignment_test.cpp @@ -6,7 +6,7 @@ #include "software/ai/hl/stp/play/halt_play.h" #include "software/ai/hl/stp/stp.h" #include "software/ai/hl/stp/tactic/all_tactics.h" -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include "software/test_util/test_util.h" /** diff --git a/src/software/ai/hl/stp/tactic/BUILD b/src/software/ai/hl/stp/tactic/BUILD index dc9c8a7e3d..76961d6d90 100644 --- a/src/software/ai/hl/stp/tactic/BUILD +++ b/src/software/ai/hl/stp/tactic/BUILD @@ -28,7 +28,7 @@ cc_library( "//software/ai/hl/stp/tactic/pivot_kick:pivot_kick_tactic", "//software/ai/hl/stp/tactic/receiver:receiver_tactic", "//software/ai/hl/stp/tactic/shadow_enemy:shadow_enemy_tactic", - "//software/ai/hl/stp/tactic/stop:halt_tactic", + "//software/ai/hl/stp/tactic/halt:halt_tactic", ], ) diff --git a/src/software/ai/hl/stp/tactic/all_tactics.h b/src/software/ai/hl/stp/tactic/all_tactics.h index 960ef5633e..286e6f71f8 100644 --- a/src/software/ai/hl/stp/tactic/all_tactics.h +++ b/src/software/ai/hl/stp/tactic/all_tactics.h @@ -13,5 +13,5 @@ #include "software/ai/hl/stp/tactic/pivot_kick/pivot_kick_tactic.h" #include "software/ai/hl/stp/tactic/receiver/receiver_tactic.h" #include "software/ai/hl/stp/tactic/shadow_enemy/shadow_enemy_tactic.h" -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include "software/ai/hl/stp/tactic/tactic.h" diff --git a/src/software/ai/hl/stp/tactic/stop/BUILD b/src/software/ai/hl/stp/tactic/halt/BUILD similarity index 100% rename from src/software/ai/hl/stp/tactic/stop/BUILD rename to src/software/ai/hl/stp/tactic/halt/BUILD diff --git a/src/software/ai/hl/stp/tactic/stop/halt_fsm.cpp b/src/software/ai/hl/stp/tactic/halt/halt_fsm.cpp similarity index 80% rename from src/software/ai/hl/stp/tactic/stop/halt_fsm.cpp rename to src/software/ai/hl/stp/tactic/halt/halt_fsm.cpp index a874a305c5..c8ca316eb3 100644 --- a/src/software/ai/hl/stp/tactic/stop/halt_fsm.cpp +++ b/src/software/ai/hl/stp/tactic/halt/halt_fsm.cpp @@ -1,4 +1,4 @@ -#include "software/ai/hl/stp/tactic/stop/halt_fsm.h" +#include "software/ai/hl/stp/tactic/halt/halt_fsm.h" void HaltFSM::updateStop(const Update& event) { diff --git a/src/software/ai/hl/stp/tactic/stop/halt_fsm.h b/src/software/ai/hl/stp/tactic/halt/halt_fsm.h similarity index 94% rename from src/software/ai/hl/stp/tactic/stop/halt_fsm.h rename to src/software/ai/hl/stp/tactic/halt/halt_fsm.h index 7ed1ec2df0..dae78c1112 100644 --- a/src/software/ai/hl/stp/tactic/stop/halt_fsm.h +++ b/src/software/ai/hl/stp/tactic/halt/halt_fsm.h @@ -26,11 +26,11 @@ struct HaltFSM void updateStop(const Update& event); /** - * Guard if the stop is done + * Guard if the halt is done * * @param event HaltFSM::Update * - * @return if the robot has stopped + * @return if the robot has halted */ bool stopDone(const Update& event); diff --git a/src/software/ai/hl/stp/tactic/stop/halt_fsm_test.cpp b/src/software/ai/hl/stp/tactic/halt/halt_fsm_test.cpp similarity index 96% rename from src/software/ai/hl/stp/tactic/stop/halt_fsm_test.cpp rename to src/software/ai/hl/stp/tactic/halt/halt_fsm_test.cpp index 3d6d381294..849ac30428 100644 --- a/src/software/ai/hl/stp/tactic/stop/halt_fsm_test.cpp +++ b/src/software/ai/hl/stp/tactic/halt/halt_fsm_test.cpp @@ -1,4 +1,4 @@ -#include "software/ai/hl/stp/tactic/stop/halt_fsm.h" +#include "software/ai/hl/stp/tactic/halt/halt_fsm.h" #include diff --git a/src/software/ai/hl/stp/tactic/stop/halt_tactic.cpp b/src/software/ai/hl/stp/tactic/halt/halt_tactic.cpp similarity index 91% rename from src/software/ai/hl/stp/tactic/stop/halt_tactic.cpp rename to src/software/ai/hl/stp/tactic/halt/halt_tactic.cpp index 7623d48c5b..49e6e1fe01 100644 --- a/src/software/ai/hl/stp/tactic/stop/halt_tactic.cpp +++ b/src/software/ai/hl/stp/tactic/halt/halt_tactic.cpp @@ -1,4 +1,4 @@ -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include diff --git a/src/software/ai/hl/stp/tactic/stop/halt_tactic.h b/src/software/ai/hl/stp/tactic/halt/halt_tactic.h similarity index 91% rename from src/software/ai/hl/stp/tactic/stop/halt_tactic.h rename to src/software/ai/hl/stp/tactic/halt/halt_tactic.h index d504a30cf2..39bce73916 100644 --- a/src/software/ai/hl/stp/tactic/stop/halt_tactic.h +++ b/src/software/ai/hl/stp/tactic/halt/halt_tactic.h @@ -1,6 +1,6 @@ #pragma once -#include "software/ai/hl/stp/tactic/stop/halt_fsm.h" +#include "software/ai/hl/stp/tactic/halt/halt_fsm.h" #include "software/ai/hl/stp/tactic/tactic.h" /** diff --git a/src/software/ai/hl/stp/tactic/stop/halt_tactic_test.cpp b/src/software/ai/hl/stp/tactic/halt/halt_tactic_test.cpp similarity index 97% rename from src/software/ai/hl/stp/tactic/stop/halt_tactic_test.cpp rename to src/software/ai/hl/stp/tactic/halt/halt_tactic_test.cpp index d6f44c9bb3..e2867bae07 100644 --- a/src/software/ai/hl/stp/tactic/stop/halt_tactic_test.cpp +++ b/src/software/ai/hl/stp/tactic/halt/halt_tactic_test.cpp @@ -1,4 +1,4 @@ -#include "software/ai/hl/stp/tactic/stop/halt_tactic.h" +#include "software/ai/hl/stp/tactic/halt/halt_tactic.h" #include