Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
6ac95f42
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6ac95f42
编写于
11月 08, 2018
作者:
J
jmtao
提交者:
Jiangtao Hu
12月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
planning: update namespace for scenario of stop_sign and traffic_light
上级
1e76fecd
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
46 addition
and
49 deletion
+46
-49
modules/planning/scenarios/scenario_manager.cc
modules/planning/scenarios/scenario_manager.cc
+4
-7
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_creep.cc
...sign/stop_sign_unprotected/stop_sign_unprotected_creep.cc
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_creep.h
..._sign/stop_sign_unprotected/stop_sign_unprotected_creep.h
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_intersection_cruise.cc
..._unprotected/stop_sign_unprotected_intersection_cruise.cc
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_intersection_cruise.h
...n_unprotected/stop_sign_unprotected_intersection_cruise.h
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_pre_stop.cc
...n/stop_sign_unprotected/stop_sign_unprotected_pre_stop.cc
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_pre_stop.h
...gn/stop_sign_unprotected/stop_sign_unprotected_pre_stop.h
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_scenario.cc
...n/stop_sign_unprotected/stop_sign_unprotected_scenario.cc
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_scenario.h
...gn/stop_sign_unprotected/stop_sign_unprotected_scenario.h
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_scenario_test.cc
...p_sign_unprotected/stop_sign_unprotected_scenario_test.cc
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_stop.cc
..._sign/stop_sign_unprotected/stop_sign_unprotected_stop.cc
+2
-2
modules/planning/scenarios/stop_sign/stop_sign_unprotected/stop_sign_unprotected_stop.h
...p_sign/stop_sign_unprotected/stop_sign_unprotected_stop.h
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_creep.cc
...unprotected/traffic_light_right_turn_unprotected_creep.cc
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_creep.h
..._unprotected/traffic_light_right_turn_unprotected_creep.h
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_intersection_cruise.cc
...affic_light_right_turn_unprotected_intersection_cruise.cc
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_intersection_cruise.h
...raffic_light_right_turn_unprotected_intersection_cruise.h
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_pre_stop.cc
...rotected/traffic_light_right_turn_unprotected_pre_stop.cc
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_pre_stop.h
...protected/traffic_light_right_turn_unprotected_pre_stop.h
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_scenario.cc
...rotected/traffic_light_right_turn_unprotected_scenario.cc
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_scenario.h
...protected/traffic_light_right_turn_unprotected_scenario.h
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_stop.cc
..._unprotected/traffic_light_right_turn_unprotected_stop.cc
+2
-2
modules/planning/scenarios/traffic_light/right_turn_unprotected/traffic_light_right_turn_unprotected_stop.h
...n_unprotected/traffic_light_right_turn_unprotected_stop.h
+2
-2
未找到文件。
modules/planning/scenarios/scenario_manager.cc
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
浏览文件 @
6ac95f42
...
...
@@ -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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录