提交 cb06b0a5 编写于 作者: D Dong Li 提交者: Jiangtao Hu

rename routing_result to routing_response

上级 d2271f81
......@@ -41,7 +41,7 @@ using Vec2d = apollo::common::math::Vec2d;
using LaneWaypoint = apollo::hdmap::LaneWaypoint;
using LaneInfoConstPtr = apollo::hdmap::LaneInfoConstPtr;
DECLARE_bool(validate_routing_result_for_trajectories);
DECLARE_bool(validate_routing_response_for_trajectories);
namespace apollo {
namespace hdmap {
......
......@@ -52,7 +52,7 @@ void Frame::SetVehicleInitPose(const localization::Pose &pose) {
}
void Frame::SetRoutingResponse(const routing::RoutingResponse &routing) {
routing_result_ = routing;
routing_response_ = routing;
}
void Frame::SetPlanningStartPoint(const common::TrajectoryPoint &start_point) {
......@@ -99,7 +99,7 @@ bool Frame::Init() {
return false;
}
std::vector<ReferenceLine> reference_lines;
if (!CreateReferenceLineFromRouting(init_pose_.position(), routing_result_,
if (!CreateReferenceLineFromRouting(init_pose_.position(), routing_response_,
&reference_lines)) {
AERROR << "Failed to create reference line from position: "
<< init_pose_.DebugString();
......@@ -116,7 +116,7 @@ bool Frame::Init() {
reference_line_);
if (FLAGS_enable_traffic_decision) {
MakeTrafficDecision(routing_result_, reference_line_);
MakeTrafficDecision(routing_response_, reference_line_);
}
return true;
......@@ -186,11 +186,11 @@ void Frame::RecordInputDebug() {
auto debug_chassis = planning_data->mutable_chassis();
debug_chassis->CopyFrom(chassis);
const auto &routing_result =
const auto &routing_response =
AdapterManager::GetRoutingResponse()->GetLatestObserved();
auto debug_routing = planning_data->mutable_routing();
debug_routing->CopyFrom(routing_result);
debug_routing->CopyFrom(routing_response);
}
} // namespace planning
......
......@@ -122,7 +122,7 @@ class Frame {
private:
common::TrajectoryPoint planning_start_point_;
routing::RoutingResponse routing_result_;
routing::RoutingResponse routing_response_;
prediction::PredictionObstacles prediction_;
IndexedObstacles obstacles_;
std::unique_ptr<PathDecision> path_decision_;
......
......@@ -24,7 +24,7 @@ namespace planning {
using common::adapter::AdapterManager;
DEFINE_string(test_routing_result_file,
DEFINE_string(test_routing_response_file,
"modules/planning/testdata/garage_routing.pb.txt",
"The routing file used in test");
DEFINE_string(test_localization_file,
......@@ -69,8 +69,8 @@ bool PlanningTestBase::SetUpAdapters() {
return false;
}
if (!AdapterManager::FeedRoutingResponseFile(
FLAGS_test_routing_result_file)) {
AERROR << "failed to routing file: " << FLAGS_test_routing_result_file;
FLAGS_test_routing_response_file)) {
AERROR << "failed to routing file: " << FLAGS_test_routing_response_file;
return false;
}
if (!AdapterManager::FeedLocalizationFile(FLAGS_test_localization_file)) {
......
......@@ -34,7 +34,7 @@ namespace planning {
using common::adapter::AdapterManager;
DECLARE_string(test_routing_result_file);
DECLARE_string(test_routing_response_file);
DECLARE_string(test_localization_file);
DECLARE_string(test_chassis_file);
......@@ -44,12 +44,12 @@ class PlanningTestBase : public ::testing::Test {
* @brief set common data settings, such as gflags path configurations.
* If in your local test, you want to use a different file,
* call this function first, and add the new settings.
* For example, if you want to let FLAGS_test_routing_result_file =
* For example, if you want to let FLAGS_test_routing_response_file =
* "new_routing.pb.txt", You can implement your own SetDataConfigs by
* ```
* virtual void SetDataConfigs() {
* PlanningTestBase::SetDataConfigs();
* FLAGS_test_routing_result_file = "new_routing.pb.txt"
* FLAGS_test_routing_response_file = "new_routing.pb.txt"
* }
* ```
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册