Skip to content

Commit 094f2e2

Browse files
technolojintechnolojin
authored
refactor(multi_object_tracker)!: fix namespace and directory structure (#7863)
* refactor: update include paths for debugger and processor modules Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * refactor: update include paths for debugger and processor modules Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * refactor: move include files into 'autoware' Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * refactor: set namespace Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * refactor: refine logics to pass cppcheck Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> --------- Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent deef7c4 commit 094f2e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+398
-204
lines changed

‎perception/multi_object_tracker/CMakeLists.txt

+23-21
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,34 @@ include_directories(
2020
)
2121

2222
# Generate exe file
23-
set(MULTI_OBJECT_TRACKER_SRC
24-
src/multi_object_tracker_core.cpp
23+
set(${PROJECT_NAME}_src
24+
src/multi_object_tracker_node.cpp
2525
src/debugger/debugger.cpp
2626
src/debugger/debug_object.cpp
2727
src/processor/processor.cpp
2828
src/processor/input_manager.cpp
29-
src/data_association/data_association.cpp
30-
src/data_association/mu_successive_shortest_path/mu_successive_shortest_path_wrapper.cpp
31-
src/tracker/motion_model/motion_model_base.cpp
32-
src/tracker/motion_model/bicycle_motion_model.cpp
29+
)
30+
set(${PROJECT_NAME}_lib
31+
lib/association/association.cpp
32+
lib/association/mu_successive_shortest_path/mu_ssp.cpp
33+
lib/tracker/motion_model/motion_model_base.cpp
34+
lib/tracker/motion_model/bicycle_motion_model.cpp
3335
# cspell: ignore ctrv
34-
src/tracker/motion_model/ctrv_motion_model.cpp
35-
src/tracker/motion_model/cv_motion_model.cpp
36-
src/tracker/model/tracker_base.cpp
37-
src/tracker/model/big_vehicle_tracker.cpp
38-
src/tracker/model/normal_vehicle_tracker.cpp
39-
src/tracker/model/multiple_vehicle_tracker.cpp
40-
src/tracker/model/bicycle_tracker.cpp
41-
src/tracker/model/pedestrian_tracker.cpp
42-
src/tracker/model/pedestrian_and_bicycle_tracker.cpp
43-
src/tracker/model/unknown_tracker.cpp
44-
src/tracker/model/pass_through_tracker.cpp
36+
lib/tracker/motion_model/ctrv_motion_model.cpp
37+
lib/tracker/motion_model/cv_motion_model.cpp
38+
lib/tracker/model/tracker_base.cpp
39+
lib/tracker/model/big_vehicle_tracker.cpp
40+
lib/tracker/model/normal_vehicle_tracker.cpp
41+
lib/tracker/model/multiple_vehicle_tracker.cpp
42+
lib/tracker/model/bicycle_tracker.cpp
43+
lib/tracker/model/pedestrian_tracker.cpp
44+
lib/tracker/model/pedestrian_and_bicycle_tracker.cpp
45+
lib/tracker/model/unknown_tracker.cpp
46+
lib/tracker/model/pass_through_tracker.cpp
4547
)
46-
4748
ament_auto_add_library(${PROJECT_NAME} SHARED
48-
${MULTI_OBJECT_TRACKER_SRC}
49+
${${PROJECT_NAME}_src}
50+
${${PROJECT_NAME}_lib}
4951
)
5052

5153
target_link_libraries(${PROJECT_NAME}
@@ -54,8 +56,8 @@ target_link_libraries(${PROJECT_NAME}
5456
)
5557

5658
rclcpp_components_register_node(${PROJECT_NAME}
57-
PLUGIN "multi_object_tracker::MultiObjectTracker"
58-
EXECUTABLE ${PROJECT_NAME}_node
59+
PLUGIN "autoware::multi_object_tracker::MultiObjectTracker"
60+
EXECUTABLE multi_object_tracker_node
5961
)
6062

6163
ament_auto_package(INSTALL_TO_SHARE

‎perception/multi_object_tracker/include/multi_object_tracker/data_association/data_association.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/association/association.hpp

+9-5
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
// Author: v1.0 Yukihiro Saito
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__DATA_ASSOCIATION_HPP_
20-
#define MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__DATA_ASSOCIATION_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__ASSOCIATION_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__ASSOCIATION_HPP_
2121

2222
#define EIGEN_MPL2_ONLY
2323

24-
#include "multi_object_tracker/data_association/solver/gnn_solver.hpp"
25-
#include "multi_object_tracker/tracker/tracker.hpp"
24+
#include "autoware/multi_object_tracker/association/solver/gnn_solver.hpp"
25+
#include "autoware/multi_object_tracker/tracker/tracker.hpp"
2626

2727
#include <Eigen/Core>
2828
#include <Eigen/Geometry>
@@ -34,6 +34,8 @@
3434
#include <unordered_map>
3535
#include <vector>
3636

37+
namespace autoware::multi_object_tracker
38+
{
3739
class DataAssociation
3840
{
3941
private:
@@ -61,4 +63,6 @@ class DataAssociation
6163
virtual ~DataAssociation() {}
6264
};
6365

64-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__DATA_ASSOCIATION_HPP_
66+
} // namespace autoware::multi_object_tracker
67+
68+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__ASSOCIATION_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/data_association/solver/gnn_solver.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/association/solver/gnn_solver.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
16-
#define MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
15+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
16+
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
1717

18-
#include "multi_object_tracker/data_association/solver/gnn_solver_interface.hpp"
19-
#include "multi_object_tracker/data_association/solver/mu_successive_shortest_path.hpp"
20-
#include "multi_object_tracker/data_association/solver/successive_shortest_path.hpp"
18+
#include "autoware/multi_object_tracker/association/solver/gnn_solver_interface.hpp"
19+
#include "autoware/multi_object_tracker/association/solver/mu_ssp.hpp"
20+
#include "autoware/multi_object_tracker/association/solver/ssp.hpp"
2121

22-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
22+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/data_association/solver/gnn_solver_interface.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/association/solver/gnn_solver_interface.hpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
16-
#define MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
15+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
16+
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
1717

1818
#include <unordered_map>
1919
#include <vector>
2020

21+
namespace autoware::multi_object_tracker
22+
{
2123
namespace gnn_solver
2224
{
2325
class GnnSolverInterface
@@ -30,6 +32,8 @@ class GnnSolverInterface
3032
const std::vector<std::vector<double>> & cost, std::unordered_map<int, int> * direct_assignment,
3133
std::unordered_map<int, int> * reverse_assignment) = 0;
3234
};
35+
3336
} // namespace gnn_solver
37+
} // namespace autoware::multi_object_tracker
3438

35-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
39+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/data_association/solver/mu_successive_shortest_path.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/association/solver/mu_ssp.hpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__MU_SUCCESSIVE_SHORTEST_PATH_HPP_
16-
#define MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__MU_SUCCESSIVE_SHORTEST_PATH_HPP_
15+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_
16+
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_
1717

18-
#include "multi_object_tracker/data_association/solver/gnn_solver_interface.hpp"
18+
#include "autoware/multi_object_tracker/association/solver/gnn_solver_interface.hpp"
1919

2020
#include <unordered_map>
2121
#include <vector>
2222

23+
namespace autoware::multi_object_tracker
24+
{
2325
namespace gnn_solver
2426
{
2527
class MuSSP : public GnnSolverInterface
@@ -32,6 +34,8 @@ class MuSSP : public GnnSolverInterface
3234
const std::vector<std::vector<double>> & cost, std::unordered_map<int, int> * direct_assignment,
3335
std::unordered_map<int, int> * reverse_assignment) override;
3436
};
37+
3538
} // namespace gnn_solver
39+
} // namespace autoware::multi_object_tracker
3640

37-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__MU_SUCCESSIVE_SHORTEST_PATH_HPP_
41+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/data_association/solver/successive_shortest_path.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/association/solver/ssp.hpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__SUCCESSIVE_SHORTEST_PATH_HPP_
16-
#define MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__SUCCESSIVE_SHORTEST_PATH_HPP_
15+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_
16+
#define AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_
1717

18-
#include "multi_object_tracker/data_association/solver/gnn_solver_interface.hpp"
18+
#include "autoware/multi_object_tracker/association/solver/gnn_solver_interface.hpp"
1919

2020
#include <unordered_map>
2121
#include <vector>
2222

23+
namespace autoware::multi_object_tracker
24+
{
2325
namespace gnn_solver
2426
{
2527
class SSP : public GnnSolverInterface
@@ -32,6 +34,8 @@ class SSP : public GnnSolverInterface
3234
const std::vector<std::vector<double>> & cost, std::unordered_map<int, int> * direct_assignment,
3335
std::unordered_map<int, int> * reverse_assignment) override;
3436
};
37+
3538
} // namespace gnn_solver
39+
} // namespace autoware::multi_object_tracker
3640

37-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__SUCCESSIVE_SHORTEST_PATH_HPP_
41+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_

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

+11-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
// Author: v1.0 Yukihiro Saito
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
23+
#include "autoware/multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp"
24+
#include "autoware/multi_object_tracker/tracker/object_model/object_model.hpp"
2225
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/model/tracker_base.hpp"
24-
#include "multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp"
25-
#include "multi_object_tracker/tracker/object_model/object_model.hpp"
26+
27+
namespace autoware::multi_object_tracker
28+
{
2629

2730
class BicycleTracker : public Tracker
2831
{
@@ -67,4 +70,6 @@ class BicycleTracker : public Tracker
6770
const geometry_msgs::msg::Transform & self_transform) const;
6871
};
6972

70-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_
73+
} // namespace autoware::multi_object_tracker
74+
75+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_

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

+11-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
// Author: v1.0 Yukihiro Saito
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
23+
#include "autoware/multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp"
24+
#include "autoware/multi_object_tracker/tracker/object_model/object_model.hpp"
2225
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/model/tracker_base.hpp"
24-
#include "multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp"
25-
#include "multi_object_tracker/tracker/object_model/object_model.hpp"
26+
27+
namespace autoware::multi_object_tracker
28+
{
2629

2730
class BigVehicleTracker : public Tracker
2831
{
@@ -70,4 +73,6 @@ class BigVehicleTracker : public Tracker
7073
const geometry_msgs::msg::Transform & self_transform);
7174
};
7275

73-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_
76+
} // namespace autoware::multi_object_tracker
77+
78+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/model/multiple_vehicle_tracker.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/tracker/model/multiple_vehicle_tracker.hpp

+11-6
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@
1616
// Author: v1.0 Yukihiro Saito
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/model/big_vehicle_tracker.hpp"
23+
#include "autoware/multi_object_tracker/tracker/model/normal_vehicle_tracker.hpp"
24+
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
2225
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/model/big_vehicle_tracker.hpp"
24-
#include "multi_object_tracker/tracker/model/normal_vehicle_tracker.hpp"
25-
#include "multi_object_tracker/tracker/model/tracker_base.hpp"
2626

2727
#include <rclcpp/time.hpp>
2828

29+
namespace autoware::multi_object_tracker
30+
{
31+
2932
class MultipleVehicleTracker : public Tracker
3033
{
3134
private:
@@ -48,4 +51,6 @@ class MultipleVehicleTracker : public Tracker
4851
virtual ~MultipleVehicleTracker() {}
4952
};
5053

51-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_
54+
} // namespace autoware::multi_object_tracker
55+
56+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_

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

+11-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
// Author: v1.0 Yukihiro Saito
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
23+
#include "autoware/multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp"
24+
#include "autoware/multi_object_tracker/tracker/object_model/object_model.hpp"
2225
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/model/tracker_base.hpp"
24-
#include "multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp"
25-
#include "multi_object_tracker/tracker/object_model/object_model.hpp"
26+
27+
namespace autoware::multi_object_tracker
28+
{
2629

2730
class NormalVehicleTracker : public Tracker
2831
{
@@ -70,4 +73,6 @@ class NormalVehicleTracker : public Tracker
7073
const geometry_msgs::msg::Transform & self_transform);
7174
};
7275

73-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_
76+
} // namespace autoware::multi_object_tracker
77+
78+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616
// Author: v1.0 Yutaka Shimizu
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_
2121

2222
#include "kalman_filter/kalman_filter.hpp"
2323
#include "tracker_base.hpp"
2424

25+
namespace autoware::multi_object_tracker
26+
{
27+
2528
class PassThroughTracker : public Tracker
2629
{
2730
private:
@@ -44,4 +47,6 @@ class PassThroughTracker : public Tracker
4447
autoware_perception_msgs::msg::TrackedObject & object) const override;
4548
};
4649

47-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_
50+
} // namespace autoware::multi_object_tracker
51+
52+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_

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

+11-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
// Author: v1.0 Yukihiro Saito
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/model/bicycle_tracker.hpp"
23+
#include "autoware/multi_object_tracker/tracker/model/pedestrian_tracker.hpp"
24+
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
2225
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/model/bicycle_tracker.hpp"
24-
#include "multi_object_tracker/tracker/model/pedestrian_tracker.hpp"
25-
#include "multi_object_tracker/tracker/model/tracker_base.hpp"
26+
27+
namespace autoware::multi_object_tracker
28+
{
2629

2730
class PedestrianAndBicycleTracker : public Tracker
2831
{
@@ -46,4 +49,6 @@ class PedestrianAndBicycleTracker : public Tracker
4649
virtual ~PedestrianAndBicycleTracker() {}
4750
};
4851

49-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_
52+
} // namespace autoware::multi_object_tracker
53+
54+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_

0 commit comments

Comments
 (0)