From cd1aba12348c6dd2e44e63a0bfff97627b1cc749 Mon Sep 17 00:00:00 2001 From: panjiacheng Date: Thu, 9 May 2019 17:32:46 -0700 Subject: [PATCH] Planning: move path_bounds_decider into a folder. --- modules/planning/tasks/BUILD | 2 +- modules/planning/tasks/deciders/BUILD | 32 +---------------- .../tasks/deciders/path_assessment_decider.cc | 2 +- .../tasks/deciders/path_bounds_decider/BUILD | 35 +++++++++++++++++++ .../path_bounds_decider.cc | 2 +- .../path_bounds_decider.h | 0 .../path_bounds_decider_test.cc | 2 +- modules/planning/tasks/task_factory.cc | 2 +- 8 files changed, 41 insertions(+), 36 deletions(-) create mode 100644 modules/planning/tasks/deciders/path_bounds_decider/BUILD rename modules/planning/tasks/deciders/{ => path_bounds_decider}/path_bounds_decider.cc (99%) rename modules/planning/tasks/deciders/{ => path_bounds_decider}/path_bounds_decider.h (100%) rename modules/planning/tasks/deciders/{ => path_bounds_decider}/path_bounds_decider_test.cc (96%) diff --git a/modules/planning/tasks/BUILD b/modules/planning/tasks/BUILD index 048a8c1501..57d64b858f 100644 --- a/modules/planning/tasks/BUILD +++ b/modules/planning/tasks/BUILD @@ -38,7 +38,7 @@ cc_library( "//modules/planning/proto:planning_config_proto", "//modules/planning/tasks/deciders:decider", "//modules/planning/tasks/deciders:path_assessment_decider", - "//modules/planning/tasks/deciders:path_bounds_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", "//modules/planning/tasks/optimizers/open_space_trajectory_generation:open_space_trajectory_provider", diff --git a/modules/planning/tasks/deciders/BUILD b/modules/planning/tasks/deciders/BUILD index 386e536345..31ab476feb 100644 --- a/modules/planning/tasks/deciders/BUILD +++ b/modules/planning/tasks/deciders/BUILD @@ -55,31 +55,13 @@ cc_library( "path_assessment_decider.h", ], copts = ["-DMODULE_NAME=\\\"planning\\\""], - deps = [ - ":decider_base", - ":path_bounds_decider", - ":path_decider_obstacle_utils", - "//modules/planning/common:planning_context", - "//modules/planning/common:planning_gflags", - "//modules/planning/common:reference_line_info", - ], -) - -cc_library( - name = "path_bounds_decider", - srcs = [ - "path_bounds_decider.cc", - ], - hdrs = [ - "path_bounds_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" ], ) @@ -169,16 +151,4 @@ cc_test( ], ) -cc_test( - name = "path_bounds_decider_test", - size = "small", - srcs = [ - "path_bounds_decider_test.cc", - ], - deps = [ - "path_bounds_decider", - "@gtest//:main", - ], -) - cpplint() diff --git a/modules/planning/tasks/deciders/path_assessment_decider.cc b/modules/planning/tasks/deciders/path_assessment_decider.cc index f7157b29d1..49b19bf7f5 100644 --- a/modules/planning/tasks/deciders/path_assessment_decider.cc +++ b/modules/planning/tasks/deciders/path_assessment_decider.cc @@ -24,7 +24,7 @@ #include "modules/common/proto/pnc_point.pb.h" #include "modules/map/hdmap/hdmap_util.h" #include "modules/planning/common/planning_context.h" -#include "modules/planning/tasks/deciders/path_bounds_decider.h" +#include "modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.h" #include "modules/planning/tasks/deciders/path_decider_obstacle_utils.h" namespace apollo { diff --git a/modules/planning/tasks/deciders/path_bounds_decider/BUILD b/modules/planning/tasks/deciders/path_bounds_decider/BUILD new file mode 100644 index 0000000000..b4a4cdd61b --- /dev/null +++ b/modules/planning/tasks/deciders/path_bounds_decider/BUILD @@ -0,0 +1,35 @@ +load("//tools:cpplint.bzl", "cpplint") + +package(default_visibility = ["//visibility:public"]) + +cc_library( + name = "path_bounds_decider", + srcs = [ + "path_bounds_decider.cc", + ], + hdrs = [ + "path_bounds_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:decider_base", + "//modules/planning/tasks/deciders:path_decider_obstacle_utils", + ], +) + +cc_test( + name = "path_bounds_decider_test", + size = "small", + srcs = [ + "path_bounds_decider_test.cc", + ], + deps = [ + "path_bounds_decider", + "@gtest//:main", + ], +) + +cpplint() diff --git a/modules/planning/tasks/deciders/path_bounds_decider.cc b/modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.cc similarity index 99% rename from modules/planning/tasks/deciders/path_bounds_decider.cc rename to modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.cc index 8431250844..3245e0721c 100644 --- a/modules/planning/tasks/deciders/path_bounds_decider.cc +++ b/modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.cc @@ -14,7 +14,7 @@ * limitations under the License. *****************************************************************************/ -#include "modules/planning/tasks/deciders/path_bounds_decider.h" +#include "modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.h" #include #include diff --git a/modules/planning/tasks/deciders/path_bounds_decider.h b/modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.h similarity index 100% rename from modules/planning/tasks/deciders/path_bounds_decider.h rename to modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.h diff --git a/modules/planning/tasks/deciders/path_bounds_decider_test.cc b/modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider_test.cc similarity index 96% rename from modules/planning/tasks/deciders/path_bounds_decider_test.cc rename to modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider_test.cc index 712280fb1a..8cbc386046 100644 --- a/modules/planning/tasks/deciders/path_bounds_decider_test.cc +++ b/modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider_test.cc @@ -18,7 +18,7 @@ * @file **/ -#include "modules/planning/tasks/deciders/path_bounds_decider.h" +#include "modules/planning/tasks/deciders/path_bounds_decider/path_bounds_decider.h" #include "gtest/gtest.h" #include "modules/planning/proto/planning_config.pb.h" diff --git a/modules/planning/tasks/task_factory.cc b/modules/planning/tasks/task_factory.cc index 302345503d..a53ce3e868 100644 --- a/modules/planning/tasks/task_factory.cc +++ b/modules/planning/tasks/task_factory.cc @@ -28,7 +28,7 @@ #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_bounds_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" #include "modules/planning/tasks/optimizers/dp_st_speed/dp_st_speed_optimizer.h" -- GitLab