Skip to content

Commit

Permalink
fix(autoware_tracking_object_merger): fix clang-diagnostic-sign-conve…
Browse files Browse the repository at this point in the history
…rsion (#9507)

fix: clang-diagnostic-sign-conversion

Signed-off-by: kobayu858 <[email protected]>
  • Loading branch information
kobayu858 authored Nov 28, 2024
1 parent 9d8bd0c commit 62e9aa8
Showing 1 changed file with 9 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ Eigen::MatrixXd calcScoreMatrixForAssociation(
const rclcpp::Time current_time = rclcpp::Time(objects0.header.stamp);

// calc score matrix
Eigen::MatrixXd score_matrix = Eigen::MatrixXd::Zero(trackers.size(), objects0.objects.size());
Eigen::MatrixXd score_matrix = Eigen::MatrixXd::Zero(
static_cast<Eigen::Index>(trackers.size()), static_cast<Eigen::Index>(objects0.objects.size()));
for (size_t trackers_idx = 0; trackers_idx < trackers.size(); ++trackers_idx) {
const auto & tracker_obj = trackers.at(trackers_idx);
const auto & object1 = tracker_obj.getObject();
Expand All @@ -77,7 +78,8 @@ Eigen::MatrixXd calcScoreMatrixForAssociation(
} else {
score = data_association_map.at("lidar-radar")->calcScoreBetweenObjects(object0, object1);
}
score_matrix(trackers_idx, objects0_idx) = score;
score_matrix(
static_cast<Eigen::Index>(trackers_idx), static_cast<Eigen::Index>(objects0_idx)) = score;
}
}
return score_matrix;
Expand Down Expand Up @@ -316,9 +318,11 @@ bool DecorativeTrackerMergerNode::decorativeMerger(
// look for tracker
for (int tracker_idx = 0; tracker_idx < static_cast<int>(inner_tracker_objects_.size());
++tracker_idx) {
auto & object0_state = inner_tracker_objects_.at(tracker_idx);
auto & object0_state =
inner_tracker_objects_.at(static_cast<std::vector<int>::size_type>(tracker_idx));
if (direct_assignment.find(tracker_idx) != direct_assignment.end()) { // found and merge
const auto & object1 = objects1.at(direct_assignment.at(tracker_idx));
const auto & object1 =
objects1.at(static_cast<std::vector<int>::size_type>(direct_assignment.at(tracker_idx)));
// merge object1 into object0_state
object0_state.updateState(input_sensor, current_time, object1);
} else { // not found
Expand All @@ -328,7 +332,7 @@ bool DecorativeTrackerMergerNode::decorativeMerger(
}
// look for new object
for (int object1_idx = 0; object1_idx < static_cast<int>(objects1.size()); ++object1_idx) {
const auto & object1 = objects1.at(object1_idx);
const auto & object1 = objects1.at(static_cast<std::vector<int>::size_type>(object1_idx));
if (reverse_assignment.find(object1_idx) != reverse_assignment.end()) { // found
} else { // not found
inner_tracker_objects_.push_back(createNewTracker(input_sensor, current_time, object1));
Expand Down

0 comments on commit 62e9aa8

Please sign in to comment.