Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync upstream #802

Merged
merged 17 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
624023c
perf(crosswalk): decrease calcSignedArcLength() process (#4879)
satoshi-ota Sep 5, 2023
ed511b1
chore(build): remove tier4_autoware_utils.hpp perception/ (#4843)
soblin Sep 5, 2023
12fcbc0
ci: ignore tier4_pcl_extensions and remove sensing ignorance (#4865)
kminoda Sep 5, 2023
5094fa2
docs(out_of_lane): fix parameters description (#4246)
maxime-clem Sep 5, 2023
87b3b4e
fix(goal_planner): fix goal search for narrow shoulder lane (#4816)
kosuke55 Sep 5, 2023
46a263c
fix(route_handler): fix getter for pose (#4884)
kosuke55 Sep 5, 2023
30ec8f7
fix(behavior_path_planner): save original route goal pose (#4876)
kosuke55 Sep 5, 2023
6806b13
fix(ndt_scan_matcher): skipping_publish_num does not switches error s…
yvzksgl Sep 5, 2023
d087680
chore: update maintainer of TLR packages (#4882)
miursh Sep 5, 2023
a0ce39a
feat(behavior_path_planner): add safety check against dynamic objects…
kyoichi-sugahara Sep 5, 2023
cc6efbf
feat(goal_planner): set ignore_distance_from_lane_start 0.0 (#4889)
kosuke55 Sep 5, 2023
340b10e
fix(operation_transition_manager): trajectgory deviation calculation …
TakaHoribe Sep 5, 2023
c03ca78
refactor(start/goal_planner): minor refactor like const and reference…
kosuke55 Sep 5, 2023
b1f1548
refactor(start/goal_planner): use combineLanelets (#4894)
kosuke55 Sep 5, 2023
c442e38
feat(goal_planner): do not use minimum_request_length for fixed goal …
kosuke55 Sep 5, 2023
dec3d06
fix(start_planner): fix start pose candidats when the ego is close to…
kosuke55 Sep 5, 2023
23851b6
feat(start_planner): run start planner even if ego is out of lane (#4…
kosuke55 Sep 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .cspell-partial.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"ignorePaths": ["**/perception/**", "**/sensing/**", "perception/bytetrack/lib/**"],
"ignorePaths": [
"**/perception/**",
"sensing/tier4_pcl_extensions/include/**",
"perception/bytetrack/lib/**"
],
"ignoreRegExpList": [],
"words": []
}
1 change: 0 additions & 1 deletion common/perception_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<name>perception_utils</name>
<version>0.1.0</version>
<description>The perception_utils package</description>
<maintainer email="[email protected]">Mingyu Li</maintainer>
<maintainer email="[email protected]">Satoshi Tanaka</maintainer>
<maintainer email="[email protected]">Yusuke Muramatsu</maintainer>
<maintainer email="[email protected]">Shunsuke Miura</maintainer>
Expand Down
14 changes: 12 additions & 2 deletions control/operation_mode_transition_manager/src/state.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,24 @@ bool AutonomousMode::isModeChangeCompleted()
const auto closest_point = trajectory_.points.at(*closest_idx);

// check for lateral deviation
const auto dist_deviation = calcDistance2d(closest_point.pose, kinematics_.pose.pose);
const auto dist_deviation =
motion_utils::calcLateralOffset(trajectory_.points, kinematics_.pose.pose.position);
if (std::isnan(dist_deviation)) {
RCLCPP_INFO(logger_, "Not stable yet: lateral offset calculation failed.");
return unstable();
}
if (dist_deviation > stable_check_param_.dist_threshold) {
RCLCPP_INFO(logger_, "Not stable yet: distance deviation is too large: %f", dist_deviation);
return unstable();
}

// check for yaw deviation
const auto yaw_deviation = calcYawDeviation(closest_point.pose, kinematics_.pose.pose);
const auto yaw_deviation =
motion_utils::calcYawDeviation(trajectory_.points, kinematics_.pose.pose);
if (std::isnan(yaw_deviation)) {
RCLCPP_INFO(logger_, "Not stable yet: lateral offset calculation failed.");
return unstable();
}
if (yaw_deviation > stable_check_param_.yaw_threshold) {
RCLCPP_INFO(logger_, "Not stable yet: yaw deviation is too large: %f", yaw_deviation);
return unstable();
Expand Down
3 changes: 2 additions & 1 deletion localization/ndt_scan_matcher/src/ndt_scan_matcher_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ void NDTScanMatcher::timer_diagnostic()
}
if (
state_ptr_->count("skipping_publish_num") &&
std::stoi((*state_ptr_)["skipping_publish_num"]) > 1) {
std::stoi((*state_ptr_)["skipping_publish_num"]) > 1 &&
std::stoi((*state_ptr_)["skipping_publish_num"]) < 5) {
diag_status_msg.level = diagnostic_msgs::msg::DiagnosticStatus::WARN;
diag_status_msg.message += "skipping_publish_num > 1. ";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
#include <lanelet2_extension/utility/query.hpp>
#include <lanelet2_extension/utility/utilities.hpp>
#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
#include <tier4_autoware_utils/system/stop_watch.hpp>

#include <autoware_auto_mapping_msgs/msg/had_map_bin.hpp>
#include <autoware_perception_msgs/msg/traffic_signal_array.hpp>
Expand Down
2 changes: 2 additions & 0 deletions perception/crosswalk_traffic_light_estimator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<description>The crosswalk_traffic_light_estimator package</description>

<maintainer email="[email protected]">Satoshi Ota</maintainer>
<maintainer email="[email protected]">Shunsuke Miura</maintainer>
<maintainer email="[email protected]">Tao Zhong</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#define OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_

#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <autoware_auto_perception_msgs/msg/detected_objects.hpp>
#include <sensor_msgs/msg/point_cloud2.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "detected_object_filter/object_lanelet_filter.hpp"

#include <object_recognition_utils/object_recognition_utils.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>

#include <boost/geometry/algorithms/convex_hull.hpp>
#include <boost/geometry/algorithms/disjoint.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

#include "detected_object_filter/object_position_filter.hpp"

#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

namespace object_position_filter
{
ObjectPositionFilterNode::ObjectPositionFilterNode(const rclcpp::NodeOptions & node_options)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp"

#include <object_recognition_utils/object_recognition_utils.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>

#include <boost/geometry.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <object_recognition_utils/object_classification.hpp>
#include <object_recognition_utils/object_recognition_utils.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>

#include <boost/optional.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <euclidean_cluster/voxel_grid_based_euclidean_cluster.hpp>
#include <rclcpp/rclcpp.hpp>
#include <shape_estimation/shape_estimator.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <autoware_auto_perception_msgs/msg/detected_objects.hpp>
#include <autoware_auto_perception_msgs/msg/tracked_objects.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <euclidean_cluster/voxel_grid_based_euclidean_cluster.hpp>
#include <rclcpp/rclcpp.hpp>
#include <shape_estimation/shape_estimator.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <autoware_auto_perception_msgs/msg/detected_objects.hpp>
#include <autoware_auto_perception_msgs/msg/tracked_objects.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

#include "object_recognition_utils/object_recognition_utils.hpp"

#include <tier4_autoware_utils/geometry/geometry.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

#include <chrono>
#include <memory>
#include <optional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "pcl/point_types.h"
#include "pcl_conversions/pcl_conversions.h"
#include "rclcpp/logger.hpp"
#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
#include "tier4_autoware_utils/geometry/boost_geometry.hpp"

#include "autoware_auto_perception_msgs/msg/detected_objects.hpp"
#include "nav_msgs/msg/odometry.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

#include "front_vehicle_velocity_estimator/front_vehicle_velocity_estimator.hpp"

#include "tier4_autoware_utils/geometry/geometry.hpp"

#include <boost/geometry.hpp>

#include <memory>
Expand Down
3 changes: 2 additions & 1 deletion perception/heatmap_visualizer/src/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
#include "heatmap_visualizer/utils.hpp"

#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/math/normalization.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

#include <tf2/utils.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

#include "object_recognition_utils/geometry.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"
#include "tier4_autoware_utils/tier4_autoware_utils.hpp"

#include "tier4_autoware_utils/geometry/geometry.hpp"
namespace centerpoint
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@

#include <Eigen/Core>
#include <Eigen/Geometry>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <autoware_auto_perception_msgs/msg/detected_object.hpp>
#include <autoware_auto_perception_msgs/msg/shape.hpp>
#include <autoware_auto_perception_msgs/msg/tracked_object.hpp>
#include <geometry_msgs/msg/polygon.hpp>
#include <geometry_msgs/msg/transform.hpp>
#include <geometry_msgs/msg/vector3.hpp>

#include <tf2/utils.h>

#include <algorithm>
#include <cmath>
#include <tuple>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@

#include "multi_object_tracker/utils/utils.hpp"

#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>
#include <tier4_autoware_utils/math/normalization.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

#include <bits/stdc++.h>
#include <tf2/LinearMath/Matrix3x3.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@

#include <Eigen/Core>
#include <Eigen/Geometry>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>
#include <tier4_autoware_utils/math/normalization.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

using Label = autoware_auto_perception_msgs::msg::ObjectClassification;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

#include "multi_object_tracker/tracker/model/multiple_vehicle_tracker.hpp"

#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

using Label = autoware_auto_perception_msgs::msg::ObjectClassification;

MultipleVehicleTracker::MultipleVehicleTracker(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@

#include <Eigen/Core>
#include <Eigen/Geometry>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>
#include <tier4_autoware_utils/math/normalization.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

using Label = autoware_auto_perception_msgs::msg::ObjectClassification;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

#include <Eigen/Core>
#include <Eigen/Geometry>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

PassThroughTracker::PassThroughTracker(
const rclcpp::Time & time, const autoware_auto_perception_msgs::msg::DetectedObject & object,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

#include "multi_object_tracker/tracker/model/pedestrian_and_bicycle_tracker.hpp"

#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

using Label = autoware_auto_perception_msgs::msg::ObjectClassification;

PedestrianAndBicycleTracker::PedestrianAndBicycleTracker(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
#include "multi_object_tracker/utils/utils.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"

#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>
#include <tier4_autoware_utils/math/normalization.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

#include <bits/stdc++.h>
#include <tf2/LinearMath/Matrix3x3.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@

#include <Eigen/Core>
#include <Eigen/Geometry>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/boost_polygon_utils.hpp>
#include <tier4_autoware_utils/math/normalization.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

UnknownTracker::UnknownTracker(
const rclcpp::Time & time, const autoware_auto_perception_msgs::msg::DetectedObject & object,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#ifndef OBJECT_ASSOCIATION_MERGER__UTILS__UTILS_HPP_
#define OBJECT_ASSOCIATION_MERGER__UTILS__UTILS_HPP_

#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <autoware_auto_perception_msgs/msg/detected_object.hpp>
#include <autoware_auto_perception_msgs/msg/shape.hpp>
#include <geometry_msgs/msg/polygon.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "object_association_merger/utils/utils.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"
#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
#include "tier4_autoware_utils/geometry/geometry.hpp"

#include <boost/optional.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "object_velocity_splitter/object_velocity_splitter_node.hpp"

#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
#include "tier4_autoware_utils/geometry/geometry.hpp"

#include <memory>
#include <string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
#include "occupancy_grid_map_outlier_filter/occupancy_grid_map_outlier_filter_nodelet.hpp"

#include <pcl_ros/transforms.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/geometry/geometry.hpp>
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
#include <tier4_autoware_utils/system/stop_watch.hpp>

#include <boost/optional.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <builtin_interfaces/msg/time.hpp>
#include <pcl_ros/transforms.hpp>
#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <geometry_msgs/msg/pose.hpp>
#include <geometry_msgs/msg/transform_stamped.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "utils/utils.hpp"

#include <pcl_ros/transforms.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <nav_msgs/msg/occupancy_grid.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

#include <grid_map_costmap_2d/grid_map_costmap_2d.hpp>
#include <pcl_ros/transforms.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>

#include <sensor_msgs/point_cloud2_iterator.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <grid_map_costmap_2d/grid_map_costmap_2d.hpp>
#include <pcl_ros/transforms.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

#include <sensor_msgs/point_cloud2_iterator.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <grid_map_costmap_2d/grid_map_costmap_2d.hpp>
#include <grid_map_ros/grid_map_ros.hpp>
#include <pcl_ros/transforms.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

#include <sensor_msgs/point_cloud2_iterator.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
#include "utils/utils.hpp"

#include <pcl_ros/transforms.hpp>
#include <tier4_autoware_utils/tier4_autoware_utils.hpp>
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
#include <tier4_autoware_utils/system/stop_watch.hpp>

#include <nav_msgs/msg/occupancy_grid.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

#include "utils/utils.hpp"

#include <tier4_autoware_utils/geometry/geometry.hpp>

#include <string>

namespace utils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
#define RADAR_FUSION_TO_DETECTED_OBJECT_HPP_

#include "rclcpp/logger.hpp"
#include "tier4_autoware_utils/tier4_autoware_utils.hpp"

#include "tier4_autoware_utils/geometry/boost_geometry.hpp"
#define EIGEN_MPL2_ONLY
#include <Eigen/Core>
#include <Eigen/Geometry>
Expand Down
Loading