Skip to content

Commit

Permalink
fix: renamed message package
Browse files Browse the repository at this point in the history
Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
  • Loading branch information
technolojin committed Jun 11, 2024
1 parent 3e42e12 commit 1e05e5d
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ class BicycleTracker : public Tracker
bool measure(
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
const geometry_msgs::msg::Transform & self_transform) override;
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
bool getTrackedObject(
const rclcpp::Time & time,
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
autoware_perception_msgs::msg::TrackedObject & object) const override;

private:
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_auto_perception_msgs::msg::DetectedObject & object,
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_perception_msgs::msg::DetectedObject & object,
const geometry_msgs::msg::Transform & self_transform) const;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ class BigVehicleTracker : public Tracker
bool measure(
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
const geometry_msgs::msg::Transform & self_transform) override;
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
bool getTrackedObject(
const rclcpp::Time & time,
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
autoware_perception_msgs::msg::TrackedObject & object) const override;

private:
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_auto_perception_msgs::msg::DetectedObject & object,
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_perception_msgs::msg::DetectedObject & object,
const geometry_msgs::msg::Transform & self_transform);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ class NormalVehicleTracker : public Tracker
bool measure(
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
const geometry_msgs::msg::Transform & self_transform) override;
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
bool getTrackedObject(
const rclcpp::Time & time,
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
autoware_perception_msgs::msg::TrackedObject & object) const override;

private:
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_auto_perception_msgs::msg::DetectedObject & object,
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_perception_msgs::msg::DetectedObject & object,
const geometry_msgs::msg::Transform & self_transform);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class PassThroughTracker : public Tracker
const geometry_msgs::msg::Transform & self_transform) override;
bool getTrackedObject(
const rclcpp::Time & time,
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
autoware_perception_msgs::msg::TrackedObject & object) const override;
};

#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ class PedestrianTracker : public Tracker
bool measure(
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
const geometry_msgs::msg::Transform & self_transform) override;
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
bool getTrackedObject(
const rclcpp::Time & time,
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
autoware_perception_msgs::msg::TrackedObject & object) const override;

private:
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_auto_perception_msgs::msg::DetectedObject & object,
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
const autoware_perception_msgs::msg::DetectedObject & object,
const geometry_msgs::msg::Transform & self_transform) const;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class UnknownTracker : public Tracker
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
bool getTrackedObject(
const rclcpp::Time & time,
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
autoware_perception_msgs::msg::TrackedObject & object) const override;
};

#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ inline bool convertConvexHullToBoundingBox(
output_object.kinematics.pose_with_covariance.pose.position.x = new_center.x();
output_object.kinematics.pose_with_covariance.pose.position.y = new_center.y();

output_object.shape.type = autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX;
output_object.shape.type = autoware_perception_msgs::msg::Shape::BOUNDING_BOX;
output_object.shape.dimensions.x = max_x - min_x;
output_object.shape.dimensions.y = max_y - min_y;
output_object.shape.dimensions.z = max_z;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ bool BicycleTracker::predict(const rclcpp::Time & time)
return motion_model_.predictState(time);
}

autoware_auto_perception_msgs::msg::DetectedObject BicycleTracker::getUpdatingObject(
const autoware_auto_perception_msgs::msg::DetectedObject & object,
autoware_perception_msgs::msg::DetectedObject BicycleTracker::getUpdatingObject(
const autoware_perception_msgs::msg::DetectedObject & object,
const geometry_msgs::msg::Transform & /*self_transform*/) const
{
autoware_auto_perception_msgs::msg::DetectedObject updating_object = object;
autoware_perception_msgs::msg::DetectedObject updating_object = object;

// OBJECT SHAPE MODEL
// convert to bounding box if input is convex shape
Expand Down Expand Up @@ -227,7 +227,7 @@ bool BicycleTracker::measureWithPose(const autoware_perception_msgs::msg::Detect

bool BicycleTracker::measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object)
{
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
// do not update shape if the input is not a bounding box
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ autoware_perception_msgs::msg::DetectedObject BigVehicleTracker::getUpdatingObje
float r_cov_x = static_cast<float>(ekf_params_.r_cov_x);
float r_cov_y = static_cast<float>(ekf_params_.r_cov_y);
const uint8_t label = object_recognition_utils::getHighestProbLabel(object.classification);
if (label == autoware_auto_perception_msgs::msg::ObjectClassification::CAR) {
if (label == autoware_perception_msgs::msg::ObjectClassification::CAR) {
// if label is changed, enlarge the measurement noise covariance
constexpr float r_stddev_x = 2.0; // [m]
constexpr float r_stddev_y = 2.0; // [m]
Expand Down Expand Up @@ -305,7 +305,7 @@ bool BigVehicleTracker::measureWithPose(
bool BigVehicleTracker::measureWithShape(
const autoware_perception_msgs::msg::DetectedObject & object)
{
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
// do not update shape if the input is not a bounding box
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ autoware_perception_msgs::msg::DetectedObject NormalVehicleTracker::getUpdatingO

// OBJECT SHAPE MODEL
// convert to bounding box if input is convex shape
autoware_auto_perception_msgs::msg::DetectedObject bbox_object = object;
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
autoware_perception_msgs::msg::DetectedObject bbox_object = object;
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
if (!utils::convertConvexHullToBoundingBox(object, bbox_object)) {
RCLCPP_WARN(
logger_,
Expand Down Expand Up @@ -306,7 +306,7 @@ bool NormalVehicleTracker::measureWithPose(
bool NormalVehicleTracker::measureWithShape(
const autoware_perception_msgs::msg::DetectedObject & object)
{
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
// do not update shape if the input is not a bounding box
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ bool PedestrianTracker::predict(const rclcpp::Time & time)
return motion_model_.predictState(time);
}

autoware_auto_perception_msgs::msg::DetectedObject PedestrianTracker::getUpdatingObject(
const autoware_auto_perception_msgs::msg::DetectedObject & object,
autoware_perception_msgs::msg::DetectedObject PedestrianTracker::getUpdatingObject(
const autoware_perception_msgs::msg::DetectedObject & object,
const geometry_msgs::msg::Transform & /*self_transform*/) const
{
autoware_perception_msgs::msg::DetectedObject updating_object = object;
Expand Down

0 comments on commit 1e05e5d

Please sign in to comment.