Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
884e495f
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,发现更多精彩内容 >>
提交
884e495f
编写于
2月 23, 2018
作者:
K
kechxu
提交者:
Jiangtao Hu
2月 23, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Planning: rename trajectory_generator to manipulator
上级
5ed41b23
变更
14
显示空白变更内容
内联
并排
Showing
14 changed file
with
34 addition
and
37 deletion
+34
-37
modules/planning/lattice/manipulator/BUILD
modules/planning/lattice/manipulator/BUILD
+3
-3
modules/planning/lattice/manipulator/backup_trajectory_generator.cc
...anning/lattice/manipulator/backup_trajectory_generator.cc
+2
-2
modules/planning/lattice/manipulator/backup_trajectory_generator.h
...lanning/lattice/manipulator/backup_trajectory_generator.h
+4
-4
modules/planning/lattice/manipulator/end_condition_sampler.cc
...les/planning/lattice/manipulator/end_condition_sampler.cc
+1
-1
modules/planning/lattice/manipulator/end_condition_sampler.h
modules/planning/lattice/manipulator/end_condition_sampler.h
+3
-3
modules/planning/lattice/manipulator/trajectory1d_generator.cc
...es/planning/lattice/manipulator/trajectory1d_generator.cc
+1
-1
modules/planning/lattice/manipulator/trajectory1d_generator.h
...les/planning/lattice/manipulator/trajectory1d_generator.h
+4
-4
modules/planning/lattice/manipulator/trajectory_combiner.cc
modules/planning/lattice/manipulator/trajectory_combiner.cc
+1
-1
modules/planning/lattice/manipulator/trajectory_combiner.h
modules/planning/lattice/manipulator/trajectory_combiner.h
+3
-3
modules/planning/lattice/manipulator/trajectory_evaluator.cc
modules/planning/lattice/manipulator/trajectory_evaluator.cc
+1
-1
modules/planning/lattice/manipulator/trajectory_evaluator.h
modules/planning/lattice/manipulator/trajectory_evaluator.h
+3
-3
modules/planning/planner/lattice/BUILD
modules/planning/planner/lattice/BUILD
+4
-4
modules/planning/planner/lattice/lattice_planner.cc
modules/planning/planner/lattice/lattice_planner.cc
+4
-4
modules/planning/proto/lattice_structure.proto
modules/planning/proto/lattice_structure.proto
+0
-3
未找到文件。
modules/planning/lattice/
trajectory_gener
ator/BUILD
→
modules/planning/lattice/
manipul
ator/BUILD
浏览文件 @
884e495f
...
...
@@ -38,7 +38,7 @@ cc_library(
"//modules/planning/lattice/trajectory1d:piecewise_acceleration_trajectory1d"
,
"//modules/planning/lattice/trajectory1d:constant_deceleration_trajectory1d"
,
"//modules/planning/lattice/trajectory1d:piecewise_trajectory1d"
,
"//modules/planning/lattice/
trajectory_gener
ator:end_condition_sampler"
,
"//modules/planning/lattice/
manipul
ator:end_condition_sampler"
,
"//modules/planning/math/curve1d:quartic_polynomial_curve1d"
,
"//modules/planning/math/curve1d:quintic_polynomial_curve1d"
,
"//modules/planning/proto:lattice_sampling_config_proto"
,
...
...
@@ -77,8 +77,8 @@ cc_library(
"//modules/planning/common:planning_gflags"
,
"//modules/planning/common/trajectory:discretized_trajectory"
,
"//modules/planning/lattice/trajectory1d:constant_deceleration_trajectory1d"
,
"//modules/planning/lattice/
trajectory_gener
ator:trajectory1d_generator"
,
"//modules/planning/lattice/
trajectory_gener
ator:trajectory_combiner"
,
"//modules/planning/lattice/
manipul
ator:trajectory1d_generator"
,
"//modules/planning/lattice/
manipul
ator:trajectory_combiner"
,
"//modules/planning/math/curve1d"
,
],
)
...
...
modules/planning/lattice/
trajectory_gener
ator/backup_trajectory_generator.cc
→
modules/planning/lattice/
manipul
ator/backup_trajectory_generator.cc
浏览文件 @
884e495f
...
...
@@ -14,8 +14,8 @@
* limitations under the License.
*****************************************************************************/
#include "modules/planning/lattice/
trajectory_gener
ator/backup_trajectory_generator.h"
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory_combiner.h"
#include "modules/planning/lattice/
manipul
ator/backup_trajectory_generator.h"
#include "modules/planning/lattice/
manipul
ator/trajectory_combiner.h"
namespace
apollo
{
namespace
planning
{
...
...
modules/planning/lattice/
trajectory_gener
ator/backup_trajectory_generator.h
→
modules/planning/lattice/
manipul
ator/backup_trajectory_generator.h
浏览文件 @
884e495f
...
...
@@ -18,8 +18,8 @@
* @file
**/
#ifndef MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_BACKUP_TRAJECTORY_H_
#define MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_BACKUP_TRAJECTORY_H_
#ifndef MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_BACKUP_TRAJECTORY_H_
#define MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_BACKUP_TRAJECTORY_H_
#include <array>
#include <functional>
...
...
@@ -31,7 +31,7 @@
#include "modules/planning/common/planning_gflags.h"
#include "modules/planning/common/trajectory/discretized_trajectory.h"
#include "modules/planning/lattice/trajectory1d/constant_deceleration_trajectory1d.h"
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory1d_generator.h"
#include "modules/planning/lattice/
manipul
ator/trajectory1d_generator.h"
#include "modules/planning/math/curve1d/curve1d.h"
namespace
apollo
{
...
...
@@ -87,4 +87,4 @@ class BackupTrajectoryGenerator {
}
// namespace planning
}
// namespace apollo
#endif // MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_BACKUP_TRAJECTORY_H_
#endif // MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_BACKUP_TRAJECTORY_H_
modules/planning/lattice/
trajectory_gener
ator/end_condition_sampler.cc
→
modules/planning/lattice/
manipul
ator/end_condition_sampler.cc
浏览文件 @
884e495f
...
...
@@ -18,7 +18,7 @@
* @file
**/
#include "modules/planning/lattice/
trajectory_gener
ator/end_condition_sampler.h"
#include "modules/planning/lattice/
manipul
ator/end_condition_sampler.h"
#include <algorithm>
#include <utility>
...
...
modules/planning/lattice/
trajectory_gener
ator/end_condition_sampler.h
→
modules/planning/lattice/
manipul
ator/end_condition_sampler.h
浏览文件 @
884e495f
...
...
@@ -18,8 +18,8 @@
* @file
**/
#ifndef MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_END_CONDITION_SAMPLER_H_
#define MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_END_CONDITION_SAMPLER_H_
#ifndef MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_END_CONDITION_SAMPLER_H_
#define MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_END_CONDITION_SAMPLER_H_
#include <array>
#include <utility>
...
...
@@ -75,4 +75,4 @@ class EndConditionSampler {
}
// namespace planning
}
// namespace apollo
#endif //
PLANNING_LATTICE_TRAJECTORY_GENER
ATOR_END_CONDITION_SAMPLER_H_
#endif //
MODULES_PLANNING_LATTICE_MANIPUL
ATOR_END_CONDITION_SAMPLER_H_
modules/planning/lattice/
trajectory_gener
ator/trajectory1d_generator.cc
→
modules/planning/lattice/
manipul
ator/trajectory1d_generator.cc
浏览文件 @
884e495f
...
...
@@ -18,7 +18,7 @@
* @file
**/
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory1d_generator.h"
#include "modules/planning/lattice/
manipul
ator/trajectory1d_generator.h"
#include <algorithm>
#include <cmath>
...
...
modules/planning/lattice/
trajectory_gener
ator/trajectory1d_generator.h
→
modules/planning/lattice/
manipul
ator/trajectory1d_generator.h
浏览文件 @
884e495f
...
...
@@ -18,13 +18,13 @@
* @file
**/
#ifndef MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_TRAJECTORY1D_GENERATOR_H_
#define MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_TRAJECTORY1D_GENERATOR_H_
#ifndef MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_TRAJECTORY1D_GENERATOR_H_
#define MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_TRAJECTORY1D_GENERATOR_H_
#include <memory>
#include <vector>
#include "modules/planning/lattice/
trajectory_gener
ator/end_condition_sampler.h"
#include "modules/planning/lattice/
manipul
ator/end_condition_sampler.h"
#include "modules/planning/lattice/behavior_decider/path_time_graph.h"
#include "modules/planning/lattice/behavior_decider/prediction_querier.h"
#include "modules/planning/math/curve1d/curve1d.h"
...
...
@@ -76,4 +76,4 @@ class Trajectory1dGenerator {
}
// namespace planning
}
// namespace apollo
#endif //
PLANNING_LATTICE_TRAJECTORY_GENER
ATOR_TRAJECTORY1D_GENERATOR_H_
#endif //
MODULES_PLANNING_LATTICE_MANIPUL
ATOR_TRAJECTORY1D_GENERATOR_H_
modules/planning/lattice/
trajectory_gener
ator/trajectory_combiner.cc
→
modules/planning/lattice/
manipul
ator/trajectory_combiner.cc
浏览文件 @
884e495f
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*****************************************************************************/
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory_combiner.h"
#include "modules/planning/lattice/
manipul
ator/trajectory_combiner.h"
#include <algorithm>
...
...
modules/planning/lattice/
trajectory_gener
ator/trajectory_combiner.h
→
modules/planning/lattice/
manipul
ator/trajectory_combiner.h
浏览文件 @
884e495f
...
...
@@ -18,8 +18,8 @@
* @file
**/
#ifndef MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_TRAJECTORY_COMBINER_H_
#define MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_TRAJECTORY_COMBINER_H_
#ifndef MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_TRAJECTORY_COMBINER_H_
#define MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_TRAJECTORY_COMBINER_H_
#include <vector>
...
...
@@ -41,4 +41,4 @@ class TrajectoryCombiner {
}
// namespace planning
}
// namespace apollo
#endif // MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_TRAJECTORY_COMBINER_H_
#endif // MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_TRAJECTORY_COMBINER_H_
modules/planning/lattice/
trajectory_gener
ator/trajectory_evaluator.cc
→
modules/planning/lattice/
manipul
ator/trajectory_evaluator.cc
浏览文件 @
884e495f
...
...
@@ -18,7 +18,7 @@
* @file
**/
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory_evaluator.h"
#include "modules/planning/lattice/
manipul
ator/trajectory_evaluator.h"
#include <cmath>
#include <functional>
...
...
modules/planning/lattice/
trajectory_gener
ator/trajectory_evaluator.h
→
modules/planning/lattice/
manipul
ator/trajectory_evaluator.h
浏览文件 @
884e495f
...
...
@@ -18,8 +18,8 @@
* @file
**/
#ifndef MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_TRAJECTORY_EVALUATOR_H_
#define MODULES_PLANNING_LATTICE_
TRAJECTORY_GENER
ATOR_TRAJECTORY_EVALUATOR_H_
#ifndef MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_TRAJECTORY_EVALUATOR_H_
#define MODULES_PLANNING_LATTICE_
MANIPUL
ATOR_TRAJECTORY_EVALUATOR_H_
#include <functional>
#include <memory>
...
...
@@ -126,4 +126,4 @@ class TrajectoryEvaluator {
}
// namespace planning
}
// namespace apollo
#endif //
PLANNING_LATTICE_TRAJECTORY_GENER
ATOR_TRAJECTORY_EVALUATOR_H_
#endif //
MODULES_PLANNING_LATTICE_MANIPUL
ATOR_TRAJECTORY_EVALUATOR_H_
modules/planning/planner/lattice/BUILD
浏览文件 @
884e495f
...
...
@@ -20,10 +20,10 @@ cc_library(
"//modules/planning/constraint_checker:collision_checker"
,
"//modules/planning/lattice/behavior_decider"
,
"//modules/planning/lattice/behavior_decider:path_time_graph"
,
"//modules/planning/lattice/
trajectory_gener
ator:backup_trajectory_generator"
,
"//modules/planning/lattice/
trajectory_gener
ator:trajectory1d_generator"
,
"//modules/planning/lattice/
trajectory_gener
ator:trajectory_combiner"
,
"//modules/planning/lattice/
trajectory_gener
ator:trajectory_evaluator"
,
"//modules/planning/lattice/
manipul
ator:backup_trajectory_generator"
,
"//modules/planning/lattice/
manipul
ator:trajectory1d_generator"
,
"//modules/planning/lattice/
manipul
ator:trajectory_combiner"
,
"//modules/planning/lattice/
manipul
ator:trajectory_evaluator"
,
"//modules/planning/lattice/trajectory1d:lattice_trajectory1d"
,
"//modules/planning/planner"
,
"//modules/planning/proto:planning_proto"
,
...
...
modules/planning/planner/lattice/lattice_planner.cc
浏览文件 @
884e495f
...
...
@@ -37,10 +37,10 @@
#include "modules/planning/constraint_checker/constraint_checker.h"
#include "modules/planning/lattice/behavior_decider/path_time_graph.h"
#include "modules/planning/lattice/behavior_decider/prediction_querier.h"
#include "modules/planning/lattice/
trajectory_gener
ator/backup_trajectory_generator.h"
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory1d_generator.h"
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory_combiner.h"
#include "modules/planning/lattice/
trajectory_gener
ator/trajectory_evaluator.h"
#include "modules/planning/lattice/
manipul
ator/backup_trajectory_generator.h"
#include "modules/planning/lattice/
manipul
ator/trajectory1d_generator.h"
#include "modules/planning/lattice/
manipul
ator/trajectory_combiner.h"
#include "modules/planning/lattice/
manipul
ator/trajectory_evaluator.h"
#include "modules/planning/lattice/trajectory1d/lattice_trajectory1d.h"
namespace
apollo
{
...
...
modules/planning/proto/lattice_structure.proto
浏览文件 @
884e495f
...
...
@@ -2,9 +2,6 @@ syntax = "proto2";
package
apollo
.
planning
;
import
"modules/common/proto/pnc_point.proto"
;
import
"modules/planning/proto/lattice_sampling_config.proto"
;
message
PathTimePoint
{
optional
double
t
=
1
;
optional
double
s
=
2
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录