Skip to content

Commit 082db7f

Browse files
committed
refactor(multi_object_tracker): remove BicycleTracker and replace with VehicleTracker in relevant classes
1 parent 77a2abd commit 082db7f

File tree

8 files changed

+8
-356
lines changed

8 files changed

+8
-356
lines changed

perception/autoware_multi_object_tracker/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ set(${PROJECT_NAME}_lib
4141
lib/tracker/model/tracker_base.cpp
4242
lib/tracker/model/vehicle_tracker.cpp
4343
lib/tracker/model/multiple_vehicle_tracker.cpp
44-
lib/tracker/model/bicycle_tracker.cpp
4544
lib/tracker/model/pedestrian_tracker.cpp
4645
lib/tracker/model/pedestrian_and_bicycle_tracker.cpp
4746
lib/tracker/model/unknown_tracker.cpp

perception/autoware_multi_object_tracker/include/autoware/multi_object_tracker/tracker/model/bicycle_tracker.hpp

-59
This file was deleted.

perception/autoware_multi_object_tracker/include/autoware/multi_object_tracker/tracker/model/pedestrian_and_bicycle_tracker.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_
2121

2222
#include "autoware/multi_object_tracker/object_model/types.hpp"
23-
#include "autoware/multi_object_tracker/tracker/model/bicycle_tracker.hpp"
2423
#include "autoware/multi_object_tracker/tracker/model/pedestrian_tracker.hpp"
2524
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
25+
#include "autoware/multi_object_tracker/tracker/model/vehicle_tracker.hpp"
2626

2727
#include <autoware/kalman_filter/kalman_filter.hpp>
2828

@@ -33,7 +33,7 @@ class PedestrianAndBicycleTracker : public Tracker
3333
{
3434
private:
3535
PedestrianTracker pedestrian_tracker_;
36-
BicycleTracker bicycle_tracker_;
36+
VehicleTracker bicycle_tracker_;
3737

3838
public:
3939
PedestrianAndBicycleTracker(const rclcpp::Time & time, const types::DynamicObject & object);

perception/autoware_multi_object_tracker/include/autoware/multi_object_tracker/tracker/tracker.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__TRACKER_HPP_
2020
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__TRACKER_HPP_
2121

22-
#include "model/bicycle_tracker.hpp"
2322
#include "model/multiple_vehicle_tracker.hpp"
2423
#include "model/pass_through_tracker.hpp"
2524
#include "model/pedestrian_and_bicycle_tracker.hpp"

perception/autoware_multi_object_tracker/lib/tracker/model/bicycle_tracker.cpp

-290
This file was deleted.

perception/autoware_multi_object_tracker/lib/tracker/model/pedestrian_and_bicycle_tracker.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ namespace autoware::multi_object_tracker
2222
{
2323
PedestrianAndBicycleTracker::PedestrianAndBicycleTracker(
2424
const rclcpp::Time & time, const types::DynamicObject & object)
25-
: Tracker(time, object), pedestrian_tracker_(time, object), bicycle_tracker_(time, object)
25+
: Tracker(time, object),
26+
pedestrian_tracker_(time, object),
27+
bicycle_tracker_(object_model::bicycle, time, object)
2628
{
2729
}
2830

0 commit comments

Comments
 (0)