提交 3e84ae5f 编写于 作者: K kechxu 提交者: Yajia Zhang

Prediction: add a dummy interface function in scenario manager to get lane ids

上级 0f8cb38a
...@@ -167,7 +167,6 @@ bool PredictionComponent::Init() { ...@@ -167,7 +167,6 @@ bool PredictionComponent::Init() {
} }
} }
Stop(); Stop();
// TODO(kechxu) accord to cybertron
} }
return true; return true;
} }
...@@ -209,8 +208,6 @@ bool PredictionComponent::Proc( ...@@ -209,8 +208,6 @@ bool PredictionComponent::Proc(
(Clock::NowInSeconds() - component_start_time_ > (Clock::NowInSeconds() - component_start_time_ >
FLAGS_prediction_test_duration)) { FLAGS_prediction_test_duration)) {
ADEBUG << "Prediction finished running in test mode"; ADEBUG << "Prediction finished running in test mode";
// TODO(kechxu) accord to cybertron
// ros::shutdown();
} }
// Update relative map if needed // Update relative map if needed
......
...@@ -72,5 +72,5 @@ message Feature { ...@@ -72,5 +72,5 @@ message Feature {
NORMAL = 2; NORMAL = 2;
IGNORE = 3; IGNORE = 3;
} }
optional Priority priority = 25; optional Priority priority = 25 [default = NORMAL];
} }
...@@ -31,5 +31,11 @@ const Scenario& ScenarioManager::scenario() const { ...@@ -31,5 +31,11 @@ const Scenario& ScenarioManager::scenario() const {
return scenario_analyzer_.scenario(); return scenario_analyzer_.scenario();
} }
std::vector<std::string> ScenarioManager::GetFocusedLaneIds() const {
// TODO(all) use scenario feature to get lane ids
std::vector<std::string> focused_lane_ids;
return focused_lane_ids;
}
} // namespace prediction } // namespace prediction
} // namespace apollo } // namespace apollo
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#ifndef MODULES_PREDICTION_SCENARIO_SCENARIO_MANAGER_H_ #ifndef MODULES_PREDICTION_SCENARIO_SCENARIO_MANAGER_H_
#define MODULES_PREDICTION_SCENARIO_SCENARIO_MANAGER_H_ #define MODULES_PREDICTION_SCENARIO_SCENARIO_MANAGER_H_
#include <vector>
#include <string>
#include "cybertron/common/macros.h" #include "cybertron/common/macros.h"
#include "modules/prediction/proto/scenario.pb.h" #include "modules/prediction/proto/scenario.pb.h"
#include "modules/prediction/proto/prediction_conf.pb.h" #include "modules/prediction/proto/prediction_conf.pb.h"
...@@ -42,6 +45,12 @@ class ScenarioManager { ...@@ -42,6 +45,12 @@ class ScenarioManager {
*/ */
const Scenario& scenario() const; const Scenario& scenario() const;
/**
* @brief Get the IDs of the focused lanes based on the scenario
* @return The IDs of the focused lanes based on the scenario
*/
std::vector<std::string> GetFocusedLaneIds() const;
private: private:
FeatureExtractor feature_extractor_; FeatureExtractor feature_extractor_;
ScenarioAnalyzer scenario_analyzer_; ScenarioAnalyzer scenario_analyzer_;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册