Skip to content

Commit a779474

Browse files
committed
refactor(polar_association): rename scoring file and update references
- Renamed polar_scoring.hpp to polar_assignment_scoring.hpp to better reflect its functionality. - Updated include paths in polar_association.hpp and polar_association.cpp to reference the new scoring file. - Introduced the calculatePolarAssignmentScore function to enhance the scoring mechanism for polar coordinates, improving the overall association process.
1 parent d9b0b1c commit a779474

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

perception/autoware_multi_object_tracker/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ set(${PROJECT_NAME}_lib
4545
lib/association/tracker_overlap_manager.cpp
4646
lib/association/polar_association.cpp
4747
lib/association/scoring/bev_assignment_scoring.cpp
48-
lib/association/scoring/polar_scoring.cpp
48+
lib/association/scoring/polar_assignment_scoring.cpp
4949
lib/association/scoring/redundancy_check.cpp
5050
lib/association/mu_successive_shortest_path/mu_ssp.cpp
5151
lib/types.cpp

perception/autoware_multi_object_tracker/include/autoware/multi_object_tracker/association/polar_association.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__POLAR_ASSOCIATION_HPP_
1717

1818
#include "autoware/multi_object_tracker/association/association_base.hpp"
19-
#include "autoware/multi_object_tracker/association/scoring/polar_scoring.hpp"
19+
#include "autoware/multi_object_tracker/association/scoring/polar_assignment_scoring.hpp"
2020
#include "autoware/multi_object_tracker/association/solver/gnn_solver.hpp"
2121
#include "autoware/multi_object_tracker/configurations.hpp"
2222
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"

perception/autoware_multi_object_tracker/include/autoware/multi_object_tracker/association/scoring/polar_scoring.hpp renamed to perception/autoware_multi_object_tracker/include/autoware/multi_object_tracker/association/scoring/polar_assignment_scoring.hpp

Lines changed: 5 additions & 5 deletions
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__MULTI_OBJECT_TRACKER__ASSOCIATION__SCORING__POLAR_SCORING_HPP_
16-
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SCORING__POLAR_SCORING_HPP_
15+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SCORING__POLAR_ASSIGNMENT_SCORING_HPP_
16+
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SCORING__POLAR_ASSIGNMENT_SCORING_HPP_
1717

1818
#include "autoware/multi_object_tracker/types.hpp"
1919

@@ -75,16 +75,16 @@ double radialCompatibility(double r_min_a, double r_min_b);
7575
double heightIoU(double z_min_a, double z_max_a, double z_min_b, double z_max_b);
7676

7777
/// Compute a combined [0, 1] polar assignment score.
78-
/// Mirrors calculateAssignmentScore() from assignment_scoring for BEV.
78+
/// Mirrors calculateBevAssignmentScore() for polar coordinates.
7979
/// Returns 0.0 when the pair fails the min_iou gate.
8080
/// Sets has_significant_shape_change when the pair is a vehicle tracker and their areas
8181
/// differ noticeably despite a low azimuth IoU.
82-
double calculatePolarScore(
82+
double calculatePolarAssignmentScore(
8383
const PolarFootprint & meas_fp, const PolarFootprint & tracker_fp,
8484
const types::DynamicObject & measurement_object, const types::DynamicObject & tracked_object,
8585
types::TrackerType tracker_type, double min_iou, bool & has_significant_shape_change);
8686

8787
} // namespace polar_scoring
8888
} // namespace autoware::multi_object_tracker
8989

90-
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SCORING__POLAR_SCORING_HPP_
90+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SCORING__POLAR_ASSIGNMENT_SCORING_HPP_

perception/autoware_multi_object_tracker/lib/association/polar_association.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "autoware/multi_object_tracker/association/polar_association.hpp"
1616

17-
#include "autoware/multi_object_tracker/association/scoring/polar_scoring.hpp"
17+
#include "autoware/multi_object_tracker/association/scoring/polar_assignment_scoring.hpp"
1818
#include "autoware/multi_object_tracker/association/solver/gnn_solver.hpp"
1919
#include "autoware/multi_object_tracker/types.hpp"
2020

@@ -203,7 +203,7 @@ void PolarAssociation::processMeasurement(
203203
if (near_face_gap > NEAR_FACE_GAP_THRESHOLD) continue;
204204

205205
bool has_significant_shape_change = false;
206-
const double score = polar_scoring::calculatePolarScore(
206+
const double score = polar_scoring::calculatePolarAssignmentScore(
207207
meas_fp, tracker_fp, measurement_object, tracked_object, tracker_type,
208208
association_params.min_iou, has_significant_shape_change);
209209

perception/autoware_multi_object_tracker/lib/association/scoring/polar_scoring.cpp renamed to perception/autoware_multi_object_tracker/lib/association/scoring/polar_assignment_scoring.cpp

Lines changed: 2 additions & 2 deletions
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/multi_object_tracker/association/scoring/polar_scoring.hpp"
15+
#include "autoware/multi_object_tracker/association/scoring/polar_assignment_scoring.hpp"
1616

1717
#include "autoware/multi_object_tracker/object_model/shapes.hpp"
1818

@@ -130,7 +130,7 @@ double heightIoU(
130130
return std::min(1.0, overlap / span);
131131
}
132132

133-
double calculatePolarScore(
133+
double calculatePolarAssignmentScore(
134134
const PolarFootprint & meas_fp, const PolarFootprint & tracker_fp,
135135
const types::DynamicObject & measurement_object, const types::DynamicObject & tracked_object,
136136
const types::TrackerType tracker_type, const double min_iou, bool & has_significant_shape_change)

0 commit comments

Comments
 (0)