Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
dda6ae0c
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 搜索 >>
提交
dda6ae0c
编写于
12月 20, 2017
作者:
D
Dong Li
提交者:
Liangliang Zhang
12月 20, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
planning: added state tracking for junction right of way
上级
83120239
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
57 addition
and
8 deletion
+57
-8
modules/planning/common/BUILD
modules/planning/common/BUILD
+1
-0
modules/planning/common/reference_line_info.cc
modules/planning/common/reference_line_info.cc
+44
-0
modules/planning/common/reference_line_info.h
modules/planning/common/reference_line_info.h
+3
-4
modules/planning/proto/BUILD
modules/planning/proto/BUILD
+1
-1
modules/planning/tasks/traffic_decider/BUILD
modules/planning/tasks/traffic_decider/BUILD
+1
-0
modules/planning/tasks/traffic_decider/signal_light.cc
modules/planning/tasks/traffic_decider/signal_light.cc
+7
-3
未找到文件。
modules/planning/common/BUILD
浏览文件 @
dda6ae0c
...
...
@@ -186,6 +186,7 @@ cc_library(
":planning_gflags"
,
"//modules/common:log"
,
"//modules/common/proto:pnc_point_proto"
,
"//modules/common/util:dropbox"
,
"//modules/common/vehicle_state:vehicle_state_provider"
,
"//modules/map/pnc_map"
,
"//modules/map/proto:map_proto"
,
...
...
modules/planning/common/reference_line_info.cc
浏览文件 @
dda6ae0c
...
...
@@ -28,9 +28,11 @@
#include "modules/planning/proto/sl_boundary.pb.h"
#include "modules/common/configs/vehicle_config_helper.h"
#include "modules/common/util/dropbox.h"
#include "modules/common/util/string_util.h"
#include "modules/common/util/util.h"
#include "modules/map/hdmap/hdmap_common.h"
#include "modules/map/hdmap/hdmap_util.h"
#include "modules/planning/common/planning_gflags.h"
namespace
apollo
{
...
...
@@ -52,6 +54,12 @@ ReferenceLineInfo::ReferenceLineInfo(const common::VehicleState& vehicle_state,
reference_line_
(
reference_line
),
lanes_
(
segments
)
{}
namespace
{
std
::
string
junction_dropbox_id
(
const
std
::
string
&
junction_id
)
{
return
"junction_protection_"
+
junction_id
;
}
}
bool
ReferenceLineInfo
::
Init
()
{
const
auto
&
param
=
VehicleConfigHelper
::
GetConfig
().
vehicle_param
();
const
auto
&
path_point
=
adc_planning_point_
.
path_point
();
...
...
@@ -80,6 +88,42 @@ bool ReferenceLineInfo::Init() {
return
true
;
}
bool
WithinOverlap
(
const
hdmap
::
PathOverlap
&
overlap
,
double
s
)
{
constexpr
double
kEpsilon
=
1e-2
;
return
overlap
.
start_s
-
kEpsilon
<=
s
&&
s
<=
overlap
.
end_s
+
kEpsilon
;
}
void
ReferenceLineInfo
::
SetJunctionRightOfWay
(
double
junction_s
,
bool
is_protected
)
{
auto
*
junction_store
=
common
::
util
::
Dropbox
<
bool
>::
Open
();
for
(
const
auto
&
overlap
:
reference_line_
.
map_path
().
junction_overlaps
())
{
if
(
WithinOverlap
(
overlap
,
junction_s
))
{
junction_store
->
Set
(
junction_dropbox_id
(
overlap
.
object_id
),
is_protected
);
}
}
}
ADCTrajectory
::
RightOfWayStatus
ReferenceLineInfo
::
GetRightOfWayStatus
()
const
{
auto
*
junction_store
=
common
::
util
::
Dropbox
<
bool
>::
Open
();
for
(
const
auto
&
overlap
:
reference_line_
.
map_path
().
junction_overlaps
())
{
if
(
overlap
.
end_s
<
adc_sl_boundary_
.
start_s
())
{
junction_store
->
Remove
(
junction_dropbox_id
(
overlap
.
object_id
));
}
else
if
(
WithinOverlap
(
overlap
,
adc_sl_boundary_
.
end_s
()))
{
auto
*
is_protected
=
junction_store
->
Get
(
junction_dropbox_id
(
overlap
.
object_id
));
if
(
!
is_protected
)
{
continue
;
}
if
(
*
is_protected
)
{
return
ADCTrajectory
::
PROTECTED
;
}
else
{
return
ADCTrajectory
::
UNPROTECTED
;
}
}
}
return
ADCTrajectory
::
UNPROTECTED
;
}
const
hdmap
::
RouteSegments
&
ReferenceLineInfo
::
Lanes
()
const
{
return
lanes_
;
}
const
SLBoundary
&
ReferenceLineInfo
::
AdcSlBoundary
()
const
{
...
...
modules/planning/common/reference_line_info.h
浏览文件 @
dda6ae0c
...
...
@@ -111,10 +111,9 @@ class ReferenceLineInfo {
void
ExportDecision
(
DecisionResult
*
decision_result
)
const
;
void
SetRightOfWayStatus
()
{
status_
=
ADCTrajectory
::
PROTECTED
;
}
ADCTrajectory
::
RightOfWayStatus
GetRightOfWayStatus
()
const
{
return
status_
;
}
void
SetJunctionRightOfWay
(
double
junction_s
,
bool
is_protected
);
ADCTrajectory
::
RightOfWayStatus
GetRightOfWayStatus
()
const
;
private:
void
ExportTurnSignal
(
common
::
VehicleSignal
*
signal
)
const
;
...
...
modules/planning/proto/BUILD
浏览文件 @
dda6ae0c
...
...
@@ -16,9 +16,9 @@ proto_library(
"planning.proto"
,
"planning_config.proto"
,
"planning_internal.proto"
,
"planning_stats.proto"
,
"qp_st_speed_config.proto"
,
"sl_boundary.proto"
,
"planning_stats.proto"
,
],
deps
=
[
":dp_poly_path_config_proto_lib"
,
...
...
modules/planning/tasks/traffic_decider/BUILD
浏览文件 @
dda6ae0c
...
...
@@ -34,6 +34,7 @@ cc_library(
"//modules/planning/common:frame"
,
"//modules/planning/common:planning_gflags"
,
"//modules/planning/common:reference_line_info"
,
"//modules/planning/proto:planning_proto"
,
],
)
...
...
modules/planning/tasks/traffic_decider/signal_light.cc
浏览文件 @
dda6ae0c
...
...
@@ -124,9 +124,13 @@ void SignalLight::MakeDecisions(Frame* frame,
}
signal_debug
->
set_is_stop_wall_created
(
true
);
}
}
if
(
!
has_stop
)
{
reference_line_info
->
SetRightOfWayStatus
();
if
(
has_stop
)
{
reference_line_info
->
SetJunctionRightOfWay
(
signal_light
->
start_s
,
false
);
// not protected
}
else
{
reference_line_info
->
SetJunctionRightOfWay
(
signal_light
->
start_s
,
true
);
// is protected
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录