提交 7a37f5f7 编写于 作者: K kechxu 提交者: Kecheng Xu

Prediction: code clean, move some consts to gflags and refactor some logic

上级 d7236761
...@@ -54,6 +54,9 @@ DEFINE_double(pedestrian_nearby_lane_search_radius, 5.0, ...@@ -54,6 +54,9 @@ DEFINE_double(pedestrian_nearby_lane_search_radius, 5.0,
DEFINE_int32(road_graph_max_search_horizon, 20, DEFINE_int32(road_graph_max_search_horizon, 20,
"Maximal search depth for building road graph"); "Maximal search depth for building road graph");
// Semantic Map
DEFINE_double(base_image_half_range, 100.0, "The half range of base image.");
// Scenario // Scenario
DEFINE_double(junction_distance_threshold, 10.0, DEFINE_double(junction_distance_threshold, 10.0,
"Distance threshold " "Distance threshold "
......
...@@ -42,6 +42,9 @@ DECLARE_double(junction_search_radius); ...@@ -42,6 +42,9 @@ DECLARE_double(junction_search_radius);
DECLARE_double(pedestrian_nearby_lane_search_radius); DECLARE_double(pedestrian_nearby_lane_search_radius);
DECLARE_int32(road_graph_max_search_horizon); DECLARE_int32(road_graph_max_search_horizon);
// Semantic Map
DECLARE_double(base_image_half_range);
// Scenario // Scenario
DECLARE_double(junction_distance_threshold); DECLARE_double(junction_distance_threshold);
DECLARE_bool(enable_all_junction); DECLARE_bool(enable_all_junction);
......
...@@ -41,6 +41,7 @@ SemanticMap::SemanticMap() {} ...@@ -41,6 +41,7 @@ SemanticMap::SemanticMap() {}
void SemanticMap::Init() { void SemanticMap::Init() {
curr_base_img_ = cv::Mat(2000, 2000, CV_8UC3, cv::Scalar(0, 0, 0)); curr_base_img_ = cv::Mat(2000, 2000, CV_8UC3, cv::Scalar(0, 0, 0));
curr_img_ = cv::Mat(2000, 2000, CV_8UC3, cv::Scalar(0, 0, 0)); curr_img_ = cv::Mat(2000, 2000, CV_8UC3, cv::Scalar(0, 0, 0));
obstacle_id_history_map_.clear();
} }
void SemanticMap::RunCurrFrame( void SemanticMap::RunCurrFrame(
...@@ -50,14 +51,13 @@ void SemanticMap::RunCurrFrame( ...@@ -50,14 +51,13 @@ void SemanticMap::RunCurrFrame(
return; return;
} }
obstacle_id_history_map_ = obstacle_id_history_map; ego_feature_ = obstacle_id_history_map.at(FLAGS_ego_vehicle_id).feature(0);
ego_feature_ = obstacle_id_history_map_.at(FLAGS_ego_vehicle_id).feature(0);
// TODO(all): move to somewhere else // TODO(all): move to somewhere else
if (!FLAGS_enable_async_draw_base_image) { if (!FLAGS_enable_async_draw_base_image) {
double x = ego_feature_.position().x(); double x = ego_feature_.position().x();
double y = ego_feature_.position().y(); double y = ego_feature_.position().y();
curr_base_x_ = x - 100.0; curr_base_x_ = x - FLAGS_base_image_half_range;
curr_base_y_ = y - 100.0; curr_base_y_ = y - FLAGS_base_image_half_range;
DrawBaseMap(x, y, curr_base_x_, curr_base_y_); DrawBaseMap(x, y, curr_base_x_, curr_base_y_);
base_img_.copyTo(curr_base_img_); base_img_.copyTo(curr_base_img_);
} else { } else {
...@@ -74,11 +74,13 @@ void SemanticMap::RunCurrFrame( ...@@ -74,11 +74,13 @@ void SemanticMap::RunCurrFrame(
curr_base_img_.copyTo(curr_img_); curr_base_img_.copyTo(curr_img_);
// Draw all obstacles_history // Draw all obstacles_history
for (const auto obstacle_id_history_pair : obstacle_id_history_map_) { for (const auto obstacle_id_history_pair : obstacle_id_history_map) {
DrawHistory(obstacle_id_history_pair.second, cv::Scalar(0, 255, 255), DrawHistory(obstacle_id_history_pair.second, cv::Scalar(0, 255, 255),
curr_base_x_, curr_base_y_, &curr_img_); curr_base_x_, curr_base_y_, &curr_img_);
} }
obstacle_id_history_map_ = obstacle_id_history_map;
// Crop ego_vehicle for demo // Crop ego_vehicle for demo
if (true) { if (true) {
cv::Mat output_img; cv::Mat output_img;
...@@ -105,8 +107,8 @@ void SemanticMap::DrawBaseMap(const double x, const double y, ...@@ -105,8 +107,8 @@ void SemanticMap::DrawBaseMap(const double x, const double y,
void SemanticMap::DrawBaseMapThread() { void SemanticMap::DrawBaseMapThread() {
double x = ego_feature_.position().x(); double x = ego_feature_.position().x();
double y = ego_feature_.position().y(); double y = ego_feature_.position().y();
base_x_ = x - 100.0; base_x_ = x - FLAGS_base_image_half_range;
base_y_ = y - 100.0; base_y_ = y - FLAGS_base_image_half_range;
DrawBaseMap(x, y, base_x_, base_y_); DrawBaseMap(x, y, base_x_, base_y_);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册