Skip to content

Commit bd4be72

Browse files
takayuki5168takayuki5168
committed
feat(obstacle_cruise_planner): remove include directory
Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
1 parent 89b3233 commit bd4be72

21 files changed

+81
-71
lines changed

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/common_structs.hpp ‎planning/autoware_obstacle_cruise_planner/src/common_structs.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__COMMON_STRUCTS_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__COMMON_STRUCTS_HPP_
15+
#ifndef COMMON_STRUCTS_HPP_
16+
#define COMMON_STRUCTS_HPP_
1717

18-
#include "autoware_obstacle_cruise_planner/type_alias.hpp"
1918
#include "motion_utils/trajectory/conversion.hpp"
2019
#include "motion_utils/trajectory/interpolation.hpp"
2120
#include "motion_utils/trajectory/trajectory.hpp"
2221
#include "tier4_autoware_utils/geometry/boost_polygon_utils.hpp"
2322
#include "tier4_autoware_utils/ros/update_param.hpp"
2423
#include "tier4_autoware_utils/ros/uuid_helper.hpp"
24+
#include "type_alias.hpp"
2525

2626
#include <rclcpp/rclcpp.hpp>
2727

@@ -302,4 +302,4 @@ struct EgoNearestParam
302302
double yaw_threshold;
303303
};
304304

305-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__COMMON_STRUCTS_HPP_
305+
#endif // COMMON_STRUCTS_HPP_

‎planning/autoware_obstacle_cruise_planner/src/node.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,23 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_obstacle_cruise_planner/node.hpp"
15+
#include "node.hpp"
1616

17-
#include "autoware_obstacle_cruise_planner/polygon_utils.hpp"
18-
#include "autoware_obstacle_cruise_planner/utils.hpp"
1917
#include "motion_utils/resample/resample.hpp"
2018
#include "motion_utils/trajectory/conversion.hpp"
2119
#include "object_recognition_utils/predicted_path_utils.hpp"
20+
#include "polygon_utils.hpp"
2221
#include "tier4_autoware_utils/geometry/boost_polygon_utils.hpp"
2322
#include "tier4_autoware_utils/ros/marker_helper.hpp"
2423
#include "tier4_autoware_utils/ros/update_param.hpp"
24+
#include "utils.hpp"
2525

2626
#include <boost/format.hpp>
2727

2828
#include <algorithm>
2929
#include <chrono>
30+
#include <limits>
31+
#include <utility>
3032

3133
namespace
3234
{

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/node.hpp ‎planning/autoware_obstacle_cruise_planner/src/node.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__NODE_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__NODE_HPP_
15+
#ifndef NODE_HPP_
16+
#define NODE_HPP_
1717

18-
#include "autoware_obstacle_cruise_planner/common_structs.hpp"
19-
#include "autoware_obstacle_cruise_planner/optimization_based_planner/optimization_based_planner.hpp"
20-
#include "autoware_obstacle_cruise_planner/pid_based_planner/pid_based_planner.hpp"
21-
#include "autoware_obstacle_cruise_planner/type_alias.hpp"
18+
#include "common_structs.hpp"
19+
#include "optimization_based_planner/optimization_based_planner.hpp"
20+
#include "pid_based_planner/pid_based_planner.hpp"
2221
#include "signal_processing/lowpass_filter_1d.hpp"
2322
#include "tier4_autoware_utils/ros/logger_level_configure.hpp"
2423
#include "tier4_autoware_utils/ros/polling_subscriber.hpp"
2524
#include "tier4_autoware_utils/system/stop_watch.hpp"
25+
#include "type_alias.hpp"
2626

2727
#include <rclcpp/rclcpp.hpp>
2828
#include <tier4_autoware_utils/ros/published_time_publisher.hpp>
@@ -280,4 +280,4 @@ class ObstacleCruisePlannerNode : public rclcpp::Node
280280
};
281281
} // namespace autoware::motion_planning
282282

283-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__NODE_HPP_
283+
#endif // NODE_HPP_

‎planning/autoware_obstacle_cruise_planner/src/optimization_based_planner/optimization_based_planner.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_obstacle_cruise_planner/optimization_based_planner/optimization_based_planner.hpp"
15+
#include "optimization_based_planner/optimization_based_planner.hpp"
1616

17-
#include "autoware_obstacle_cruise_planner/utils.hpp"
1817
#include "interpolation/linear_interpolation.hpp"
1918
#include "interpolation/spline_interpolation.hpp"
2019
#include "interpolation/zero_order_hold.hpp"
@@ -24,6 +23,7 @@
2423
#include "motion_utils/trajectory/trajectory.hpp"
2524
#include "tier4_autoware_utils/geometry/geometry.hpp"
2625
#include "tier4_autoware_utils/ros/marker_helper.hpp"
26+
#include "utils.hpp"
2727

2828
#ifdef ROS_DISTRO_GALACTIC
2929
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
@@ -33,6 +33,9 @@
3333

3434
#include <tf2/utils.h>
3535

36+
#include <algorithm>
37+
#include <limits>
38+
3639
constexpr double ZERO_VEL_THRESHOLD = 0.01;
3740
constexpr double CLOSE_S_DIST_THRESHOLD = 1e-3;
3841

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/optimization_based_planner/optimization_based_planner.hpp ‎planning/autoware_obstacle_cruise_planner/src/optimization_based_planner/optimization_based_planner.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__OPTIMIZATION_BASED_PLANNER_HPP_ // NOLINT
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__OPTIMIZATION_BASED_PLANNER_HPP_ // NOLINT
15+
#ifndef OPTIMIZATION_BASED_PLANNER__OPTIMIZATION_BASED_PLANNER_HPP_ // NOLINT
16+
#define OPTIMIZATION_BASED_PLANNER__OPTIMIZATION_BASED_PLANNER_HPP_ // NOLINT
1717

18-
#include "autoware_obstacle_cruise_planner/optimization_based_planner/s_boundary.hpp"
19-
#include "autoware_obstacle_cruise_planner/optimization_based_planner/velocity_optimizer.hpp"
20-
#include "autoware_obstacle_cruise_planner/planner_interface.hpp"
21-
#include "autoware_obstacle_cruise_planner/type_alias.hpp"
2218
#include "autoware_vehicle_info_utils/vehicle_info_utils.hpp"
19+
#include "optimization_based_planner/s_boundary.hpp"
20+
#include "optimization_based_planner/velocity_optimizer.hpp"
21+
#include "planner_interface.hpp"
22+
#include "type_alias.hpp"
2323

2424
#include <lanelet2_extension/utility/message_conversion.hpp>
2525
#include <lanelet2_extension/utility/utilities.hpp>
@@ -118,5 +118,5 @@ class OptimizationBasedPlanner : public PlannerInterface
118118
double stop_dist_to_prohibit_engage_;
119119
};
120120
// clang-format off
121-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__OPTIMIZATION_BASED_PLANNER_HPP_ // NOLINT
121+
#endif // OPTIMIZATION_BASED_PLANNER__OPTIMIZATION_BASED_PLANNER_HPP_ // NOLINT
122122
// clang-format on

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/optimization_based_planner/s_boundary.hpp ‎planning/autoware_obstacle_cruise_planner/src/optimization_based_planner/s_boundary.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__S_BOUNDARY_HPP_
15-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__S_BOUNDARY_HPP_
14+
#ifndef OPTIMIZATION_BASED_PLANNER__S_BOUNDARY_HPP_
15+
#define OPTIMIZATION_BASED_PLANNER__S_BOUNDARY_HPP_
1616

1717
#include <limits>
1818
#include <vector>
@@ -30,4 +30,4 @@ class SBoundary
3030

3131
using SBoundaries = std::vector<SBoundary>;
3232

33-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__S_BOUNDARY_HPP_
33+
#endif // OPTIMIZATION_BASED_PLANNER__S_BOUNDARY_HPP_

‎planning/autoware_obstacle_cruise_planner/src/optimization_based_planner/velocity_optimizer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_obstacle_cruise_planner/optimization_based_planner/velocity_optimizer.hpp"
15+
#include "optimization_based_planner/velocity_optimizer.hpp"
1616

1717
#include <Eigen/Core>
1818

19+
#include <algorithm>
1920
#include <iostream>
2021

2122
VelocityOptimizer::VelocityOptimizer(

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/optimization_based_planner/velocity_optimizer.hpp ‎planning/autoware_obstacle_cruise_planner/src/optimization_based_planner/velocity_optimizer.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__VELOCITY_OPTIMIZER_HPP_
15-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__VELOCITY_OPTIMIZER_HPP_
14+
#ifndef OPTIMIZATION_BASED_PLANNER__VELOCITY_OPTIMIZER_HPP_
15+
#define OPTIMIZATION_BASED_PLANNER__VELOCITY_OPTIMIZER_HPP_
1616

17-
#include "autoware_obstacle_cruise_planner/optimization_based_planner/s_boundary.hpp"
17+
#include "optimization_based_planner/s_boundary.hpp"
1818
#include "osqp_interface/osqp_interface.hpp"
1919

2020
#include <vector>
@@ -72,4 +72,4 @@ class VelocityOptimizer
7272
autoware::common::osqp::OSQPInterface qp_solver_;
7373
};
7474

75-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__OPTIMIZATION_BASED_PLANNER__VELOCITY_OPTIMIZER_HPP_
75+
#endif // OPTIMIZATION_BASED_PLANNER__VELOCITY_OPTIMIZER_HPP_

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/pid_based_planner/cruise_planning_debug_info.hpp ‎planning/autoware_obstacle_cruise_planner/src/pid_based_planner/cruise_planning_debug_info.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__CRUISE_PLANNING_DEBUG_INFO_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__CRUISE_PLANNING_DEBUG_INFO_HPP_
15+
#ifndef PID_BASED_PLANNER__CRUISE_PLANNING_DEBUG_INFO_HPP_
16+
#define PID_BASED_PLANNER__CRUISE_PLANNING_DEBUG_INFO_HPP_
1717

1818
#include <rclcpp/rclcpp.hpp>
1919

@@ -94,4 +94,4 @@ class CruisePlanningDebugInfo
9494
std::array<double, static_cast<int>(TYPE::SIZE)> info_;
9595
};
9696

97-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__CRUISE_PLANNING_DEBUG_INFO_HPP_
97+
#endif // PID_BASED_PLANNER__CRUISE_PLANNING_DEBUG_INFO_HPP_

‎planning/autoware_obstacle_cruise_planner/src/pid_based_planner/pid_based_planner.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_obstacle_cruise_planner/pid_based_planner/pid_based_planner.hpp"
15+
#include "pid_based_planner/pid_based_planner.hpp"
1616

17-
#include "autoware_obstacle_cruise_planner/utils.hpp"
1817
#include "interpolation/spline_interpolation.hpp"
1918
#include "motion_utils/marker/marker_helper.hpp"
2019
#include "tier4_autoware_utils/geometry/geometry.hpp"
2120
#include "tier4_autoware_utils/ros/marker_helper.hpp"
2221
#include "tier4_autoware_utils/ros/update_param.hpp"
22+
#include "utils.hpp"
2323

2424
#include "tier4_planning_msgs/msg/velocity_limit.hpp"
2525

26+
#include <algorithm>
27+
#include <string>
2628
namespace
2729
{
2830
VelocityLimit createVelocityLimitMsg(

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/pid_based_planner/pid_based_planner.hpp ‎planning/autoware_obstacle_cruise_planner/src/pid_based_planner/pid_based_planner.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__PID_BASED_PLANNER_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__PID_BASED_PLANNER_HPP_
15+
#ifndef PID_BASED_PLANNER__PID_BASED_PLANNER_HPP_
16+
#define PID_BASED_PLANNER__PID_BASED_PLANNER_HPP_
1717

18-
#include "autoware_obstacle_cruise_planner/pid_based_planner/cruise_planning_debug_info.hpp"
19-
#include "autoware_obstacle_cruise_planner/pid_based_planner/pid_controller.hpp"
20-
#include "autoware_obstacle_cruise_planner/planner_interface.hpp"
18+
#include "pid_based_planner/cruise_planning_debug_info.hpp"
19+
#include "pid_based_planner/pid_controller.hpp"
20+
#include "planner_interface.hpp"
2121
#include "signal_processing/lowpass_filter_1d.hpp"
2222

2323
#include "visualization_msgs/msg/marker_array.hpp"
@@ -137,4 +137,4 @@ class PIDBasedPlanner : public PlannerInterface
137137
std::function<double(double)> error_func_;
138138
};
139139

140-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__PID_BASED_PLANNER_HPP_
140+
#endif // PID_BASED_PLANNER__PID_BASED_PLANNER_HPP_

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/pid_based_planner/pid_controller.hpp ‎planning/autoware_obstacle_cruise_planner/src/pid_based_planner/pid_controller.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__PID_CONTROLLER_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__PID_CONTROLLER_HPP_
15+
#ifndef PID_BASED_PLANNER__PID_CONTROLLER_HPP_
16+
#define PID_BASED_PLANNER__PID_CONTROLLER_HPP_
1717

1818
#include <optional>
1919

@@ -59,4 +59,4 @@ class PIDController
5959
std::optional<double> prev_error_;
6060
};
6161

62-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__PID_BASED_PLANNER__PID_CONTROLLER_HPP_
62+
#endif // PID_BASED_PLANNER__PID_CONTROLLER_HPP_

‎planning/autoware_obstacle_cruise_planner/src/planner_interface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_obstacle_cruise_planner/planner_interface.hpp"
15+
#include "planner_interface.hpp"
1616

1717
#include "motion_utils/distance/distance.hpp"
1818
#include "motion_utils/marker/marker_helper.hpp"

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/planner_interface.hpp ‎planning/autoware_obstacle_cruise_planner/src/planner_interface.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__PLANNER_INTERFACE_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__PLANNER_INTERFACE_HPP_
15+
#ifndef PLANNER_INTERFACE_HPP_
16+
#define PLANNER_INTERFACE_HPP_
1717

18-
#include "autoware_obstacle_cruise_planner/common_structs.hpp"
19-
#include "autoware_obstacle_cruise_planner/stop_planning_debug_info.hpp"
20-
#include "autoware_obstacle_cruise_planner/type_alias.hpp"
21-
#include "autoware_obstacle_cruise_planner/utils.hpp"
18+
#include "common_structs.hpp"
2219
#include "motion_utils/trajectory/trajectory.hpp"
20+
#include "stop_planning_debug_info.hpp"
2321
#include "tier4_autoware_utils/ros/update_param.hpp"
2422
#include "tier4_autoware_utils/system/stop_watch.hpp"
23+
#include "type_alias.hpp"
24+
#include "utils.hpp"
2525

2626
#include <algorithm>
2727
#include <limits>
@@ -425,4 +425,4 @@ class PlannerInterface
425425
std::nullopt};
426426
};
427427

428-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__PLANNER_INTERFACE_HPP_
428+
#endif // PLANNER_INTERFACE_HPP_

‎planning/autoware_obstacle_cruise_planner/src/polygon_utils.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_obstacle_cruise_planner/polygon_utils.hpp"
15+
#include "polygon_utils.hpp"
1616

1717
#include "motion_utils/trajectory/trajectory.hpp"
1818
#include "tier4_autoware_utils/geometry/boost_polygon_utils.hpp"
1919
#include "tier4_autoware_utils/geometry/geometry.hpp"
2020

21+
#include <algorithm>
22+
2123
namespace
2224
{
2325
PointWithStamp calcNearestCollisionPoint(

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/polygon_utils.hpp ‎planning/autoware_obstacle_cruise_planner/src/polygon_utils.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__POLYGON_UTILS_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__POLYGON_UTILS_HPP_
15+
#ifndef POLYGON_UTILS_HPP_
16+
#define POLYGON_UTILS_HPP_
1717

18-
#include "autoware_obstacle_cruise_planner/common_structs.hpp"
19-
#include "autoware_obstacle_cruise_planner/type_alias.hpp"
2018
#include "autoware_vehicle_info_utils/vehicle_info_utils.hpp"
19+
#include "common_structs.hpp"
2120
#include "tier4_autoware_utils/geometry/boost_geometry.hpp"
21+
#include "type_alias.hpp"
2222

2323
#include <boost/geometry.hpp>
2424

@@ -52,4 +52,4 @@ std::vector<PointWithStamp> getCollisionPoints(
5252

5353
} // namespace polygon_utils
5454

55-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__POLYGON_UTILS_HPP_
55+
#endif // POLYGON_UTILS_HPP_

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/stop_planning_debug_info.hpp ‎planning/autoware_obstacle_cruise_planner/src/stop_planning_debug_info.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__STOP_PLANNING_DEBUG_INFO_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__STOP_PLANNING_DEBUG_INFO_HPP_
15+
#ifndef STOP_PLANNING_DEBUG_INFO_HPP_
16+
#define STOP_PLANNING_DEBUG_INFO_HPP_
1717

1818
#include <rclcpp/rclcpp.hpp>
1919

@@ -85,4 +85,4 @@ class StopPlanningDebugInfo
8585
std::array<double, static_cast<int>(TYPE::SIZE)> info_;
8686
};
8787

88-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__STOP_PLANNING_DEBUG_INFO_HPP_
88+
#endif // STOP_PLANNING_DEBUG_INFO_HPP_

‎planning/autoware_obstacle_cruise_planner/include/autoware_obstacle_cruise_planner/type_alias.hpp ‎planning/autoware_obstacle_cruise_planner/src/type_alias.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef AUTOWARE_OBSTACLE_CRUISE_PLANNER__TYPE_ALIAS_HPP_
16-
#define AUTOWARE_OBSTACLE_CRUISE_PLANNER__TYPE_ALIAS_HPP_
15+
#ifndef TYPE_ALIAS_HPP_
16+
#define TYPE_ALIAS_HPP_
1717

1818
#include "autoware_vehicle_info_utils/vehicle_info_utils.hpp"
1919

@@ -63,4 +63,4 @@ namespace bg = boost::geometry;
6363
using tier4_autoware_utils::Point2d;
6464
using tier4_autoware_utils::Polygon2d;
6565

66-
#endif // AUTOWARE_OBSTACLE_CRUISE_PLANNER__TYPE_ALIAS_HPP_
66+
#endif // TYPE_ALIAS_HPP_

‎planning/autoware_obstacle_cruise_planner/src/utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_obstacle_cruise_planner/utils.hpp"
15+
#include "utils.hpp"
1616

1717
#include "object_recognition_utils/predicted_path_utils.hpp"
1818
#include "tier4_autoware_utils/ros/marker_helper.hpp"

0 commit comments

Comments
 (0)