Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
d69038da
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,体验更适合开发者的 AI 搜索 >>
提交
d69038da
编写于
7月 23, 2019
作者:
J
jmtao
提交者:
sjiang2018
7月 23, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
planning: add ParkAndGo to ScenarioManager registration
上级
0ee2e29d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
32 addition
and
29 deletion
+32
-29
modules/planning/common/planning_gflags.cc
modules/planning/common/planning_gflags.cc
+7
-6
modules/planning/common/planning_gflags.h
modules/planning/common/planning_gflags.h
+1
-1
modules/planning/scenarios/BUILD
modules/planning/scenarios/BUILD
+1
-0
modules/planning/scenarios/park_and_go/BUILD
modules/planning/scenarios/park_and_go/BUILD
+2
-10
modules/planning/scenarios/scenario_manager.cc
modules/planning/scenarios/scenario_manager.cc
+21
-12
未找到文件。
modules/planning/common/planning_gflags.cc
浏览文件 @
d69038da
...
...
@@ -39,6 +39,10 @@ DEFINE_string(scenario_narrow_street_u_turn_config_file,
"/apollo/modules/planning/conf/"
"scenario/narrow_street_u_turn_config.pb.txt"
,
"narrow_street_u_turn scenario config file"
);
DEFINE_string
(
scenario_park_and_go_config_file
,
"/apollo/modules/planning/conf/"
"scenario/park_and_go_config.pb.txt"
,
"park_and_go scenario config file"
);
DEFINE_string
(
scenario_pull_over_config_file
,
"/apollo/modules/planning/conf/"
"scenario/pull_over_config.pb.txt"
,
...
...
@@ -63,14 +67,13 @@ DEFINE_string(scenario_valet_parking_config_file,
"/apollo/modules/planning/conf/"
"scenario/valet_parking_config.pb.txt"
,
"valet_parking scenario config file"
);
DEFINE_string
(
scenario_park_and_go_config_file
,
"/apollo/modules/planning/conf/"
"scenario/park_and_go_config.pb.txt"
,
"park_and_go scenario config file"
);
DEFINE_bool
(
enable_scenario_bare_intersection
,
false
,
"enable bare_intersection scenarios in planning"
);
DEFINE_bool
(
enable_scenario_park_and_go
,
false
,
"enable park-and-go scenario in planning"
);
DEFINE_bool
(
enable_scenario_pull_over
,
false
,
"enable pull-over scenario in planning"
);
...
...
@@ -90,8 +93,6 @@ DEFINE_bool(enable_scenario_traffic_light, true,
DEFINE_bool
(
enable_force_pull_over_open_space_parking_test
,
false
,
"enable force_pull_over_open_space_parking_test"
);
DEFINE_bool
(
enable_scenario_park_and_go
,
false
,
"enable park-and-go scenario in planning"
);
DEFINE_string
(
traffic_rule_config_filename
,
"/apollo/modules/planning/conf/traffic_rule_config.pb.txt"
,
...
...
modules/planning/common/planning_gflags.h
浏览文件 @
d69038da
...
...
@@ -27,9 +27,9 @@ DECLARE_string(planning_config_file);
DECLARE_string
(
scenario_bare_intersection_unprotected_config_file
);
DECLARE_string
(
scenario_lane_follow_config_file
);
DECLARE_string
(
scenario_narrow_street_u_turn_config_file
);
DECLARE_string
(
scenario_park_and_go_config_file
);
DECLARE_string
(
scenario_pull_over_config_file
);
DECLARE_string
(
scenario_stop_sign_unprotected_config_file
);
DECLARE_string
(
scenario_park_and_go_config_file
);
DECLARE_string
(
scenario_traffic_light_protected_config_file
);
DECLARE_string
(
scenario_traffic_light_unprotected_left_turn_config_file
);
DECLARE_string
(
scenario_traffic_light_unprotected_right_turn_config_file
);
...
...
modules/planning/scenarios/BUILD
浏览文件 @
d69038da
...
...
@@ -71,6 +71,7 @@ cc_library(
"//modules/planning/common/util:util_lib"
,
"//modules/planning/scenarios/bare_intersection/unprotected:bare_intersection_unprotected_scenario"
,
"//modules/planning/scenarios/lane_follow"
,
"//modules/planning/scenarios/park_and_go:park_and_go_scenario"
,
"//modules/planning/scenarios/park/pull_over:pull_over_scenario"
,
"//modules/planning/scenarios/park/valet_parking"
,
"//modules/planning/scenarios/stop_sign/unprotected:stop_sign_unprotected_scenario"
,
...
...
modules/planning/scenarios/park_and_go/BUILD
浏览文件 @
d69038da
...
...
@@ -2,14 +2,6 @@ load("//tools:cpplint.bzl", "cpplint")
package
(
default_visibility
=
[
"//visibility:public"
])
cc_library
(
name
=
"park_and_go"
,
copts
=
[
"-DMODULE_NAME=
\\\"
planning
\\\"
"
],
deps
=
[
":park_and_go_scenario"
,
],
)
cc_library
(
name
=
"park_and_go_scenario"
,
srcs
=
[
...
...
@@ -46,7 +38,7 @@ cc_test(
"//modules/planning:planning_conf"
,
],
deps
=
[
":park_and_go"
,
":park_and_go
_scenario
"
,
"@gtest//:main"
,
],
)
...
...
@@ -61,7 +53,7 @@ cc_test(
"//modules/planning:planning_conf"
,
],
deps
=
[
":park_and_go"
,
":park_and_go
_scenario
"
,
"@gtest//:main"
,
],
)
...
...
modules/planning/scenarios/scenario_manager.cc
浏览文件 @
d69038da
...
...
@@ -29,6 +29,7 @@
#include "modules/planning/common/util/util.h"
#include "modules/planning/scenarios/bare_intersection/unprotected/bare_intersection_unprotected_scenario.h"
#include "modules/planning/scenarios/lane_follow/lane_follow_scenario.h"
#include "modules/planning/scenarios/park_and_go/park_and_go_scenario.h"
#include "modules/planning/scenarios/park/pull_over/pull_over_scenario.h"
#include "modules/planning/scenarios/park/valet_parking/valet_parking_scenario.h"
#include "modules/planning/scenarios/stop_sign/unprotected/stop_sign_unprotected_scenario.h"
...
...
@@ -58,15 +59,23 @@ std::unique_ptr<Scenario> ScenarioManager::CreateScenario(
std
::
unique_ptr
<
Scenario
>
ptr
;
switch
(
scenario_type
)
{
case
ScenarioConfig
::
LANE_FOLLOW
:
ptr
.
reset
(
new
lane_follow
::
LaneFollowScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
break
;
case
ScenarioConfig
::
BARE_INTERSECTION_UNPROTECTED
:
ptr
.
reset
(
new
scenario
::
bare_intersection
::
BareIntersectionUnprotectedScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
break
;
case
ScenarioConfig
::
LANE_FOLLOW
:
ptr
.
reset
(
new
lane_follow
::
LaneFollowScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
break
;
case
ScenarioConfig
::
PARK_AND_GO
:
ptr
.
reset
(
new
scenario
::
park_and_go
::
ParkAndGoScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
break
;
case
ScenarioConfig
::
PULL_OVER
:
ptr
.
reset
(
new
scenario
::
pull_over
::
PullOverScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
break
;
case
ScenarioConfig
::
STOP_SIGN_UNPROTECTED
:
ptr
.
reset
(
new
scenario
::
stop_sign
::
StopSignUnprotectedScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
...
...
@@ -85,10 +94,6 @@ std::unique_ptr<Scenario> ScenarioManager::CreateScenario(
new
scenario
::
traffic_light
::
TrafficLightUnprotectedRightTurnScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
break
;
case
ScenarioConfig
::
PULL_OVER
:
ptr
.
reset
(
new
scenario
::
pull_over
::
PullOverScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
break
;
case
ScenarioConfig
::
VALET_PARKING
:
ptr
.
reset
(
new
scenario
::
valet_parking
::
ValetParkingScenario
(
config_map_
[
scenario_type
],
&
scenario_context_
));
...
...
@@ -113,6 +118,14 @@ void ScenarioManager::RegisterScenarios() {
FLAGS_scenario_bare_intersection_unprotected_config_file
,
&
config_map_
[
ScenarioConfig
::
BARE_INTERSECTION_UNPROTECTED
]));
// park_and_go
CHECK
(
Scenario
::
LoadConfig
(
FLAGS_scenario_park_and_go_config_file
,
&
config_map_
[
ScenarioConfig
::
PARK_AND_GO
]));
// pull_over
CHECK
(
Scenario
::
LoadConfig
(
FLAGS_scenario_pull_over_config_file
,
&
config_map_
[
ScenarioConfig
::
PULL_OVER
]));
// stop_sign
CHECK
(
Scenario
::
LoadConfig
(
FLAGS_scenario_stop_sign_unprotected_config_file
,
...
...
@@ -129,10 +142,6 @@ void ScenarioManager::RegisterScenarios() {
FLAGS_scenario_traffic_light_unprotected_right_turn_config_file
,
&
config_map_
[
ScenarioConfig
::
TRAFFIC_LIGHT_UNPROTECTED_RIGHT_TURN
]));
// pull_over
CHECK
(
Scenario
::
LoadConfig
(
FLAGS_scenario_pull_over_config_file
,
&
config_map_
[
ScenarioConfig
::
PULL_OVER
]));
// valet parking
CHECK
(
Scenario
::
LoadConfig
(
FLAGS_scenario_valet_parking_config_file
,
&
config_map_
[
ScenarioConfig
::
VALET_PARKING
]));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录