Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
81e78bb3
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,发现更多精彩内容 >>
提交
81e78bb3
编写于
8月 03, 2017
作者:
A
Aaron Xiao
提交者:
GitHub
8月 03, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use StrCat to do efficient joining. (#438)
上级
c6db50a0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
13 deletion
+15
-13
modules/dreamview/backend/common/dreamview_gflags.cc
modules/dreamview/backend/common/dreamview_gflags.cc
+2
-1
modules/dreamview/backend/map/map_service.cc
modules/dreamview/backend/map/map_service.cc
+10
-8
modules/dreamview/backend/sim_control/sim_control.cc
modules/dreamview/backend/sim_control/sim_control.cc
+2
-1
modules/dreamview/backend/simulation_world/simulation_world_service.h
...mview/backend/simulation_world/simulation_world_service.h
+1
-3
未找到文件。
modules/dreamview/backend/common/dreamview_gflags.cc
浏览文件 @
81e78bb3
...
...
@@ -36,4 +36,5 @@ DEFINE_bool(
DEFINE_string
(
routing_result_file
,
"modules/map/data/garage_routing.pb.txt"
,
"File path of the routing result that SimControl will read the "
"start point from. If this is absent, SimControl will directly "
"take the RoutingResponse from ROS to determine the start point."
);
"take the RoutingResponse from ROS to determine the start "
"point."
);
modules/dreamview/backend/map/map_service.cc
浏览文件 @
81e78bb3
...
...
@@ -18,6 +18,8 @@
#include <algorithm>
#include "modules/common/util/string_util.h"
namespace
apollo
{
namespace
dreamview
{
...
...
@@ -94,14 +96,14 @@ MapElementIds::MapElementIds(const nlohmann::json &json_object)
size_t
MapElementIds
::
Hash
()
const
{
static
std
::
hash
<
std
::
string
>
hash_function
;
std
::
string
text
;
text
=
std
::
accumulate
(
lane
.
begin
(),
lane
.
end
(),
text
);
text
=
std
::
accumulate
(
crosswalk
.
begin
(),
crosswalk
.
end
(),
text
);
text
=
std
::
accumulate
(
junction
.
begin
(),
junction
.
end
(),
text
);
text
=
std
::
accumulate
(
signal
.
begin
(),
signal
.
end
(),
text
);
text
=
std
::
accumulate
(
stop_sign
.
begin
(),
stop_sign
.
end
(),
text
);
text
=
std
::
accumulate
(
yield
.
begin
(),
yield
.
end
(),
text
);
text
=
std
::
accumulate
(
overlap
.
begin
(),
overlap
.
end
(),
text
);
const
std
::
string
text
=
apollo
::
common
::
util
::
StrCat
(
apollo
::
common
::
util
::
PrintIter
(
lane
,
""
),
apollo
::
common
::
util
::
PrintIter
(
crosswalk
,
""
),
apollo
::
common
::
util
::
PrintIter
(
junction
,
""
),
apollo
::
common
::
util
::
PrintIter
(
signal
,
""
),
apollo
::
common
::
util
::
PrintIter
(
stop_sign
,
""
),
apollo
::
common
::
util
::
PrintIter
(
yield
,
""
),
apollo
::
common
::
util
::
PrintIter
(
overlap
,
""
)
);
return
hash_function
(
text
);
}
...
...
modules/dreamview/backend/sim_control/sim_control.cc
浏览文件 @
81e78bb3
...
...
@@ -81,7 +81,8 @@ void SimControl::Start() {
if
(
initial_start_
)
{
// Setup planning and routing result data callback.
AdapterManager
::
AddPlanningCallback
(
&
SimControl
::
OnPlanning
,
this
);
AdapterManager
::
AddRoutingResponseCallback
(
&
SimControl
::
SetStartPoint
,
this
);
AdapterManager
::
AddRoutingResponseCallback
(
&
SimControl
::
SetStartPoint
,
this
);
// Start timer to publish localiztion and chassis messages.
sim_control_timer_
=
AdapterManager
::
CreateTimer
(
...
...
modules/dreamview/backend/simulation_world/simulation_world_service.h
浏览文件 @
81e78bb3
...
...
@@ -51,8 +51,6 @@ namespace dreamview {
*/
class
SimulationWorldService
{
public:
using
Json
=
nlohmann
::
json
;
// The maximum number of monitor message items to be kept in
// SimulationWorld.
static
constexpr
int
kMaxMonitorItems
=
30
;
...
...
@@ -79,7 +77,7 @@ class SimulationWorldService {
* @brief Returns the json representation of the SimulationWorld object.
* @return Json object equivalence of the SimulationWorld object.
*/
J
son
GetUpdateAsJson
()
const
;
nlohmann
::
j
son
GetUpdateAsJson
()
const
;
/**
* @brief The function Update() is periodically called to check for updates
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录