Skip to content

Commit dcde715

Browse files
technolojintechnolojin
committed
fix: renamed message package
1 parent b89d0ae commit dcde715

11 files changed

+36
-36
lines changed

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/model/bicycle_tracker.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ class BicycleTracker : public Tracker
6060
bool measure(
6161
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
6262
const geometry_msgs::msg::Transform & self_transform) override;
63-
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
64-
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
63+
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
64+
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
6565
bool getTrackedObject(
6666
const rclcpp::Time & time,
67-
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
67+
autoware_perception_msgs::msg::TrackedObject & object) const override;
6868

6969
private:
70-
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
71-
const autoware_auto_perception_msgs::msg::DetectedObject & object,
70+
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
71+
const autoware_perception_msgs::msg::DetectedObject & object,
7272
const geometry_msgs::msg::Transform & self_transform) const;
7373
};
7474

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/model/big_vehicle_tracker.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ class BigVehicleTracker : public Tracker
6363
bool measure(
6464
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
6565
const geometry_msgs::msg::Transform & self_transform) override;
66-
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
67-
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
66+
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
67+
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
6868
bool getTrackedObject(
6969
const rclcpp::Time & time,
70-
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
70+
autoware_perception_msgs::msg::TrackedObject & object) const override;
7171

7272
private:
73-
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
74-
const autoware_auto_perception_msgs::msg::DetectedObject & object,
73+
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
74+
const autoware_perception_msgs::msg::DetectedObject & object,
7575
const geometry_msgs::msg::Transform & self_transform);
7676
};
7777

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/model/normal_vehicle_tracker.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ class NormalVehicleTracker : public Tracker
6363
bool measure(
6464
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
6565
const geometry_msgs::msg::Transform & self_transform) override;
66-
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
67-
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
66+
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
67+
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
6868
bool getTrackedObject(
6969
const rclcpp::Time & time,
70-
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
70+
autoware_perception_msgs::msg::TrackedObject & object) const override;
7171

7272
private:
73-
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
74-
const autoware_auto_perception_msgs::msg::DetectedObject & object,
73+
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
74+
const autoware_perception_msgs::msg::DetectedObject & object,
7575
const geometry_msgs::msg::Transform & self_transform);
7676
};
7777

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/model/pass_through_tracker.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class PassThroughTracker : public Tracker
4242
const geometry_msgs::msg::Transform & self_transform) override;
4343
bool getTrackedObject(
4444
const rclcpp::Time & time,
45-
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
45+
autoware_perception_msgs::msg::TrackedObject & object) const override;
4646
};
4747

4848
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/model/pedestrian_tracker.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ class PedestrianTracker : public Tracker
6868
bool measure(
6969
const autoware_perception_msgs::msg::DetectedObject & object, const rclcpp::Time & time,
7070
const geometry_msgs::msg::Transform & self_transform) override;
71-
bool measureWithPose(const autoware_auto_perception_msgs::msg::DetectedObject & object);
72-
bool measureWithShape(const autoware_auto_perception_msgs::msg::DetectedObject & object);
71+
bool measureWithPose(const autoware_perception_msgs::msg::DetectedObject & object);
72+
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
7373
bool getTrackedObject(
7474
const rclcpp::Time & time,
75-
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
75+
autoware_perception_msgs::msg::TrackedObject & object) const override;
7676

7777
private:
78-
autoware_auto_perception_msgs::msg::DetectedObject getUpdatingObject(
79-
const autoware_auto_perception_msgs::msg::DetectedObject & object,
78+
autoware_perception_msgs::msg::DetectedObject getUpdatingObject(
79+
const autoware_perception_msgs::msg::DetectedObject & object,
8080
const geometry_msgs::msg::Transform & self_transform) const;
8181
};
8282

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/model/unknown_tracker.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class UnknownTracker : public Tracker
6060
bool measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object);
6161
bool getTrackedObject(
6262
const rclcpp::Time & time,
63-
autoware_auto_perception_msgs::msg::TrackedObject & object) const override;
63+
autoware_perception_msgs::msg::TrackedObject & object) const override;
6464
};
6565

6666
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/utils/utils.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ inline bool convertConvexHullToBoundingBox(
240240
output_object.kinematics.pose_with_covariance.pose.position.x = new_center.x();
241241
output_object.kinematics.pose_with_covariance.pose.position.y = new_center.y();
242242

243-
output_object.shape.type = autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX;
243+
output_object.shape.type = autoware_perception_msgs::msg::Shape::BOUNDING_BOX;
244244
output_object.shape.dimensions.x = max_x - min_x;
245245
output_object.shape.dimensions.y = max_y - min_y;
246246
output_object.shape.dimensions.z = max_z;

‎perception/multi_object_tracker/src/tracker/model/bicycle_tracker.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ bool BicycleTracker::predict(const rclcpp::Time & time)
165165
return motion_model_.predictState(time);
166166
}
167167

168-
autoware_auto_perception_msgs::msg::DetectedObject BicycleTracker::getUpdatingObject(
169-
const autoware_auto_perception_msgs::msg::DetectedObject & object,
168+
autoware_perception_msgs::msg::DetectedObject BicycleTracker::getUpdatingObject(
169+
const autoware_perception_msgs::msg::DetectedObject & object,
170170
const geometry_msgs::msg::Transform & /*self_transform*/) const
171171
{
172-
autoware_auto_perception_msgs::msg::DetectedObject updating_object = object;
172+
autoware_perception_msgs::msg::DetectedObject updating_object = object;
173173

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

228228
bool BicycleTracker::measureWithShape(const autoware_perception_msgs::msg::DetectedObject & object)
229229
{
230-
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
230+
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
231231
// do not update shape if the input is not a bounding box
232232
return false;
233233
}

‎perception/multi_object_tracker/src/tracker/model/big_vehicle_tracker.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
using Label = autoware_perception_msgs::msg::ObjectClassification;
4545

4646
BigVehicleTracker::BigVehicleTracker(
47-
const rclcpp::Time & time, const autoware_auto_perception_msgs::msg::DetectedObject & object,
47+
const rclcpp::Time & time, const autoware_perception_msgs::msg::DetectedObject & object,
4848
const geometry_msgs::msg::Transform & /*self_transform*/, const size_t channel_size,
4949
const uint & channel_index)
5050
: Tracker(time, object.classification, channel_size),
@@ -219,7 +219,7 @@ autoware_perception_msgs::msg::DetectedObject BigVehicleTracker::getUpdatingObje
219219
float r_cov_x = static_cast<float>(ekf_params_.r_cov_x);
220220
float r_cov_y = static_cast<float>(ekf_params_.r_cov_y);
221221
const uint8_t label = object_recognition_utils::getHighestProbLabel(object.classification);
222-
if (label == autoware_auto_perception_msgs::msg::ObjectClassification::CAR) {
222+
if (label == autoware_perception_msgs::msg::ObjectClassification::CAR) {
223223
// if label is changed, enlarge the measurement noise covariance
224224
constexpr float r_stddev_x = 2.0; // [m]
225225
constexpr float r_stddev_y = 2.0; // [m]
@@ -305,7 +305,7 @@ bool BigVehicleTracker::measureWithPose(
305305
bool BigVehicleTracker::measureWithShape(
306306
const autoware_perception_msgs::msg::DetectedObject & object)
307307
{
308-
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
308+
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
309309
// do not update shape if the input is not a bounding box
310310
return false;
311311
}

‎perception/multi_object_tracker/src/tracker/model/normal_vehicle_tracker.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
using Label = autoware_perception_msgs::msg::ObjectClassification;
4545

4646
NormalVehicleTracker::NormalVehicleTracker(
47-
const rclcpp::Time & time, const autoware_auto_perception_msgs::msg::DetectedObject & object,
47+
const rclcpp::Time & time, const autoware_perception_msgs::msg::DetectedObject & object,
4848
const geometry_msgs::msg::Transform & /*self_transform*/, const size_t channel_size,
4949
const uint & channel_index)
5050
: Tracker(time, object.classification, channel_size),
@@ -192,8 +192,8 @@ autoware_perception_msgs::msg::DetectedObject NormalVehicleTracker::getUpdatingO
192192

193193
// OBJECT SHAPE MODEL
194194
// convert to bounding box if input is convex shape
195-
autoware_auto_perception_msgs::msg::DetectedObject bbox_object = object;
196-
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
195+
autoware_perception_msgs::msg::DetectedObject bbox_object = object;
196+
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
197197
if (!utils::convertConvexHullToBoundingBox(object, bbox_object)) {
198198
RCLCPP_WARN(
199199
logger_,
@@ -306,7 +306,7 @@ bool NormalVehicleTracker::measureWithPose(
306306
bool NormalVehicleTracker::measureWithShape(
307307
const autoware_perception_msgs::msg::DetectedObject & object)
308308
{
309-
if (object.shape.type != autoware_auto_perception_msgs::msg::Shape::BOUNDING_BOX) {
309+
if (object.shape.type != autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
310310
// do not update shape if the input is not a bounding box
311311
return false;
312312
}

‎perception/multi_object_tracker/src/tracker/model/pedestrian_tracker.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ bool PedestrianTracker::predict(const rclcpp::Time & time)
160160
return motion_model_.predictState(time);
161161
}
162162

163-
autoware_auto_perception_msgs::msg::DetectedObject PedestrianTracker::getUpdatingObject(
164-
const autoware_auto_perception_msgs::msg::DetectedObject & object,
163+
autoware_perception_msgs::msg::DetectedObject PedestrianTracker::getUpdatingObject(
164+
const autoware_perception_msgs::msg::DetectedObject & object,
165165
const geometry_msgs::msg::Transform & /*self_transform*/) const
166166
{
167167
autoware_perception_msgs::msg::DetectedObject updating_object = object;

0 commit comments

Comments
 (0)