提交 4d2ea50e 编写于 作者: A Aaron Xiao 提交者: Kecheng Xu

Prediction: Remove unused aliases.

上级 6f07dbae
......@@ -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();
......
......@@ -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) {}
......
......@@ -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)));
}
......
......@@ -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) {}
......
......@@ -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*>>;
......
......@@ -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) {
......
......@@ -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;
......
......@@ -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;
......
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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();
......
......@@ -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(
......
......@@ -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;
......
......@@ -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 =
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册