diff --git a/modules/prediction/container/obstacles/obstacles_container.cc b/modules/prediction/container/obstacles/obstacles_container.cc index 837eb1fb67cd6fda87144f58a2036bc4b73af57c..04680be5446cf8962901bb32bb45f1c611d56670 100644 --- a/modules/prediction/container/obstacles/obstacles_container.cc +++ b/modules/prediction/container/obstacles/obstacles_container.cc @@ -331,16 +331,12 @@ int ObstaclesContainer::PerceptionIdToPredictionId(const int perception_id) { void ObstaclesContainer::BuildLaneGraph() { // Go through every obstacle in the current frame, after some // sanity checks, build lane graph for non-junction cases. - for (const int id : curr_frame_predictable_obstacle_ids_) { + for (const int id : curr_frame_considered_obstacle_ids_) { Obstacle* obstacle_ptr = GetObstacle(id); if (obstacle_ptr == nullptr) { AERROR << "Null obstacle found."; continue; } - if (obstacle_ptr->ToIgnore()) { - ADEBUG << "Ignore obstacle [" << obstacle_ptr->id() << "]"; - continue; - } ADEBUG << "Building Lane Graph."; obstacle_ptr->BuildLaneGraph(); ADEBUG << "Building ordered Lane Graph."; @@ -360,16 +356,12 @@ void ObstaclesContainer::BuildLaneGraph() { void ObstaclesContainer::BuildJunctionFeature() { // Go through every obstacle in the current frame, after some // sanity checks, build junction features for those that are in junction. - for (const int id : curr_frame_predictable_obstacle_ids_) { + for (const int id : curr_frame_considered_obstacle_ids_) { Obstacle* obstacle_ptr = GetObstacle(id); if (obstacle_ptr == nullptr) { AERROR << "Null obstacle found."; continue; } - if (obstacle_ptr->ToIgnore()) { - ADEBUG << "Ignore obstacle [" << obstacle_ptr->id() << "]"; - continue; - } const std::string& junction_id = JunctionAnalyzer::GetJunctionId(); if (obstacle_ptr->IsInJunction(junction_id)) { ADEBUG << "Build junction feature for obstacle [" << obstacle_ptr->id() diff --git a/modules/prediction/evaluator/evaluator_manager.cc b/modules/prediction/evaluator/evaluator_manager.cc index 6b297a553277214429419b73318047e4cd0b3ddf..037a906e455c9a2e7c2caa20b0d29c4d84608c74 100644 --- a/modules/prediction/evaluator/evaluator_manager.cc +++ b/modules/prediction/evaluator/evaluator_manager.cc @@ -139,7 +139,7 @@ void EvaluatorManager::Run() { } std::vector dynamic_env; - for (int id : obstacles_container->curr_frame_predictable_obstacle_ids()) { + for (int id : obstacles_container->curr_frame_considered_obstacle_ids()) { if (id < 0) { ADEBUG << "The obstacle has invalid id [" << id << "]."; continue; @@ -149,8 +149,8 @@ void EvaluatorManager::Run() { if (obstacle == nullptr) { continue; } - if (obstacle->ToIgnore() || obstacle->IsStill()) { - ADEBUG << "Ignore obstacle [" << id << "] in evaluator_manager"; + if (obstacle->IsStill()) { + ADEBUG << "Ignore still obstacle [" << id << "] in evaluator_manager"; continue; } diff --git a/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc b/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc index cda38e4c4ceedd0cc462dc736838eeb53bad44bb..2fd13e4e1c76fb75765e64464e94e62626395968 100644 --- a/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc +++ b/modules/prediction/scenario/prioritization/obstacles_prioritizer.cc @@ -172,6 +172,7 @@ void ObstaclesPrioritizer::AssignIgnoreLevel() { ObstaclePriority::NORMAL); } } + obstacles_container->SetConsideredObstacleIds(); } void ObstaclesPrioritizer::AssignCautionLevel() { diff --git a/modules/prediction/scenario/right_of_way/right_of_way.cc b/modules/prediction/scenario/right_of_way/right_of_way.cc index ac3321c7b390267b9ff8d0b8fba53c8ef50d17d3..e89b6e1161c916eb4635bc5fec652800bcfb8b38 100644 --- a/modules/prediction/scenario/right_of_way/right_of_way.cc +++ b/modules/prediction/scenario/right_of_way/right_of_way.cc @@ -121,7 +121,7 @@ void RightOfWay::Analyze() { // then loop through all obstacle vehicles for (const int id : - obstacles_container->curr_frame_predictable_obstacle_ids()) { + obstacles_container->curr_frame_considered_obstacle_ids()) { Obstacle* obstacle_ptr = obstacles_container->GetObstacle(id); if (obstacle_ptr == nullptr) { continue;