Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
f8644731
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,发现更多精彩内容 >>
提交
f8644731
编写于
8月 01, 2017
作者:
D
Dong Li
提交者:
lianglia-apollo
8月 01, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
added IndexedList container type
上级
8030aad8
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
37 addition
and
37 deletion
+37
-37
modules/planning/common/BUILD
modules/planning/common/BUILD
+8
-3
modules/planning/common/indexed_list.h
modules/planning/common/indexed_list.h
+26
-22
modules/planning/common/object_table.h
modules/planning/common/object_table.h
+2
-10
modules/planning/optimizer/dp_st_speed/dp_st_graph.cc
modules/planning/optimizer/dp_st_speed/dp_st_graph.cc
+1
-2
未找到文件。
modules/planning/common/BUILD
浏览文件 @
f8644731
...
@@ -16,14 +16,19 @@ cc_library(
...
@@ -16,14 +16,19 @@ cc_library(
)
)
cc_library
(
cc_library
(
name
=
"
object_table
"
,
name
=
"
indexed_list
"
,
src
s
=
[
hdr
s
=
[
"
object_table.cc
"
,
"
indexed_list.h
"
,
],
],
)
cc_library
(
name
=
"object_table"
,
hdrs
=
[
hdrs
=
[
"object_table.h"
,
"object_table.h"
,
],
],
deps
=
[
deps
=
[
":indexed_list"
,
":obstacle"
,
":obstacle"
,
":planning_gflags"
,
":planning_gflags"
,
],
],
...
...
modules/planning/common/
object_table.cc
→
modules/planning/common/
indexed_list.h
浏览文件 @
f8644731
...
@@ -15,38 +15,42 @@
...
@@ -15,38 +15,42 @@
*****************************************************************************/
*****************************************************************************/
/**
/**
* @file
object_table.cc
* @file
indexed_list.h
**/
**/
#include "modules/planning/common/object_table.h"
#ifndef MODULES_PLANNING_COMMON_INDEXED_LIST_H_
#define MODULES_PLANNING_COMMON_INDEXED_LIST_H_
#include <memory>
#include <memory>
#include <utility>
#include <unordered_map>
#include <vector>
#include "modules/common/log.h"
namespace
apollo
{
namespace
apollo
{
namespace
planning
{
namespace
planning
{
Obstacle
*
ObjectTable
::
get_obstacle
(
const
uint32_t
id
)
{
template
<
typename
I
,
typename
T
>
return
get_obstacle
(
std
::
to_string
(
id
));
class
IndexedList
{
}
public:
void
Add
(
const
I
id
,
std
::
unique_ptr
<
T
>
ptr
)
{
Obstacle
*
ObjectTable
::
get_obstacle
(
const
std
::
string
&
id
)
{
_object_list
.
push_back
(
ptr
.
get
());
auto
iter
=
_obstacle_cache
.
find
(
id
);
_object_dict
[
id
]
=
std
::
move
(
ptr
);
if
(
iter
!=
_obstacle_cache
.
end
())
{
}
return
iter
->
second
.
get
();
T
*
Find
(
const
I
id
)
{
}
else
{
auto
iter
=
_object_dict
.
find
(
id
);
AERROR
<<
"Failed to find object "
<<
id
;
if
(
iter
==
_object_dict
.
end
())
{
return
nullptr
;
return
nullptr
;
}
else
{
return
iter
->
second
.
get
();
}
}
}
}
const
std
::
vector
<
T
*>&
Items
()
const
{
return
_object_list
;
}
void
ObjectTable
::
add_obstacle
(
const
Obstacle
&
obstacle
)
{
private:
auto
ptr
=
std
::
unique_ptr
<
Obstacle
>
();
std
::
vector
<
const
T
*>
_object_list
;
*
ptr
=
obstacle
;
std
::
unordered_map
<
I
,
std
::
unique_ptr
<
T
>>
_object_dict
;
_obstacle_cache
[
ptr
->
Id
()]
=
std
::
move
(
ptr
);
};
}
}
// namespace planning
}
// namespace planning
}
// namespace apollo
}
// namespace apollo
#endif // MODULES_PLANNING_COMMON_INDEXED_LIST_H
modules/planning/common/object_table.h
浏览文件 @
f8644731
...
@@ -25,22 +25,14 @@
...
@@ -25,22 +25,14 @@
#include <string>
#include <string>
#include <unordered_map>
#include <unordered_map>
#include "modules/planning/common/indexed_list.h"
#include "modules/planning/common/obstacle.h"
#include "modules/planning/common/obstacle.h"
#include "modules/planning/common/planning_gflags.h"
#include "modules/planning/common/planning_gflags.h"
namespace
apollo
{
namespace
apollo
{
namespace
planning
{
namespace
planning
{
class
ObjectTable
{
using
ObjectTable
=
IndexedList
<
uint32_t
,
Obstacle
>
;
public:
ObjectTable
()
=
default
;
Obstacle
*
get_obstacle
(
const
uint32_t
id
);
Obstacle
*
get_obstacle
(
const
std
::
string
&
id
);
void
add_obstacle
(
const
Obstacle
&
obstacle
);
private:
std
::
unordered_map
<
std
::
string
,
std
::
unique_ptr
<
Obstacle
>>
_obstacle_cache
;
};
}
// namespace planning
}
// namespace planning
}
// namespace apollo
}
// namespace apollo
...
...
modules/planning/optimizer/dp_st_speed/dp_st_graph.cc
浏览文件 @
f8644731
...
@@ -300,8 +300,7 @@ Status DpStGraph::get_object_decision(const StGraphData& st_graph_data,
...
@@ -300,8 +300,7 @@ Status DpStGraph::get_object_decision(const StGraphData& st_graph_data,
CHECK_EQ
(
boundary_it
->
points
().
size
(),
4
);
CHECK_EQ
(
boundary_it
->
points
().
size
(),
4
);
Obstacle
*
object_ptr
=
Obstacle
*
object_ptr
=
DataCenter
::
instance
()
->
mutable_object_table
()
->
get_obstacle
(
DataCenter
::
instance
()
->
mutable_object_table
()
->
Find
(
boundary_it
->
id
());
boundary_it
->
id
());
if
(
!
object_ptr
)
{
if
(
!
object_ptr
)
{
AERROR
<<
"Failed to find object "
<<
boundary_it
->
id
();
AERROR
<<
"Failed to find object "
<<
boundary_it
->
id
();
return
Status
(
ErrorCode
::
PLANNING_ERROR
,
return
Status
(
ErrorCode
::
PLANNING_ERROR
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录