Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
7228508d
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,发现更多精彩内容 >>
提交
7228508d
编写于
7月 20, 2017
作者:
Z
Zhang Liangliang
提交者:
Calvin Miao
7月 20, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
added planning_data.h/cc; TODO: fixed cyclic dependency in reference_line_decider.
上级
72b85a70
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
81 addition
and
3 deletion
+81
-3
modules/planning/common/BUILD
modules/planning/common/BUILD
+8
-1
modules/planning/common/planning_data.cc
modules/planning/common/planning_data.cc
+46
-1
modules/planning/common/planning_data.h
modules/planning/common/planning_data.h
+27
-0
modules/planning/reference_line/BUILD
modules/planning/reference_line/BUILD
+0
-1
未找到文件。
modules/planning/common/BUILD
浏览文件 @
7228508d
...
...
@@ -107,6 +107,14 @@ cc_library(
hdrs
=
[
"planning_data.h"
,
],
deps
=
[
":decision_data"
,
"//modules/common/proto:path_point_proto"
,
"//modules/planning/common/trajectory:publishable_trajectory"
,
"//modules/planning/reference_line:lib_reference_line"
,
"//modules/map/proto:map_proto"
,
"@eigen//:eigen"
,
],
)
cc_library
(
...
...
@@ -159,7 +167,6 @@ cc_library(
deps
=
[
":environment"
,
":frame"
,
":planning_data"
,
":planning_gflags"
,
"//modules/common"
,
"//modules/common/status"
,
...
...
modules/planning/common/planning_data.cc
浏览文件 @
7228508d
...
...
@@ -21,5 +21,50 @@
#include "modules/planning/common/planning_data.h"
namespace
apollo
{
namespace
planning
{}
// namespace planning
namespace
planning
{
const
ReferenceLine
&
PlanningData
::
reference_line
()
const
{
return
*
_reference_line
.
get
();
}
const
DecisionData
&
PlanningData
::
decision_data
()
const
{
return
*
_decision_data
.
get
();
}
const
PublishableTrajectory
&
PlanningData
::
computed_trajectory
()
const
{
return
_computed_trajectory
;
}
const
TrajectoryPoint
&
PlanningData
::
init_planning_point
()
const
{
return
_init_planning_point
;
}
DecisionData
*
PlanningData
::
mutable_decision_data
()
const
{
return
_decision_data
.
get
();
}
PublishableTrajectory
*
PlanningData
::
mutable_computed_trajectory
()
{
return
&
_computed_trajectory
;
};
void
PlanningData
::
set_init_planning_point
(
const
TrajectoryPoint
&
init_planning_point
)
{
_init_planning_point
=
init_planning_point
;
}
void
PlanningData
::
set_reference_line
(
std
::
unique_ptr
<
ReferenceLine
>&
reference_line
)
{
_reference_line
=
std
::
move
(
reference_line
);
}
void
PlanningData
::
set_decision_data
(
std
::
unique_ptr
<
DecisionData
>&
decision_data
)
{
_decision_data
=
std
::
move
(
decision_data
);
}
void
PlanningData
::
set_computed_trajectory
(
PublishableTrajectory
publishable_trajectory
)
{
_computed_trajectory
=
std
::
move
(
publishable_trajectory
);
}
}
// namespace planning
}
// namespace apollo
modules/planning/common/planning_data.h
浏览文件 @
7228508d
...
...
@@ -21,12 +21,39 @@
#ifndef MODULES_PLANNING_COMMON_PLANNING_DATA_H_
#define MODULES_PLANNING_COMMON_PLANNING_DATA_H_
#include "modules/common/proto/path_point.pb.h"
#include "modules/planning/common/decision_data.h"
#include "modules/planning/common/trajectory/publishable_trajectory.h"
#include "modules/planning/reference_line/reference_line.h"
namespace
apollo
{
namespace
planning
{
class
PlanningData
{
public:
PlanningData
()
=
default
;
// copy reference line to planning data
void
set_reference_line
(
std
::
unique_ptr
<
ReferenceLine
>&
reference_line
);
void
set_decision_data
(
std
::
unique_ptr
<
DecisionData
>&
decision_data
);
void
set_init_planning_point
(
const
TrajectoryPoint
&
init_planning_point
);
void
set_computed_trajectory
(
PublishableTrajectory
computed_trajectory
);
const
ReferenceLine
&
reference_line
()
const
;
const
DecisionData
&
decision_data
()
const
;
const
PublishableTrajectory
&
computed_trajectory
()
const
;
const
TrajectoryPoint
&
init_planning_point
()
const
;
DecisionData
*
mutable_decision_data
()
const
;
PublishableTrajectory
*
mutable_computed_trajectory
();
virtual
std
::
string
type
()
const
=
0
;
protected:
std
::
unique_ptr
<
ReferenceLine
>
_reference_line
;
std
::
unique_ptr
<
DecisionData
>
_decision_data
;
PublishableTrajectory
_computed_trajectory
;
TrajectoryPoint
_init_planning_point
;
};
}
// namespace planning
...
...
modules/planning/reference_line/BUILD
浏览文件 @
7228508d
...
...
@@ -15,7 +15,6 @@ cc_library(
"//modules/common/proto:path_point_proto"
,
"//modules/map/pnc_map:pnc_path"
,
"//modules/common/math:math"
,
"//modules/planning/common:data_center"
,
"//modules/planning/math:double"
,
],
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录