Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
b24a9367
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,发现更多精彩内容 >>
提交
b24a9367
编写于
12月 23, 2017
作者:
D
Dong Li
提交者:
Jiangtao Hu
12月 24, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
planning: changed perception_sl_boundary to PerceptionSLBoundary
上级
c7587fdd
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
24 addition
and
24 deletion
+24
-24
modules/planning/common/path_obstacle.cc
modules/planning/common/path_obstacle.cc
+1
-1
modules/planning/common/path_obstacle.h
modules/planning/common/path_obstacle.h
+1
-1
modules/planning/common/reference_line_info.cc
modules/planning/common/reference_line_info.cc
+4
-4
modules/planning/planner/em/em_planner.cc
modules/planning/planner/em/em_planner.cc
+1
-1
modules/planning/tasks/dp_poly_path/dp_road_graph.cc
modules/planning/tasks/dp_poly_path/dp_road_graph.cc
+1
-1
modules/planning/tasks/dp_poly_path/trajectory_cost.cc
modules/planning/tasks/dp_poly_path/trajectory_cost.cc
+1
-1
modules/planning/tasks/path_decider/path_decider.cc
modules/planning/tasks/path_decider/path_decider.cc
+4
-4
modules/planning/tasks/st_graph/st_boundary_mapper.cc
modules/planning/tasks/st_graph/st_boundary_mapper.cc
+8
-8
modules/planning/tasks/traffic_decider/backside_vehicle.cc
modules/planning/tasks/traffic_decider/backside_vehicle.cc
+2
-2
modules/planning/tasks/traffic_decider/destination.cc
modules/planning/tasks/traffic_decider/destination.cc
+1
-1
未找到文件。
modules/planning/common/path_obstacle.cc
浏览文件 @
b24a9367
...
...
@@ -430,7 +430,7 @@ const std::string PathObstacle::DebugString() const {
void
PathObstacle
::
EraseStBoundary
()
{
st_boundary_
=
StBoundary
();
}
const
SLBoundary
&
PathObstacle
::
perception_sl_b
oundary
()
const
{
const
SLBoundary
&
PathObstacle
::
PerceptionSLB
oundary
()
const
{
return
perception_sl_boundary_
;
}
...
...
modules/planning/common/path_obstacle.h
浏览文件 @
b24a9367
...
...
@@ -83,7 +83,7 @@ class PathObstacle {
const
std
::
string
DebugString
()
const
;
const
SLBoundary
&
perception_sl_b
oundary
()
const
;
const
SLBoundary
&
PerceptionSLB
oundary
()
const
;
const
StBoundary
&
st_boundary
()
const
;
...
...
modules/planning/common/reference_line_info.cc
浏览文件 @
b24a9367
...
...
@@ -195,14 +195,14 @@ bool ReferenceLineInfo::AddObstacles(
bool
ReferenceLineInfo
::
IsUnrelaventObstacle
(
PathObstacle
*
path_obstacle
)
{
// if adc is on the road, and obstacle behind adc, ignore
if
(
path_obstacle
->
perception_sl_b
oundary
().
end_s
()
>
if
(
path_obstacle
->
PerceptionSLB
oundary
().
end_s
()
>
reference_line_
.
Length
())
{
return
true
;
}
if
(
is_on_reference_line_
&&
path_obstacle
->
perception_sl_b
oundary
().
end_s
()
<
path_obstacle
->
PerceptionSLB
oundary
().
end_s
()
<
adc_sl_boundary_
.
end_s
()
&&
reference_line_
.
IsOnRoad
(
path_obstacle
->
perception_sl_b
oundary
()))
{
reference_line_
.
IsOnRoad
(
path_obstacle
->
PerceptionSLB
oundary
()))
{
return
true
;
}
return
false
;
...
...
@@ -382,7 +382,7 @@ bool ReferenceLineInfo::ReachedDestination() const {
dest_ptr
->
obstacle
()
->
PerceptionBoundingBox
().
center
()))
{
return
false
;
}
const
double
stop_s
=
dest_ptr
->
perception_sl_b
oundary
().
start_s
()
+
const
double
stop_s
=
dest_ptr
->
PerceptionSLB
oundary
().
start_s
()
+
dest_ptr
->
LongitudinalDecision
().
stop
().
distance_s
();
return
adc_sl_boundary_
.
end_s
()
+
kDestinationDeltaS
>
stop_s
;
}
...
...
modules/planning/planner/em/em_planner.cc
浏览文件 @
b24a9367
...
...
@@ -103,7 +103,7 @@ void EMPlanner::RecordObstacleDebugInfo(
auto
obstacle_debug
=
ptr_debug
->
mutable_planning_data
()
->
add_obstacle
();
obstacle_debug
->
set_id
(
path_obstacle
->
Id
());
obstacle_debug
->
mutable_sl_boundary
()
->
CopyFrom
(
path_obstacle
->
perception_sl_b
oundary
());
path_obstacle
->
PerceptionSLB
oundary
());
const
auto
&
decider_tags
=
path_obstacle
->
decider_tags
();
const
auto
&
decisions
=
path_obstacle
->
decisions
();
if
(
decider_tags
.
size
()
!=
decisions
.
size
())
{
...
...
modules/planning/tasks/dp_poly_path/dp_road_graph.cc
浏览文件 @
b24a9367
...
...
@@ -321,7 +321,7 @@ bool DPRoadGraph::IsSafeForLaneChange() {
for
(
const
auto
&
path_obstacle
:
reference_line_info_
.
path_decision
().
path_obstacles
().
Items
())
{
const
auto
&
sl_boundary
=
path_obstacle
->
perception_sl_b
oundary
();
const
auto
&
sl_boundary
=
path_obstacle
->
PerceptionSLB
oundary
();
const
auto
&
adc_sl_boundary
=
reference_line_info_
.
AdcSlBoundary
();
constexpr
double
kLateralShift
=
2.5
;
...
...
modules/planning/tasks/dp_poly_path/trajectory_cost.cc
浏览文件 @
b24a9367
...
...
@@ -60,7 +60,7 @@ TrajectoryCost::TrajectoryCost(
if
(
ptr_path_obstacle
->
IsIgnore
())
{
continue
;
}
auto
sl_boundary
=
ptr_path_obstacle
->
perception_sl_b
oundary
();
auto
sl_boundary
=
ptr_path_obstacle
->
PerceptionSLB
oundary
();
const
auto
&
vehicle_param
=
common
::
VehicleConfigHelper
::
instance
()
->
GetConfig
().
vehicle_param
();
...
...
modules/planning/tasks/path_decider/path_decider.cc
浏览文件 @
b24a9367
...
...
@@ -111,7 +111,7 @@ bool PathDecider::MakeStaticObstacleDecision(
ObjectDecisionType
object_decision
;
object_decision
.
mutable_ignore
();
const
auto
&
sl_boundary
=
path_obstacle
->
perception_sl_b
oundary
();
const
auto
&
sl_boundary
=
path_obstacle
->
PerceptionSLB
oundary
();
if
(
sl_boundary
.
start_s
()
<
frenet_points
.
front
().
s
()
||
sl_boundary
.
start_s
()
>
frenet_points
.
back
().
s
())
{
...
...
@@ -176,9 +176,9 @@ double PathDecider::MinimumRadiusStopDistance(
const
auto
&
vehicle_param
=
VehicleConfigHelper
::
GetConfig
().
vehicle_param
();
const
double
min_turn_radius
=
VehicleConfigHelper
::
MinSafeTurnRadius
();
double
lateral_diff
=
std
::
max
(
std
::
fabs
(
path_obstacle
.
perception_sl_b
oundary
().
start_l
()
-
std
::
max
(
std
::
fabs
(
path_obstacle
.
PerceptionSLB
oundary
().
start_l
()
-
reference_line_info_
->
AdcSlBoundary
().
end_l
()),
std
::
fabs
(
path_obstacle
.
perception_sl_b
oundary
().
end_l
()
-
std
::
fabs
(
path_obstacle
.
PerceptionSLB
oundary
().
end_l
()
-
reference_line_info_
->
AdcSlBoundary
().
start_l
()));
lateral_diff
=
std
::
max
(
lateral_diff
,
vehicle_param
.
width
());
const
double
kEpison
=
1e-5
;
...
...
@@ -203,7 +203,7 @@ ObjectStop PathDecider::GenerateObjectStopDecision(
object_stop
.
set_distance_s
(
-
stop_distance
);
const
double
stop_ref_s
=
path_obstacle
.
perception_sl_b
oundary
().
start_s
()
-
stop_distance
;
path_obstacle
.
PerceptionSLB
oundary
().
start_s
()
-
stop_distance
;
const
auto
stop_ref_point
=
reference_line_info_
->
reference_line
().
GetReferencePoint
(
stop_ref_s
);
object_stop
.
mutable_stop_point
()
->
set_x
(
stop_ref_point
.
x
());
...
...
modules/planning/tasks/st_graph/st_boundary_mapper.cc
浏览文件 @
b24a9367
...
...
@@ -106,7 +106,7 @@ Status StBoundaryMapper::GetGraphBoundary(PathDecision* path_decision) const {
}
const
auto
&
decision
=
path_obstacle
->
LongitudinalDecision
();
if
(
decision
.
has_stop
())
{
const
double
stop_s
=
path_obstacle
->
perception_sl_b
oundary
().
start_s
()
+
const
double
stop_s
=
path_obstacle
->
PerceptionSLB
oundary
().
start_s
()
+
decision
.
stop
().
distance_s
();
// this is a rough estimation based on reference line s, so that a large
// buffer is used.
...
...
@@ -156,12 +156,12 @@ bool StBoundaryMapper::MapStopDecision(PathObstacle* stop_obstacle) const {
const
auto
&
stop_decision
=
stop_obstacle
->
LongitudinalDecision
();
DCHECK
(
stop_decision
.
has_stop
())
<<
"Must have stop decision"
;
if
(
stop_obstacle
->
perception_sl_b
oundary
().
start_s
()
>
planning_distance_
)
{
if
(
stop_obstacle
->
PerceptionSLB
oundary
().
start_s
()
>
planning_distance_
)
{
return
true
;
}
double
st_stop_s
=
0.0
;
const
double
stop_ref_s
=
stop_obstacle
->
perception_sl_b
oundary
().
start_s
()
+
const
double
stop_ref_s
=
stop_obstacle
->
PerceptionSLB
oundary
().
start_s
()
+
stop_decision
.
stop
().
distance_s
()
-
vehicle_param_
.
front_edge_to_center
();
...
...
@@ -175,7 +175,7 @@ bool StBoundaryMapper::MapStopDecision(PathObstacle* stop_obstacle) const {
AERROR
<<
"Fail to get path point from reference s. The sl boundary of "
"stop obstacle "
<<
stop_obstacle
->
Id
()
<<
" is: "
<<
stop_obstacle
->
perception_sl_b
oundary
().
DebugString
();
<<
stop_obstacle
->
PerceptionSLB
oundary
().
DebugString
();
return
false
;
}
...
...
@@ -509,18 +509,18 @@ Status StBoundaryMapper::GetSpeedLimits(
if
(
!
const_path_obstacle
->
LateralDecision
().
has_nudge
())
{
continue
;
}
if
(
path_s
<
const_path_obstacle
->
perception_sl_b
oundary
().
start_s
()
||
path_s
>
const_path_obstacle
->
perception_sl_b
oundary
().
end_s
())
{
if
(
path_s
<
const_path_obstacle
->
PerceptionSLB
oundary
().
start_s
()
||
path_s
>
const_path_obstacle
->
PerceptionSLB
oundary
().
end_s
())
{
continue
;
}
constexpr
double
kRange
=
1.0
;
// meters
const
auto
&
nudge
=
const_path_obstacle
->
LateralDecision
().
nudge
();
bool
is_close_on_left
=
(
nudge
.
type
()
==
ObjectNudge
::
LEFT_NUDGE
)
&&
(
const_path_obstacle
->
perception_sl_b
oundary
().
end_l
()
>
-
kRange
);
(
const_path_obstacle
->
PerceptionSLB
oundary
().
end_l
()
>
-
kRange
);
bool
is_close_on_right
=
(
nudge
.
type
()
==
ObjectNudge
::
RIGHT_NUDGE
)
&&
(
const_path_obstacle
->
perception_sl_b
oundary
().
start_l
()
<
kRange
);
(
const_path_obstacle
->
PerceptionSLB
oundary
().
start_l
()
<
kRange
);
if
(
is_close_on_left
||
is_close_on_right
)
{
double
nudge_speed_ratio
=
1.0
;
if
(
const_path_obstacle
->
obstacle
()
->
IsStatic
())
{
...
...
modules/planning/tasks/traffic_decider/backside_vehicle.cc
浏览文件 @
b24a9367
...
...
@@ -36,7 +36,7 @@ void BacksideVehicle::MakeLaneKeepingObstacleDecision(
const
double
adc_length_s
=
adc_sl_boundary
.
end_s
()
-
adc_sl_boundary
.
start_s
();
for
(
const
auto
*
path_obstacle
:
path_decision
->
path_obstacles
().
Items
())
{
if
(
path_obstacle
->
perception_sl_b
oundary
().
end_s
()
>=
if
(
path_obstacle
->
PerceptionSLB
oundary
().
end_s
()
>=
adc_sl_boundary
.
end_s
())
{
// don't ignore such vehicles.
continue
;
}
...
...
@@ -55,7 +55,7 @@ void BacksideVehicle::MakeLaneKeepingObstacleDecision(
continue
;
}
if
(
path_obstacle
->
perception_sl_b
oundary
().
start_s
()
<
if
(
path_obstacle
->
PerceptionSLB
oundary
().
start_s
()
<
adc_sl_boundary
.
end_s
())
{
path_decision
->
AddLongitudinalDecision
(
rule_id
,
path_obstacle
->
Id
(),
ignore
);
...
...
modules/planning/tasks/traffic_decider/destination.cc
浏览文件 @
b24a9367
...
...
@@ -44,7 +44,7 @@ bool Destination::ApplyRule(Frame*,
}
auto
stop_point
=
reference_line_info
->
reference_line
().
GetReferencePoint
(
destination
->
perception_sl_b
oundary
().
start_s
()
-
destination
->
PerceptionSLB
oundary
().
start_s
()
-
FLAGS_stop_distance_destination
);
ObjectDecisionType
stop
;
stop
.
mutable_stop
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录