Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
4d2ea50e
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,发现更多精彩内容 >>
提交
4d2ea50e
编写于
12月 15, 2019
作者:
A
Aaron Xiao
提交者:
Kecheng Xu
12月 16, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prediction: Remove unused aliases.
上级
6f07dbae
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
31 addition
and
72 deletion
+31
-72
modules/prediction/common/message_process.cc
modules/prediction/common/message_process.cc
+2
-2
modules/prediction/container/adc_trajectory/adc_trajectory_container.cc
...tion/container/adc_trajectory/adc_trajectory_container.cc
+5
-6
modules/prediction/container/obstacles/obstacle.cc
modules/prediction/container/obstacles/obstacle.cc
+6
-9
modules/prediction/container/obstacles/obstacles_container.cc
...les/prediction/container/obstacles/obstacles_container.cc
+0
-1
modules/prediction/evaluator/evaluator_manager.cc
modules/prediction/evaluator/evaluator_manager.cc
+0
-1
modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.cc
.../evaluator/pedestrian/pedestrian_interaction_evaluator.cc
+0
-5
modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.cc
modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.cc
+0
-3
modules/prediction/evaluator/vehicle/junction_mlp_evaluator.cc
...es/prediction/evaluator/vehicle/junction_mlp_evaluator.cc
+0
-1
modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.cc
...rediction/evaluator/vehicle/lane_aggregating_evaluator.cc
+0
-7
modules/prediction/evaluator/vehicle/lane_scanning_evaluator.cc
...s/prediction/evaluator/vehicle/lane_scanning_evaluator.cc
+0
-2
modules/prediction/prediction_component.cc
modules/prediction/prediction_component.cc
+0
-2
modules/prediction/predictor/extrapolation/extrapolation_predictor.cc
...iction/predictor/extrapolation/extrapolation_predictor.cc
+0
-1
modules/prediction/predictor/free_move/free_move_predictor.cc
...les/prediction/predictor/free_move/free_move_predictor.cc
+2
-2
modules/prediction/predictor/interaction/interaction_predictor.cc
...prediction/predictor/interaction/interaction_predictor.cc
+0
-2
modules/prediction/predictor/move_sequence/move_sequence_predictor.cc
...iction/predictor/move_sequence/move_sequence_predictor.cc
+5
-6
modules/prediction/predictor/predictor_manager.cc
modules/prediction/predictor/predictor_manager.cc
+3
-6
modules/prediction/predictor/sequence/sequence_predictor.cc
modules/prediction/predictor/sequence/sequence_predictor.cc
+0
-1
modules/prediction/scenario/prioritization/obstacles_prioritizer.cc
...ediction/scenario/prioritization/obstacles_prioritizer.cc
+6
-6
modules/prediction/scenario/right_of_way/right_of_way.cc
modules/prediction/scenario/right_of_way/right_of_way.cc
+2
-4
modules/prediction/scenario/scenario_manager.cc
modules/prediction/scenario/scenario_manager.cc
+0
-5
未找到文件。
modules/prediction/common/message_process.cc
浏览文件 @
4d2ea50e
...
...
@@ -39,13 +39,13 @@ namespace apollo {
namespace
prediction
{
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
cyber
::
record
::
RecordMessage
;
using
apollo
::
cyber
::
record
::
RecordReader
;
using
apollo
::
localization
::
LocalizationEstimate
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
apollo
::
perception
::
PerceptionObstacles
;
using
apollo
::
planning
::
ADCTrajectory
;
using
apollo
::
storytelling
::
Stories
;
using
cyber
::
record
::
RecordMessage
;
using
cyber
::
record
::
RecordReader
;
bool
MessageProcess
::
Init
()
{
InitContainers
();
...
...
modules/prediction/container/adc_trajectory/adc_trajectory_container.cc
浏览文件 @
4d2ea50e
...
...
@@ -23,12 +23,11 @@
namespace
apollo
{
namespace
prediction
{
using
::
apollo
::
common
::
PathPoint
;
using
::
apollo
::
common
::
math
::
Polygon2d
;
using
::
apollo
::
common
::
math
::
Vec2d
;
using
::
apollo
::
hdmap
::
JunctionInfo
;
using
::
apollo
::
hdmap
::
PNCJunctionInfo
;
using
::
apollo
::
planning
::
ADCTrajectory
;
using
apollo
::
common
::
PathPoint
;
using
apollo
::
common
::
math
::
Polygon2d
;
using
apollo
::
common
::
math
::
Vec2d
;
using
apollo
::
hdmap
::
JunctionInfo
;
using
apollo
::
planning
::
ADCTrajectory
;
ADCTrajectoryContainer
::
ADCTrajectoryContainer
()
:
adc_junction_info_ptr_
(
nullptr
),
s_dist_to_junction_
(
0.0
)
{}
...
...
modules/prediction/container/obstacles/obstacle.cc
浏览文件 @
4d2ea50e
...
...
@@ -26,17 +26,14 @@
namespace
apollo
{
namespace
prediction
{
using
common
::
ErrorCode
;
using
common
::
PathPoint
;
using
common
::
Point3D
;
using
common
::
math
::
KalmanFilter
;
using
hdmap
::
JunctionInfo
;
using
hdmap
::
LaneInfo
;
using
perception
::
PerceptionObstacle
;
namespace
{
using
apollo
::
common
::
PathPoint
;
using
apollo
::
common
::
Point3D
;
using
apollo
::
hdmap
::
JunctionInfo
;
using
apollo
::
hdmap
::
LaneInfo
;
using
apollo
::
perception
::
PerceptionObstacle
;
double
Damp
(
const
double
x
,
const
double
sigma
)
{
return
1.0
/
(
1.0
+
std
::
exp
(
1.0
/
(
std
::
fabs
(
x
)
+
sigma
)));
}
...
...
modules/prediction/container/obstacles/obstacles_container.cc
浏览文件 @
4d2ea50e
...
...
@@ -31,7 +31,6 @@ namespace prediction {
using
apollo
::
perception
::
PerceptionObstacle
;
using
apollo
::
perception
::
PerceptionObstacles
;
using
apollo
::
prediction
::
PredictionConstants
;
ObstaclesContainer
::
ObstaclesContainer
()
:
ptr_obstacles_
(
FLAGS_max_num_obstacles
)
{}
...
...
modules/prediction/evaluator/evaluator_manager.cc
浏览文件 @
4d2ea50e
...
...
@@ -41,7 +41,6 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
IdObstacleListMap
=
std
::
unordered_map
<
int
,
std
::
list
<
Obstacle
*>>
;
...
...
modules/prediction/evaluator/pedestrian/pedestrian_interaction_evaluator.cc
浏览文件 @
4d2ea50e
...
...
@@ -30,12 +30,7 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
common
::
Point3D
;
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
common
::
math
::
Vec2d
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
apollo
::
perception
::
PerceptionObstacles
;
PedestrianInteractionEvaluator
::
PedestrianInteractionEvaluator
()
:
device_
(
torch
::
kCPU
)
{
...
...
modules/prediction/evaluator/vehicle/cruise_mlp_evaluator.cc
浏览文件 @
4d2ea50e
...
...
@@ -32,9 +32,6 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
cyber
::
common
::
GetProtoFromFile
;
// Helper function for computing the mean value of a vector.
double
ComputeMean
(
const
std
::
vector
<
double
>&
nums
,
size_t
start
,
size_t
end
)
{
int
count
=
0
;
...
...
modules/prediction/evaluator/vehicle/junction_mlp_evaluator.cc
浏览文件 @
4d2ea50e
...
...
@@ -37,7 +37,6 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
prediction
::
math_util
::
ComputePolynomial
;
using
apollo
::
prediction
::
math_util
::
EvaluateCubicPolynomial
;
...
...
modules/prediction/evaluator/vehicle/lane_aggregating_evaluator.cc
浏览文件 @
4d2ea50e
...
...
@@ -29,13 +29,6 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
common
::
Point3D
;
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
common
::
math
::
Vec2d
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
apollo
::
perception
::
PerceptionObstacles
;
LaneAggregatingEvaluator
::
LaneAggregatingEvaluator
()
:
device_
(
torch
::
kCPU
)
{
evaluator_type_
=
ObstacleConf
::
LANE_AGGREGATING_EVALUATOR
;
LoadModel
();
...
...
modules/prediction/evaluator/vehicle/lane_scanning_evaluator.cc
浏览文件 @
4d2ea50e
...
...
@@ -34,9 +34,7 @@ namespace apollo {
namespace
prediction
{
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
common
::
math
::
Vec2d
;
using
apollo
::
cyber
::
common
::
GetProtoFromFile
;
LaneScanningEvaluator
::
LaneScanningEvaluator
()
:
device_
(
torch
::
kCPU
)
{
evaluator_type_
=
ObstacleConf
::
LANE_SCANNING_EVALUATOR
;
...
...
modules/prediction/prediction_component.cc
浏览文件 @
4d2ea50e
...
...
@@ -37,8 +37,6 @@ namespace prediction {
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
common
::
time
::
Clock
;
using
apollo
::
localization
::
LocalizationEstimate
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
apollo
::
perception
::
PerceptionObstacles
;
using
apollo
::
planning
::
ADCTrajectory
;
...
...
modules/prediction/predictor/extrapolation/extrapolation_predictor.cc
浏览文件 @
4d2ea50e
...
...
@@ -27,7 +27,6 @@ namespace prediction {
using
apollo
::
common
::
PathPoint
;
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
hdmap
::
LaneInfo
;
ExtrapolationPredictor
::
ExtrapolationPredictor
()
{
predictor_type_
=
ObstacleConf
::
EXTRAPOLATION_PREDICTOR
;
...
...
modules/prediction/predictor/free_move/free_move_predictor.cc
浏览文件 @
4d2ea50e
...
...
@@ -23,8 +23,8 @@
namespace
apollo
{
namespace
prediction
{
using
::
apollo
::
common
::
TrajectoryPoint
;
using
::
apollo
::
perception
::
PerceptionObstacle
;
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
perception
::
PerceptionObstacle
;
FreeMovePredictor
::
FreeMovePredictor
()
{
predictor_type_
=
ObstacleConf
::
FREE_MOVE_PREDICTOR
;
...
...
modules/prediction/predictor/interaction/interaction_predictor.cc
浏览文件 @
4d2ea50e
...
...
@@ -34,9 +34,7 @@ namespace apollo {
namespace
prediction
{
using
apollo
::
common
::
PathPoint
;
using
apollo
::
common
::
Point3D
;
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
hdmap
::
LaneInfo
;
using
apollo
::
prediction
::
math_util
::
GetSByConstantAcceleration
;
...
...
modules/prediction/predictor/move_sequence/move_sequence_predictor.cc
浏览文件 @
4d2ea50e
...
...
@@ -25,12 +25,11 @@
namespace
apollo
{
namespace
prediction
{
using
::
apollo
::
common
::
PathPoint
;
using
::
apollo
::
common
::
TrajectoryPoint
;
using
::
apollo
::
hdmap
::
LaneInfo
;
using
::
apollo
::
prediction
::
math_util
::
EvaluateCubicPolynomial
;
using
::
apollo
::
prediction
::
math_util
::
EvaluateQuarticPolynomial
;
using
::
apollo
::
prediction
::
math_util
::
SolveQuadraticEquation
;
using
apollo
::
common
::
PathPoint
;
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
hdmap
::
LaneInfo
;
using
apollo
::
prediction
::
math_util
::
EvaluateCubicPolynomial
;
using
apollo
::
prediction
::
math_util
::
EvaluateQuarticPolynomial
;
MoveSequencePredictor
::
MoveSequencePredictor
()
{
predictor_type_
=
ObstacleConf
::
MOVE_SEQUENCE_PREDICTOR
;
...
...
modules/prediction/predictor/predictor_manager.cc
浏览文件 @
4d2ea50e
...
...
@@ -37,15 +37,11 @@
namespace
apollo
{
namespace
prediction
{
namespace
{
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
apollo
::
perception
::
PerceptionObstacles
;
using
IdObstacleListMap
=
std
::
unordered_map
<
int
,
std
::
list
<
Obstacle
*>>
;
using
IdPredictionObstacleMap
=
std
::
unordered_map
<
int
,
std
::
shared_ptr
<
PredictionObstacle
>>
;
namespace
{
void
GroupObstaclesByObstacleId
(
const
int
obstacle_id
,
ObstaclesContainer
*
const
obstacles_container
,
...
...
@@ -185,7 +181,8 @@ void PredictorManager::PredictObstaclesInParallel(
const
PerceptionObstacles
&
perception_obstacles
,
const
ADCTrajectoryContainer
*
adc_trajectory_container
,
ObstaclesContainer
*
obstacles_container
)
{
IdPredictionObstacleMap
id_prediction_obstacle_map
;
std
::
unordered_map
<
int
,
std
::
shared_ptr
<
PredictionObstacle
>>
id_prediction_obstacle_map
;
for
(
const
PerceptionObstacle
&
perception_obstacle
:
perception_obstacles
.
perception_obstacle
())
{
int
id
=
perception_obstacle
.
id
();
...
...
modules/prediction/predictor/sequence/sequence_predictor.cc
浏览文件 @
4d2ea50e
...
...
@@ -30,7 +30,6 @@ namespace prediction {
using
apollo
::
common
::
PathPoint
;
using
apollo
::
common
::
Point3D
;
using
apollo
::
common
::
TrajectoryPoint
;
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
hdmap
::
LaneInfo
;
bool
SequencePredictor
::
Predict
(
...
...
modules/prediction/scenario/prioritization/obstacles_prioritizer.cc
浏览文件 @
4d2ea50e
...
...
@@ -32,13 +32,13 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
common
::
Point3D
;
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
common
::
math
::
Box2d
;
using
apollo
::
common
::
math
::
Vec2d
;
using
apollo
::
hdmap
::
LaneInfo
;
using
apollo
::
hdmap
::
OverlapInfo
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
common
::
Point3D
;
using
common
::
adapter
::
AdapterConfig
;
using
common
::
math
::
Box2d
;
using
common
::
math
::
Vec2d
;
using
hdmap
::
LaneInfo
;
using
hdmap
::
OverlapInfo
;
using
ConstLaneInfoPtr
=
std
::
shared_ptr
<
const
LaneInfo
>
;
static
constexpr
double
kCautionDistanceThreshold
=
60.0
;
...
...
modules/prediction/scenario/right_of_way/right_of_way.cc
浏览文件 @
4d2ea50e
...
...
@@ -32,11 +32,9 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
common
::
adapter
::
AdapterConfig
;
using
apollo
::
hdmap
::
LaneInfo
;
using
apollo
::
perception
::
PerceptionObstacle
;
using
common
::
adapter
::
AdapterConfig
;
using
hdmap
::
LaneInfo
;
using
hdmap
::
OverlapInfo
;
using
ConstLaneInfoPtr
=
std
::
shared_ptr
<
const
LaneInfo
>
;
void
RightOfWay
::
Analyze
()
{
ObstaclesContainer
*
obstacles_container
=
...
...
modules/prediction/scenario/scenario_manager.cc
浏览文件 @
4d2ea50e
...
...
@@ -21,11 +21,6 @@
namespace
apollo
{
namespace
prediction
{
using
apollo
::
perception
::
PerceptionObstacle
;
using
common
::
adapter
::
AdapterConfig
;
using
common
::
math
::
Box2d
;
using
common
::
math
::
Vec2d
;
ScenarioManager
::
ScenarioManager
()
{}
void
ScenarioManager
::
Run
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录