Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
cb06b0a5
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,发现更多精彩内容 >>
提交
cb06b0a5
编写于
8月 06, 2017
作者:
D
Dong Li
提交者:
Jiangtao Hu
8月 06, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename routing_result to routing_response
上级
d2271f81
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
13 addition
and
13 deletion
+13
-13
modules/map/pnc_map/path_test.cc
modules/map/pnc_map/path_test.cc
+1
-1
modules/planning/common/frame.cc
modules/planning/common/frame.cc
+5
-5
modules/planning/common/frame.h
modules/planning/common/frame.h
+1
-1
modules/planning/integration_tests/planning_test_base.cc
modules/planning/integration_tests/planning_test_base.cc
+3
-3
modules/planning/integration_tests/planning_test_base.h
modules/planning/integration_tests/planning_test_base.h
+3
-3
未找到文件。
modules/map/pnc_map/path_test.cc
浏览文件 @
cb06b0a5
...
...
@@ -41,7 +41,7 @@ using Vec2d = apollo::common::math::Vec2d;
using
LaneWaypoint
=
apollo
::
hdmap
::
LaneWaypoint
;
using
LaneInfoConstPtr
=
apollo
::
hdmap
::
LaneInfoConstPtr
;
DECLARE_bool
(
validate_routing_res
ult
_for_trajectories
);
DECLARE_bool
(
validate_routing_res
ponse
_for_trajectories
);
namespace
apollo
{
namespace
hdmap
{
...
...
modules/planning/common/frame.cc
浏览文件 @
cb06b0a5
...
...
@@ -52,7 +52,7 @@ void Frame::SetVehicleInitPose(const localization::Pose &pose) {
}
void
Frame
::
SetRoutingResponse
(
const
routing
::
RoutingResponse
&
routing
)
{
routing_res
ult
_
=
routing
;
routing_res
ponse
_
=
routing
;
}
void
Frame
::
SetPlanningStartPoint
(
const
common
::
TrajectoryPoint
&
start_point
)
{
...
...
@@ -99,7 +99,7 @@ bool Frame::Init() {
return
false
;
}
std
::
vector
<
ReferenceLine
>
reference_lines
;
if
(
!
CreateReferenceLineFromRouting
(
init_pose_
.
position
(),
routing_res
ult
_
,
if
(
!
CreateReferenceLineFromRouting
(
init_pose_
.
position
(),
routing_res
ponse
_
,
&
reference_lines
))
{
AERROR
<<
"Failed to create reference line from position: "
<<
init_pose_
.
DebugString
();
...
...
@@ -116,7 +116,7 @@ bool Frame::Init() {
reference_line_
);
if
(
FLAGS_enable_traffic_decision
)
{
MakeTrafficDecision
(
routing_res
ult
_
,
reference_line_
);
MakeTrafficDecision
(
routing_res
ponse
_
,
reference_line_
);
}
return
true
;
...
...
@@ -186,11 +186,11 @@ void Frame::RecordInputDebug() {
auto
debug_chassis
=
planning_data
->
mutable_chassis
();
debug_chassis
->
CopyFrom
(
chassis
);
const
auto
&
routing_res
ult
=
const
auto
&
routing_res
ponse
=
AdapterManager
::
GetRoutingResponse
()
->
GetLatestObserved
();
auto
debug_routing
=
planning_data
->
mutable_routing
();
debug_routing
->
CopyFrom
(
routing_res
ult
);
debug_routing
->
CopyFrom
(
routing_res
ponse
);
}
}
// namespace planning
...
...
modules/planning/common/frame.h
浏览文件 @
cb06b0a5
...
...
@@ -122,7 +122,7 @@ class Frame {
private:
common
::
TrajectoryPoint
planning_start_point_
;
routing
::
RoutingResponse
routing_res
ult
_
;
routing
::
RoutingResponse
routing_res
ponse
_
;
prediction
::
PredictionObstacles
prediction_
;
IndexedObstacles
obstacles_
;
std
::
unique_ptr
<
PathDecision
>
path_decision_
;
...
...
modules/planning/integration_tests/planning_test_base.cc
浏览文件 @
cb06b0a5
...
...
@@ -24,7 +24,7 @@ namespace planning {
using
common
::
adapter
::
AdapterManager
;
DEFINE_string
(
test_routing_res
ult
_file
,
DEFINE_string
(
test_routing_res
ponse
_file
,
"modules/planning/testdata/garage_routing.pb.txt"
,
"The routing file used in test"
);
DEFINE_string
(
test_localization_file
,
...
...
@@ -69,8 +69,8 @@ bool PlanningTestBase::SetUpAdapters() {
return
false
;
}
if
(
!
AdapterManager
::
FeedRoutingResponseFile
(
FLAGS_test_routing_res
ult
_file
))
{
AERROR
<<
"failed to routing file: "
<<
FLAGS_test_routing_res
ult
_file
;
FLAGS_test_routing_res
ponse
_file
))
{
AERROR
<<
"failed to routing file: "
<<
FLAGS_test_routing_res
ponse
_file
;
return
false
;
}
if
(
!
AdapterManager
::
FeedLocalizationFile
(
FLAGS_test_localization_file
))
{
...
...
modules/planning/integration_tests/planning_test_base.h
浏览文件 @
cb06b0a5
...
...
@@ -34,7 +34,7 @@ namespace planning {
using
common
::
adapter
::
AdapterManager
;
DECLARE_string
(
test_routing_res
ult
_file
);
DECLARE_string
(
test_routing_res
ponse
_file
);
DECLARE_string
(
test_localization_file
);
DECLARE_string
(
test_chassis_file
);
...
...
@@ -44,12 +44,12 @@ class PlanningTestBase : public ::testing::Test {
* @brief set common data settings, such as gflags path configurations.
* If in your local test, you want to use a different file,
* call this function first, and add the new settings.
* For example, if you want to let FLAGS_test_routing_res
ult
_file =
* For example, if you want to let FLAGS_test_routing_res
ponse
_file =
* "new_routing.pb.txt", You can implement your own SetDataConfigs by
* ```
* virtual void SetDataConfigs() {
* PlanningTestBase::SetDataConfigs();
* FLAGS_test_routing_res
ult
_file = "new_routing.pb.txt"
* FLAGS_test_routing_res
ponse
_file = "new_routing.pb.txt"
* }
* ```
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录