planning: naming changes for traffic-light-protected-right-turn scenario

modules/planning/scenarios/scenario_manager.cc

@@ -68,7 +68,7 @@ std::unique_ptr<Scenario> ScenarioManager::CreateScenario(
       break;
     case ScenarioConfig::TRAFFIC_LIGHT_UNPROTECTED_RIGHT_TURN:
       ptr.reset(
-          new scenario::traffic_light::TrafficLightRightTurnUnprotectedScenario(
+          new scenario::traffic_light::TrafficLightUnprotectedRightTurnScenario(
               config_map_[scenario_type], &scenario_context_));
       break;
     default:

modules/planning/scenarios/traffic_light/unprotected_right_turn/stage_creep.h

@@ -30,7 +30,7 @@ namespace planning {
 namespace scenario {
 namespace traffic_light {
 
-struct TrafficLightRightTurnUnprotectedContext;
+struct TrafficLightUnprotectedRightTurnContext;
 
 class StageCreep : public Stage {
  public:
@@ -41,8 +41,8 @@ class StageCreep : public Stage {
   Stage::StageStatus Process(const common::TrajectoryPoint& planning_init_point,
                              Frame* frame) override;
 
-  TrafficLightRightTurnUnprotectedContext* GetContext() {
-    return Stage::GetContextAs<TrafficLightRightTurnUnprotectedContext>();
+  TrafficLightUnprotectedRightTurnContext* GetContext() {
+    return Stage::GetContextAs<TrafficLightUnprotectedRightTurnContext>();
   }
 
  private:

modules/planning/scenarios/traffic_light/unprotected_right_turn/stage_intersection_cruise.h

@@ -30,7 +30,7 @@ namespace planning {
 namespace scenario {
 namespace traffic_light {
 
-struct TrafficLightRightTurnUnprotectedContext;
+struct TrafficLightUnprotectedRightTurnContext;
 
 class StageIntersectionCruise : public Stage {
  public:
@@ -41,8 +41,8 @@ class StageIntersectionCruise : public Stage {
   Stage::StageStatus Process(const common::TrajectoryPoint& planning_init_point,
                              Frame* frame) override;
 
-  TrafficLightRightTurnUnprotectedContext* GetContext() {
-    return GetContextAs<TrafficLightRightTurnUnprotectedContext>();
+  TrafficLightUnprotectedRightTurnContext* GetContext() {
+    return GetContextAs<TrafficLightUnprotectedRightTurnContext>();
   }
 
  private:

modules/planning/scenarios/traffic_light/unprotected_right_turn/stage_stop.h

@@ -32,7 +32,7 @@ namespace planning {
 namespace scenario {
 namespace traffic_light {
 
-struct TrafficLightRightTurnUnprotectedContext;
+struct TrafficLightUnprotectedRightTurnContext;
 
 class StageStop : public Stage {
  public:
@@ -43,8 +43,8 @@ class StageStop : public Stage {
   Stage::StageStatus Process(
       const common::TrajectoryPoint& planning_init_point,
       Frame* frame) override;
-  TrafficLightRightTurnUnprotectedContext* GetContext() {
-    return GetContextAs<TrafficLightRightTurnUnprotectedContext>();
+  TrafficLightUnprotectedRightTurnContext* GetContext() {
+    return GetContextAs<TrafficLightUnprotectedRightTurnContext>();
   }
 
  private:

modules/planning/scenarios/traffic_light/unprotected_right_turn/traffic_light_unprotected_right_turn_scenario.cc

@@ -41,7 +41,7 @@ namespace traffic_light {
 using hdmap::HDMapUtil;
 using perception::TrafficLight;
 
-void TrafficLightRightTurnUnprotectedScenario::Init() {
+void TrafficLightUnprotectedRightTurnScenario::Init() {
   if (init_) {
     return;
   }
@@ -73,9 +73,9 @@ void TrafficLightRightTurnUnprotectedScenario::Init() {
 apollo::common::util::Factory<
     ScenarioConfig::StageType, Stage,
     Stage* (*)(const ScenarioConfig::StageConfig& stage_config)>
-    TrafficLightRightTurnUnprotectedScenario::s_stage_factory_;
+    TrafficLightUnprotectedRightTurnScenario::s_stage_factory_;
 
-void TrafficLightRightTurnUnprotectedScenario::RegisterStages() {
+void TrafficLightUnprotectedRightTurnScenario::RegisterStages() {
   if (!s_stage_factory_.Empty()) {
     s_stage_factory_.Clear();
   }
@@ -96,7 +96,7 @@ void TrafficLightRightTurnUnprotectedScenario::RegisterStages() {
       });
 }
 
-std::unique_ptr<Stage> TrafficLightRightTurnUnprotectedScenario::CreateStage(
+std::unique_ptr<Stage> TrafficLightUnprotectedRightTurnScenario::CreateStage(
     const ScenarioConfig::StageConfig& stage_config) {
   if (s_stage_factory_.Empty()) {
     RegisterStages();
@@ -109,7 +109,7 @@ std::unique_ptr<Stage> TrafficLightRightTurnUnprotectedScenario::CreateStage(
   return ptr;
 }
 
-bool TrafficLightRightTurnUnprotectedScenario::IsTransferable(
+bool TrafficLightUnprotectedRightTurnScenario::IsTransferable(
     const Scenario& current_scenario,
     const common::TrajectoryPoint& ego_point,
     const Frame& frame) {
@@ -167,7 +167,7 @@ bool TrafficLightRightTurnUnprotectedScenario::IsTransferable(
 /*
  * read scenario specific configs and set in context_ for stages to read
  */
-bool TrafficLightRightTurnUnprotectedScenario::GetScenarioConfig() {
+bool TrafficLightUnprotectedRightTurnScenario::GetScenarioConfig() {
   if (!config_.has_traffic_light_unprotected_right_turn_config()) {
     AERROR << "miss scenario specific config";
     return false;

modules/planning/scenarios/traffic_light/unprotected_right_turn/traffic_light_unprotected_right_turn_scenario.h

@@ -35,16 +35,16 @@ namespace scenario {
 namespace traffic_light {
 
 // stage context
-struct TrafficLightRightTurnUnprotectedContext {
+struct TrafficLightUnprotectedRightTurnContext {
   ScenarioTrafficLightUnprotectedRightTurnConfig scenario_config;
   std::string traffic_light_id;
   double stop_start_time = 0.0;
   double creep_start_time;
 };
 
-class TrafficLightRightTurnUnprotectedScenario : public Scenario {
+class TrafficLightUnprotectedRightTurnScenario : public Scenario {
  public:
-  explicit TrafficLightRightTurnUnprotectedScenario(
+  explicit TrafficLightUnprotectedRightTurnScenario(
       const ScenarioConfig& config,
       const ScenarioContext* context) : Scenario(config, context) {}
 
@@ -57,7 +57,7 @@ class TrafficLightRightTurnUnprotectedScenario : public Scenario {
                       const common::TrajectoryPoint& ego_point,
                       const Frame& frame) override;
 
-  TrafficLightRightTurnUnprotectedContext* GetContext() { return &context_; }
+  TrafficLightUnprotectedRightTurnContext* GetContext() { return &context_; }
 
  private:
   static void RegisterStages();
@@ -65,7 +65,7 @@ class TrafficLightRightTurnUnprotectedScenario : public Scenario {
 
  private:
   bool init_ = false;
-  TrafficLightRightTurnUnprotectedContext context_;
+  TrafficLightUnprotectedRightTurnContext context_;
 
   hdmap::SignalInfoConstPtr traffic_light_ = nullptr;
 

modules/planning/scenarios/traffic_light/unprotected_right_turn/traffic_light_unprotected_right_turn_scenario_test.cc

@@ -33,15 +33,15 @@ namespace planning {
 namespace scenario {
 namespace traffic_light {
 
-class TrafficLightRightTurnUnprotectedScenarioTest : public ::testing::Test {
+class TrafficLightUnprotectedRightTurnScenarioTest : public ::testing::Test {
  public:
   virtual void SetUp() {}
 
  protected:
-  std::unique_ptr<TrafficLightRightTurnUnprotectedScenario> scenario_;
+  std::unique_ptr<TrafficLightUnprotectedRightTurnScenario> scenario_;
 };
 
-TEST_F(TrafficLightRightTurnUnprotectedScenarioTest, VerifyConf) {
+TEST_F(TrafficLightUnprotectedRightTurnScenarioTest, VerifyConf) {
   FLAGS_scenario_traffic_light_unprotected_right_turn_config_file =
       "/apollo/modules/planning/conf/"
       "scenario/traffic_light_unprotected_right_turn_config.pb.txt";
@@ -52,7 +52,7 @@ TEST_F(TrafficLightRightTurnUnprotectedScenarioTest, VerifyConf) {
       &config));
 }
 
-TEST_F(TrafficLightRightTurnUnprotectedScenarioTest, Init) {
+TEST_F(TrafficLightUnprotectedRightTurnScenarioTest, Init) {
   FLAGS_scenario_traffic_light_unprotected_right_turn_config_file =
       "/apollo/modules/planning/testdata/conf/"
       "scenario/traffic_light_unprotected_right_turn_config.pb.txt";
@@ -63,7 +63,7 @@ TEST_F(TrafficLightRightTurnUnprotectedScenarioTest, Init) {
       &config));
 
   ScenarioContext context;
-  scenario_.reset(new TrafficLightRightTurnUnprotectedScenario(config,
+  scenario_.reset(new TrafficLightUnprotectedRightTurnScenario(config,
                                                                &context));
   EXPECT_EQ(scenario_->scenario_type(),
             ScenarioConfig::TRAFFIC_LIGHT_UNPROTECTED_RIGHT_TURN);