planning: update namespace for scenario of stop_sign and traffic_light

modules/planning/scenarios/scenario_manager.cc

@@ -33,9 +33,6 @@ namespace planning {
 namespace scenario {
 
 using apollo::hdmap::PathOverlap;
-using stop_sign_unprotected::StopSignUnprotectedScenario;
-using traffic_light_right_turn_unprotected::
-    TrafficLightRightTurnUnprotectedScenario;
 
 bool ScenarioManager::Init(
     const std::set<ScenarioConfig::ScenarioType>& supported_scenarios) {
@@ -61,13 +58,13 @@ std::unique_ptr<Scenario> ScenarioManager::CreateScenario(
       break;
     case ScenarioConfig::STOP_SIGN_UNPROTECTED:
       ptr.reset(
-          new StopSignUnprotectedScenario(
+          new scenario::stop_sign::StopSignUnprotectedScenario(
               config_map_[scenario_type], &scenario_context_));
       break;
     case ScenarioConfig::TRAFFIC_LIGHT_RIGHT_TURN_UNPROTECTED:
-      ptr.reset(
-          new TrafficLightRightTurnUnprotectedScenario(
-              config_map_[scenario_type], &scenario_context_));
+      ptr.reset(new scenario::traffic_light::
+                TrafficLightRightTurnUnprotectedScenario(
+                    config_map_[scenario_type], &scenario_context_));
       break;
     default:
       return nullptr;

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_creep.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 using common::TrajectoryPoint;
 
@@ -71,7 +71,7 @@ Stage::StageStatus StopSignUnprotectedCreep::Process(
   return Stage::RUNNING;
 }
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_creep.h

@@ -32,7 +32,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 struct StopSignUnprotectedContext;
 
@@ -50,7 +50,7 @@ class StopSignUnprotectedCreep : public Stage {
   }
 };
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_intersection_cruise.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 using common::TrajectoryPoint;
 
@@ -58,7 +58,7 @@ Stage::StageStatus StopSignUnprotectedIntersectionCruise::Process(
   return Stage::RUNNING;
 }
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_intersection_cruise.h

@@ -32,14 +32,14 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 struct StopSignUnprotectedContext;
 
 DECLARE_STAGE(StopSignUnprotectedIntersectionCruise,
               StopSignUnprotectedContext);
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_pre_stop.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 using common::TrajectoryPoint;
 using common::time::Clock;
@@ -208,7 +208,7 @@ bool StopSignUnprotectedPreStop::CheckADCStop(
   return true;
 }
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_pre_stop.h

@@ -32,7 +32,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 struct StopSignUnprotectedContext;
 
@@ -58,7 +58,7 @@ class StopSignUnprotectedPreStop : public Stage {
   ScenarioStopSignUnprotectedConfig scenario_config_;
 };
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_scenario.cc

@@ -39,7 +39,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 using common::TrajectoryPoint;
 using common::time::Clock;
@@ -220,7 +220,7 @@ int StopSignUnprotectedScenario::GetAssociatedLanes(
   return 0;
 }
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_scenario.h

@@ -35,7 +35,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 // stage context
 struct StopSignUnprotectedContext {
@@ -81,7 +81,7 @@ class StopSignUnprotectedScenario : public Scenario {
       s_stage_factory_;
 };
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_scenario_test.cc

@@ -33,7 +33,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 class StopSignUnprotectedScenarioTest : public ::testing::Test {
  public:
@@ -67,7 +67,7 @@ TEST_F(StopSignUnprotectedScenarioTest, Init) {
   EXPECT_EQ(scenario_->scenario_type(), ScenarioConfig::STOP_SIGN_UNPROTECTED);
 }
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_stop.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 using common::TrajectoryPoint;
 using common::time::Clock;
@@ -213,7 +213,7 @@ int StopSignUnprotectedStop::RemoveWatchVehicle(
   return 0;
 }
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_stop.h

@@ -32,7 +32,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace stop_sign_unprotected {
+namespace stop_sign {
 
 struct StopSignUnprotectedContext;
 
@@ -57,7 +57,7 @@ class StopSignUnprotectedStop : public Stage {
   ScenarioStopSignUnprotectedConfig scenario_config_;
 };
 
-}  // namespace stop_sign_unprotected
+}  // namespace stop_sign
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_creep.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 using common::TrajectoryPoint;
 
@@ -71,7 +71,7 @@ Stage::StageStatus TrafficLightRightTurnUnprotectedCreep::Process(
   return Stage::RUNNING;
 }
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_creep.h

@@ -32,7 +32,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 struct TrafficLightRightTurnUnprotectedContext;
 
@@ -50,7 +50,7 @@ class TrafficLightRightTurnUnprotectedCreep : public Stage {
   }
 };
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_intersection_cruise.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 using common::TrajectoryPoint;
 
@@ -59,7 +59,7 @@ Stage::StageStatus TrafficLightRightTurnUnprotectedIntersectionCruise::Process(
   return Stage::RUNNING;
 }
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_intersection_cruise.h

@@ -32,14 +32,14 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 struct TrafficLightRightTurnUnprotectedContext;
 
 DECLARE_STAGE(TrafficLightRightTurnUnprotectedIntersectionCruise,
               TrafficLightRightTurnUnprotectedContext);
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_pre_stop.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 using common::TrajectoryPoint;
 using common::time::Clock;
@@ -100,7 +100,7 @@ bool TrafficLightRightTurnUnprotectedPreStop::CheckADCStop(
   return true;
 }
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_pre_stop.h

@@ -32,7 +32,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 struct TrafficLightRightTurnUnprotectedContext;
 
@@ -56,7 +56,7 @@ class TrafficLightRightTurnUnprotectedPreStop : public Stage {
   ScenarioTrafficLightRightTurnUnprotectedConfig scenario_config_;
 };
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_scenario.cc

@@ -39,7 +39,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 using common::TrajectoryPoint;
 using common::time::Clock;
@@ -181,7 +181,7 @@ bool TrafficLightRightTurnUnprotectedScenario::GetScenarioConfig() {
   return true;
 }
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_scenario.h

@@ -35,7 +35,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 // stage context
 struct TrafficLightRightTurnUnprotectedContext {
@@ -76,7 +76,7 @@ class TrafficLightRightTurnUnprotectedScenario : public Scenario {
       s_stage_factory_;
 };
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_stop.cc

@@ -36,7 +36,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 using common::TrajectoryPoint;
 using common::time::Clock;
@@ -58,7 +58,7 @@ Stage::StageStatus TrafficLightRightTurnUnprotectedStop::Process(
   return Stage::FINISHED;
 }
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo

modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_stop.h

@@ -32,7 +32,7 @@
 namespace apollo {
 namespace planning {
 namespace scenario {
-namespace traffic_light_right_turn_unprotected {
+namespace traffic_light {
 
 struct TrafficLightRightTurnUnprotectedContext;
 
@@ -53,7 +53,7 @@ class TrafficLightRightTurnUnprotectedStop : public Stage {
   ScenarioTrafficLightRightTurnUnprotectedConfig scenario_config_;
 };
 
-}  // namespace traffic_light_right_turn_unprotected
+}  // namespace traffic_light
 }  // namespace scenario
 }  // namespace planning
 }  // namespace apollo