Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
72d26908
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,发现更多精彩内容 >>
提交
72d26908
编写于
12月 03, 2018
作者:
L
Liangliang Zhang
提交者:
Jiangtao Hu
12月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Planning: removed IsVirtualObstacle.
上级
ee5e454c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
8 deletion
+3
-8
modules/planning/common/obstacle.cc
modules/planning/common/obstacle.cc
+1
-1
modules/planning/common/obstacle.h
modules/planning/common/obstacle.h
+0
-5
modules/planning/common/obstacle_test.cc
modules/planning/common/obstacle_test.cc
+1
-1
modules/planning/toolkits/optimizers/road_graph/trajectory_cost.cc
...lanning/toolkits/optimizers/road_graph/trajectory_cost.cc
+1
-1
未找到文件。
modules/planning/common/obstacle.cc
浏览文件 @
72d26908
...
...
@@ -90,7 +90,7 @@ Obstacle::Obstacle(const std::string& id,
<<
perception_obstacle
.
DebugString
();
is_static_
=
(
is_static
||
obstacle_priority
==
ObstaclePriority
::
IGNORE
);
is_virtual_
=
IsVirtualObstacle
(
perception_obstacle
);
is_virtual_
=
(
perception_obstacle
.
id
()
<
0
);
speed_
=
std
::
hypot
(
perception_obstacle
.
velocity
().
x
(),
perception_obstacle
.
velocity
().
y
());
}
...
...
modules/planning/common/obstacle.h
浏览文件 @
72d26908
...
...
@@ -119,11 +119,6 @@ class Obstacle {
static
std
::
unique_ptr
<
Obstacle
>
CreateStaticVirtualObstacles
(
const
std
::
string
&
id
,
const
common
::
math
::
Box2d
&
obstacle_box
);
static
bool
IsVirtualObstacle
(
const
perception
::
PerceptionObstacle
&
perception_obstacle
)
{
return
perception_obstacle
.
id
()
<
0
;
}
static
bool
IsValidPerceptionObstacle
(
const
perception
::
PerceptionObstacle
&
obstacle
);
...
...
modules/planning/common/obstacle_test.cc
浏览文件 @
72d26908
...
...
@@ -187,7 +187,7 @@ TEST(Obstacle, CreateStaticVirtualObstacle) {
Obstacle
::
CreateStaticVirtualObstacles
(
"abc"
,
box
);
EXPECT_EQ
(
"abc"
,
obstacle
->
Id
());
EXPECT_EQ
(
-
314721735
,
obstacle
->
PerceptionId
());
EXPECT_TRUE
(
Obstacle
::
IsVirtualObstacle
(
obstacle
->
Perception
()
));
EXPECT_TRUE
(
obstacle
->
IsVirtual
(
));
auto
&
perception_box
=
obstacle
->
PerceptionBoundingBox
();
EXPECT_DOUBLE_EQ
(
0.0
,
perception_box
.
center
().
x
());
EXPECT_DOUBLE_EQ
(
0.0
,
perception_box
.
center
().
y
());
...
...
modules/planning/toolkits/optimizers/road_graph/trajectory_cost.cc
浏览文件 @
72d26908
...
...
@@ -83,7 +83,7 @@ TrajectoryCost::TrajectoryCost(const DpPolyPathConfig &config,
ptr_obstacle
->
Perception
().
type
()
==
perception
::
PerceptionObstacle
::
PEDESTRIAN
);
if
(
Obstacle
::
IsVirtualObstacle
(
ptr_obstacle
->
Perception
()
))
{
if
(
ptr_obstacle
->
IsVirtual
(
))
{
// Virtual obstacle
continue
;
}
else
if
(
ptr_obstacle
->
IsStatic
()
||
is_bycycle_or_pedestrian
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录