From 4378dbe2492abb1db30d27a1aeffd0267cf9669e Mon Sep 17 00:00:00 2001 From: yamacir-kit Date: Tue, 24 Dec 2024 17:37:32 +0900 Subject: [PATCH] Remove member function `FieldOperatorApplication::getAutowareStateName` Signed-off-by: yamacir-kit --- .../include/concealer/field_operator_application.hpp | 4 +--- simulation/traffic_simulator/src/entity/ego_entity.cpp | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/external/concealer/include/concealer/field_operator_application.hpp b/external/concealer/include/concealer/field_operator_application.hpp index 2e24fd77d26..ade08bd64d0 100644 --- a/external/concealer/include/concealer/field_operator_application.hpp +++ b/external/concealer/include/concealer/field_operator_application.hpp @@ -78,7 +78,7 @@ struct FieldOperatorApplication : public rclcpp::Node, bool initialize_was_called = false; - std::string autoware_state; + std::string autoware_state = "LAUNCHING"; std::string minimum_risk_maneuver_state; @@ -151,8 +151,6 @@ struct FieldOperatorApplication : public rclcpp::Node, auto clearRoute() -> void; - auto getAutowareStateName() const { return autoware_state; } - auto getMinimumRiskManeuverBehaviorName() const { return minimum_risk_maneuver_behavior; } auto getMinimumRiskManeuverStateName() const { return minimum_risk_maneuver_state; } diff --git a/simulation/traffic_simulator/src/entity/ego_entity.cpp b/simulation/traffic_simulator/src/entity/ego_entity.cpp index b4f2dc1c447..ca174980300 100644 --- a/simulation/traffic_simulator/src/entity/ego_entity.cpp +++ b/simulation/traffic_simulator/src/entity/ego_entity.cpp @@ -79,8 +79,7 @@ auto EgoEntity::asFieldOperatorApplication() -> concealer::FieldOperatorApplicat auto EgoEntity::getCurrentAction() const -> std::string { - const auto state = getAutowareStateName(); - return state.empty() ? "Launching" : state; + return autoware_state; } auto EgoEntity::getBehaviorParameter() const -> traffic_simulator_msgs::msg::BehaviorParameter