Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
f928a544
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,发现更多精彩内容 >>
提交
f928a544
编写于
10月 25, 2017
作者:
L
liyunADU
提交者:
Yajia Zhang
10月 26, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add switch for new reference line
Integrate new reference line
上级
2823096a
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
30 addition
and
7 deletion
+30
-7
modules/planning/common/planning_gflags.cc
modules/planning/common/planning_gflags.cc
+3
-0
modules/planning/common/planning_gflags.h
modules/planning/common/planning_gflags.h
+1
-0
modules/planning/conf/planning.conf
modules/planning/conf/planning.conf
+1
-0
modules/planning/reference_line/BUILD
modules/planning/reference_line/BUILD
+1
-0
modules/planning/reference_line/reference_line_provider.cc
modules/planning/reference_line/reference_line_provider.cc
+15
-4
modules/planning/reference_line/reference_line_provider.h
modules/planning/reference_line/reference_line_provider.h
+1
-0
modules/planning/reference_line/spiral_reference_line_smoother.cc
...planning/reference_line/spiral_reference_line_smoother.cc
+2
-1
third_party/ipopt.BUILD
third_party/ipopt.BUILD
+6
-2
未找到文件。
modules/planning/common/planning_gflags.cc
浏览文件 @
f928a544
...
...
@@ -52,6 +52,9 @@ DEFINE_double(look_forward_time_sec, 8,
DEFINE_bool
(
enable_smooth_reference_line
,
true
,
"enable smooth the map reference line"
);
DEFINE_bool
(
enable_spiral_reference_line
,
false
,
"enable new spiral based reference line"
);
DEFINE_int32
(
max_history_frame_num
,
5
,
"The maximum history frame number"
);
DEFINE_double
(
max_collision_distance
,
0.1
,
...
...
modules/planning/common/planning_gflags.h
浏览文件 @
f928a544
...
...
@@ -31,6 +31,7 @@ DECLARE_double(look_forward_min_distance);
DECLARE_double
(
look_forward_time_sec
);
DECLARE_bool
(
enable_smooth_reference_line
);
DECLARE_bool
(
enable_spiral_reference_line
);
DECLARE_double
(
max_collision_distance
);
DECLARE_bool
(
publish_estop
);
DECLARE_bool
(
enable_trajectory_stitcher
);
...
...
modules/planning/conf/planning.conf
浏览文件 @
f928a544
--
flagfile
=
modules
/
common
/
data
/
global_flagfile
.
txt
--
nouse_ros_time
--
planning_upper_speed_limit
=
31
.
3
--
noenable_spiral_reference_line
modules/planning/reference_line/BUILD
浏览文件 @
f928a544
...
...
@@ -57,6 +57,7 @@ cc_library(
deps
=
[
"reference_line"
,
"reference_line_smoother"
,
"spiral_reference_line_smoother"
,
"//modules/map/pnc_map"
,
],
)
...
...
modules/planning/reference_line/reference_line_provider.cc
浏览文件 @
f928a544
...
...
@@ -148,6 +148,10 @@ bool ReferenceLineProvider::CreateReferenceLineFromRouting(
ReferenceLineSmoother
smoother
;
smoother
.
Init
(
smoother_config_
);
SpiralReferenceLineSmoother
spiral_smoother
;
double
max_spiral_smoother_dev
=
0.1
;
spiral_smoother
.
set_max_point_deviation
(
max_spiral_smoother_dev
);
std
::
vector
<
ReferenceLine
>
reference_lines
;
std
::
vector
<
hdmap
::
RouteSegments
>
segments
;
for
(
const
auto
&
lanes
:
route_segments
)
{
...
...
@@ -156,10 +160,17 @@ bool ReferenceLineProvider::CreateReferenceLineFromRouting(
if
(
FLAGS_enable_smooth_reference_line
)
{
ReferenceLine
raw_reference_line
(
hdmap_path
);
ReferenceLine
reference_line
;
if
(
!
smoother
.
Smooth
(
raw_reference_line
,
&
reference_line
,
spline_solver_
.
get
()))
{
AERROR
<<
"Failed to smooth reference line"
;
continue
;
if
(
FLAGS_enable_spiral_reference_line
)
{
if
(
!
spiral_smoother
.
Smooth
(
raw_reference_line
,
&
reference_line
))
{
AERROR
<<
"Failed to smooth reference_line with spiral smoother"
;
}
}
else
{
if
(
!
smoother
.
Smooth
(
raw_reference_line
,
&
reference_line
,
spline_solver_
.
get
()))
{
AERROR
<<
"Failed to smooth reference line"
;
continue
;
}
}
bool
is_valid_reference_line
=
true
;
...
...
modules/planning/reference_line/reference_line_provider.h
浏览文件 @
f928a544
...
...
@@ -33,6 +33,7 @@
#include "modules/planning/math/smoothing_spline/spline_2d_solver.h"
#include "modules/planning/reference_line/reference_line.h"
#include "modules/planning/reference_line/reference_line_smoother.h"
#include "modules/planning/reference_line/spiral_reference_line_smoother.h"
/**
* @namespace apollo::planning
...
...
modules/planning/reference_line/spiral_reference_line_smoother.cc
浏览文件 @
f928a544
...
...
@@ -106,7 +106,8 @@ bool SpiralReferenceLineSmoother::Smooth(
// app->Options()->SetNumericValue("derivative_test_perturbation", 1.0e-7);
// app->Options()->SetStringValue("derivative_test", "second-order");
app
->
Options
()
->
SetIntegerValue
(
"print_level"
,
0
);
app
->
Options
()
->
SetIntegerValue
(
"max_iter"
,
1000
);
int
num_iterations
=
10
;
app
->
Options
()
->
SetIntegerValue
(
"max_iter"
,
num_iterations
);
// app->Options()->SetNumericValue("acceptable_tol", 0.5);
// app->Options()->SetNumericValue("acceptable_obj_change_tol", 0.5);
...
...
third_party/ipopt.BUILD
浏览文件 @
f928a544
...
...
@@ -6,7 +6,11 @@ cc_library(
name = "ipopt",
includes = ["."],
linkopts = [
"-lcoinmumps",
"-lipopt",
"-L/usr/local/ipopt/lib -lipopt",
"-L/usr/local/ipopt/lib -lcoinmumps",
"-lblas",
"-llapack",
"-ldl",
"-lgfortran",
],
)
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录