From cc8ca8305f772bde8d20c38c73d9652ea82d6743 Mon Sep 17 00:00:00 2001 From: panjiacheng Date: Thu, 9 May 2019 18:05:02 -0700 Subject: [PATCH] Planning: move path_assessment_decider into a single folder. --- modules/planning/tasks/BUILD | 2 +- modules/planning/tasks/deciders/BUILD | 19 --------------- .../deciders/path_assessment_decider/BUILD | 24 +++++++++++++++++++ .../path_assessment_decider.cc | 2 +- .../path_assessment_decider.h | 0 modules/planning/tasks/task_factory.cc | 2 +- 6 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 modules/planning/tasks/deciders/path_assessment_decider/BUILD rename modules/planning/tasks/deciders/{ => path_assessment_decider}/path_assessment_decider.cc (99%) rename modules/planning/tasks/deciders/{ => path_assessment_decider}/path_assessment_decider.h (100%) diff --git a/modules/planning/tasks/BUILD b/modules/planning/tasks/BUILD index 57d64b858f..c892a9043b 100644 --- a/modules/planning/tasks/BUILD +++ b/modules/planning/tasks/BUILD @@ -37,7 +37,7 @@ cc_library( ":task", "//modules/planning/proto:planning_config_proto", "//modules/planning/tasks/deciders:decider", - "//modules/planning/tasks/deciders:path_assessment_decider", + "//modules/planning/tasks/deciders/path_assessment_decider:path_assessment_decider", "//modules/planning/tasks/deciders/path_bounds_decider:path_bounds_decider", "//modules/planning/tasks/deciders/path_lane_borrow_decider", "//modules/planning/tasks/optimizers/dp_st_speed:dp_st_speed_optimizer", diff --git a/modules/planning/tasks/deciders/BUILD b/modules/planning/tasks/deciders/BUILD index 31ab476feb..1f816834b7 100644 --- a/modules/planning/tasks/deciders/BUILD +++ b/modules/planning/tasks/deciders/BUILD @@ -46,25 +46,6 @@ cc_library( ], ) -cc_library( - name = "path_assessment_decider", - srcs = [ - "path_assessment_decider.cc", - ], - hdrs = [ - "path_assessment_decider.h", - ], - copts = ["-DMODULE_NAME=\\\"planning\\\""], - deps = [ - ":decider_base", - ":path_decider_obstacle_utils", - "//modules/planning/common:planning_context", - "//modules/planning/common:planning_gflags", - "//modules/planning/common:reference_line_info", - "//modules/planning/tasks/deciders/path_bounds_decider:path_bounds_decider" - ], -) - cc_library( name = "path_decider_obstacle_utils", srcs = [ diff --git a/modules/planning/tasks/deciders/path_assessment_decider/BUILD b/modules/planning/tasks/deciders/path_assessment_decider/BUILD new file mode 100644 index 0000000000..d03021f9b4 --- /dev/null +++ b/modules/planning/tasks/deciders/path_assessment_decider/BUILD @@ -0,0 +1,24 @@ +load("//tools:cpplint.bzl", "cpplint") + +package(default_visibility = ["//visibility:public"]) + +cc_library( + name = "path_assessment_decider", + srcs = [ + "path_assessment_decider.cc", + ], + hdrs = [ + "path_assessment_decider.h", + ], + copts = ["-DMODULE_NAME=\\\"planning\\\""], + deps = [ + "//modules/planning/common:planning_context", + "//modules/planning/common:planning_gflags", + "//modules/planning/common:reference_line_info", + "//modules/planning/tasks/deciders/path_bounds_decider:path_bounds_decider", + "//modules/planning/tasks/deciders:decider_base", + "//modules/planning/tasks/deciders:path_decider_obstacle_utils", + ], +) + +cpplint() \ No newline at end of file diff --git a/modules/planning/tasks/deciders/path_assessment_decider.cc b/modules/planning/tasks/deciders/path_assessment_decider/path_assessment_decider.cc similarity index 99% rename from modules/planning/tasks/deciders/path_assessment_decider.cc rename to modules/planning/tasks/deciders/path_assessment_decider/path_assessment_decider.cc index 49b19bf7f5..f6d3a2276f 100644 --- a/modules/planning/tasks/deciders/path_assessment_decider.cc +++ b/modules/planning/tasks/deciders/path_assessment_decider/path_assessment_decider.cc @@ -14,7 +14,7 @@ * limitations under the License. *****************************************************************************/ -#include "modules/planning/tasks/deciders/path_assessment_decider.h" +#include "modules/planning/tasks/deciders/path_assessment_decider/path_assessment_decider.h" #include #include diff --git a/modules/planning/tasks/deciders/path_assessment_decider.h b/modules/planning/tasks/deciders/path_assessment_decider/path_assessment_decider.h similarity index 100% rename from modules/planning/tasks/deciders/path_assessment_decider.h rename to modules/planning/tasks/deciders/path_assessment_decider/path_assessment_decider.h diff --git a/modules/planning/tasks/task_factory.cc b/modules/planning/tasks/task_factory.cc index a53ce3e868..f7390854c1 100644 --- a/modules/planning/tasks/task_factory.cc +++ b/modules/planning/tasks/task_factory.cc @@ -27,7 +27,7 @@ #include "modules/planning/tasks/deciders/open_space_fallback_decider.h" #include "modules/planning/tasks/deciders/open_space_pre_stop_decider.h" #include "modules/planning/tasks/deciders/open_space_roi_decider.h" -#include "modules/planning/tasks/deciders/path_assessment_decider.h" +#include "modules/planning/tasks/deciders/path_assessment_decider/path_assessment_decider.h" #include "modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.h" #include "modules/planning/tasks/deciders/path_lane_borrow_decider/path_lane_borrow_decider.h" #include "modules/planning/tasks/deciders/speed_bounds_decider/speed_bounds_decider.h" -- GitLab