Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
983e99ac
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,发现更多精彩内容 >>
提交
983e99ac
编写于
8月 31, 2017
作者:
D
Dong Li
提交者:
lianglia-apollo
8月 31, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
planning: remove vehicle_param from dp_st_graph constructor
上级
2afed064
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
19 deletion
+16
-19
modules/planning/tasks/dp_st_speed/dp_st_graph.cc
modules/planning/tasks/dp_st_speed/dp_st_graph.cc
+9
-8
modules/planning/tasks/dp_st_speed/dp_st_graph.h
modules/planning/tasks/dp_st_speed/dp_st_graph.h
+5
-7
modules/planning/tasks/dp_st_speed/dp_st_speed_optimizer.cc
modules/planning/tasks/dp_st_speed/dp_st_speed_optimizer.cc
+2
-4
未找到文件。
modules/planning/tasks/dp_st_speed/dp_st_graph.cc
浏览文件 @
983e99ac
...
...
@@ -26,6 +26,7 @@
#include "modules/common/proto/pnc_point.pb.h"
#include "modules/common/configs/vehicle_config_helper.h"
#include "modules/common/log.h"
#include "modules/common/math/vec2d.h"
#include "modules/planning/common/planning_gflags.h"
...
...
@@ -37,8 +38,9 @@ namespace planning {
using
ErrorCode
=
apollo
::
common
::
ErrorCode
;
using
SpeedPoint
=
apollo
::
common
::
SpeedPoint
;
using
Status
=
apollo
::
common
::
Status
;
using
VehicleParam
=
apollo
::
common
::
VehicleParam
;
using
Vec2d
=
apollo
::
common
::
math
::
Vec2d
;
using
VehicleConfigHelper
=
apollo
::
common
::
VehicleConfigHelper
;
using
VehicleParam
=
apollo
::
common
::
VehicleParam
;
namespace
{
...
...
@@ -54,21 +56,20 @@ bool CheckOverlapOnDpStGraph(const std::vector<StBoundary> boundaries,
}
}
DpStGraph
::
DpStGraph
(
const
SLBoundary
&
adc_sl_boundary
,
const
DpStSpeedConfig
&
dp_config
,
DpStGraph
::
DpStGraph
(
const
DpStSpeedConfig
&
dp_config
,
const
StGraphData
&
st_graph_data
,
const
VehicleParam
&
vehicle_param
,
const
PathData
&
path_data
)
:
adc_sl_boundary_
(
adc_sl_boundary
),
dp_st_speed_config_
(
dp_config
),
const
PathData
&
path_data
,
const
SLBoundary
&
adc_sl_boundary
)
:
dp_st_speed_config_
(
dp_config
),
st_graph_data_
(
st_graph_data
),
vehicle_param_
(
vehicle_param
),
path_data_
(
path_data
),
adc_sl_boundary_
(
adc_sl_boundary
),
dp_st_cost_
(
dp_config
),
init_point_
(
st_graph_data
.
init_point
())
{
dp_st_speed_config_
.
set_total_path_length
(
std
::
fmin
(
dp_st_speed_config_
.
total_path_length
(),
st_graph_data_
.
path_data_length
()));
vehicle_param_
=
VehicleConfigHelper
::
GetConfig
().
vehicle_param
();
}
Status
DpStGraph
::
Search
(
PathDecision
*
const
path_decision
,
...
...
modules/planning/tasks/dp_st_speed/dp_st_graph.h
浏览文件 @
983e99ac
...
...
@@ -41,10 +41,8 @@ namespace planning {
class
DpStGraph
{
public:
DpStGraph
(
const
SLBoundary
&
adc_sl_boundary
,
const
DpStSpeedConfig
&
dp_config
,
const
StGraphData
&
st_graph_data
,
const
common
::
VehicleParam
&
vehicle_param
,
const
PathData
&
path_data
);
DpStGraph
(
const
DpStSpeedConfig
&
dp_config
,
const
StGraphData
&
st_graph_data
,
const
PathData
&
path_data
,
const
SLBoundary
&
adc_sl_boundary
);
apollo
::
common
::
Status
Search
(
PathDecision
*
const
path_decision
,
SpeedData
*
const
speed_data
);
...
...
@@ -115,18 +113,18 @@ class DpStGraph {
uint32_t
*
highest_row
,
uint32_t
*
lowest_row
);
private:
const
SLBoundary
&
adc_sl_boundary_
;
// dp st configuration
DpStSpeedConfig
dp_st_speed_config_
;
const
StGraphData
&
st_graph_data_
;
// vehicle configuration parameter
co
nst
common
::
VehicleParam
&
vehicle_param_
;
co
mmon
::
VehicleParam
vehicle_param_
;
const
PathData
&
path_data_
;
const
SLBoundary
&
adc_sl_boundary_
;
// cost utility with configuration;
DpStCost
dp_st_cost_
;
...
...
modules/planning/tasks/dp_st_speed/dp_st_speed_optimizer.cc
浏览文件 @
983e99ac
...
...
@@ -92,11 +92,9 @@ Status DpStSpeedOptimizer::Process(const SLBoundary& adc_sl_boundary,
const
double
path_length
=
path_data
.
discretized_path
().
Length
();
StGraphData
st_graph_data
(
boundaries
,
init_point
,
speed_limit
,
path_length
);
const
auto
&
veh_param
=
common
::
VehicleConfigHelper
::
GetConfig
().
vehicle_param
();
DpStGraph
st_graph
(
adc_sl_boundary
,
dp_st_speed_config_
,
st_grap
h_data
,
veh_param
,
path_data
);
DpStGraph
st_graph
(
dp_st_speed_config_
,
st_graph_data
,
pat
h_data
,
adc_sl_boundary
);
if
(
!
st_graph
.
Search
(
path_decision
,
speed_data
).
ok
())
{
const
std
::
string
msg
(
Name
()
+
":Failed to search graph with dynamic programming."
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录