From b1de908c39cea100aa22fc154827002a05c200d6 Mon Sep 17 00:00:00 2001 From: kechxu Date: Mon, 17 Jul 2017 12:20:23 -0700 Subject: [PATCH] some tiny changes --- modules/prediction/container/obstacles/obstacle.cc | 12 ++++++------ modules/prediction/container/obstacles/obstacle.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/prediction/container/obstacles/obstacle.cc b/modules/prediction/container/obstacles/obstacle.cc index e7f5758358..6a93fe7616 100644 --- a/modules/prediction/container/obstacles/obstacle.cc +++ b/modules/prediction/container/obstacles/obstacle.cc @@ -36,7 +36,7 @@ std::mutex Obstacle::mutex_; namespace { double Damp(const double x, const double sigma) { - return 1 / (1 + exp(1 / (std::fabs(x) + sigma))); + return 1 / (1 + exp(1 / (std::fabs(x) + sigma))); } } // namespace @@ -46,7 +46,7 @@ Obstacle::Obstacle() : type_(PerceptionObstacle::UNKNOWN_MOVABLE), feature_history_(0), kf_motion_tracker_(), - kf_lane_tracker_map_(0) { + kf_lane_trackers_(0) { } @@ -54,7 +54,7 @@ Obstacle::~Obstacle() { id_ = -1; type_ = PerceptionObstacle::UNKNOWN_UNMOVABLE; feature_history_.clear(); - kf_lane_tracker_map_.clear(); + kf_lane_trackers_.clear(); // TODO(author) current_lanes_.clear(); } @@ -103,9 +103,9 @@ size_t Obstacle::history_size() const { } const KalmanFilter& Obstacle::kf_lane_tracker( - const std::string& lane_id) { - CHECK(kf_lane_tracker_map_.find(lane_id) != kf_lane_tracker_map_.end()); - return kf_lane_tracker_map_[lane_id]; + const std::string& lane_id) { + CHECK(kf_lane_trackers_.find(lane_id) != kf_lane_trackers_.end()); + return kf_lane_trackers_[lane_id]; } void Obstacle::Insert(const PerceptionObstacle& perception_obstacle, diff --git a/modules/prediction/container/obstacles/obstacle.h b/modules/prediction/container/obstacles/obstacle.h index 66cea1f10e..b8aae23f73 100644 --- a/modules/prediction/container/obstacles/obstacle.h +++ b/modules/prediction/container/obstacles/obstacle.h @@ -109,7 +109,7 @@ class Obstacle { std::deque feature_history_; apollo::common::math::KalmanFilter kf_motion_tracker_; std::unordered_map> kf_lane_tracker_map_; + apollo::common::math::KalmanFilter> kf_lane_trackers_; // TODO(author) std::vector _current_lanes; static std::mutex mutex_; }; -- GitLab