Skip to content

Commit bb4ca98

Browse files
technolojintechnolojin
committed
refactor: move include files into 'autoware'
Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent c5d5589 commit bb4ca98

Some content is hidden

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

43 files changed

+137
-137
lines changed

‎perception/multi_object_tracker/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ set(${PROJECT_NAME}_src
2828
src/processor/input_manager.cpp
2929
)
3030
set(${PROJECT_NAME}_lib
31-
lib/data_association/data_association.cpp
32-
lib/data_association/mu_successive_shortest_path/mu_successive_shortest_path_wrapper.cpp
31+
lib/association/association.cpp
32+
lib/association/mu_successive_shortest_path/mu_ssp.cpp
3333
lib/tracker/motion_model/motion_model_base.cpp
3434
lib/tracker/motion_model/bicycle_motion_model.cpp
3535
# cspell: ignore ctrv

‎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

+5-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>
@@ -61,4 +61,4 @@ class DataAssociation
6161
virtual ~DataAssociation() {}
6262
};
6363

64-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__DATA_ASSOCIATION_HPP_
64+
#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

+3-3
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 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>
@@ -32,4 +32,4 @@ class GnnSolverInterface
3232
};
3333
} // namespace gnn_solver
3434

35-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
35+
#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

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
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>
@@ -34,4 +34,4 @@ class MuSSP : public GnnSolverInterface
3434
};
3535
} // namespace gnn_solver
3636

37-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__MU_SUCCESSIVE_SHORTEST_PATH_HPP_
37+
#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

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
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>
@@ -34,4 +34,4 @@ class SSP : public GnnSolverInterface
3434
};
3535
} // namespace gnn_solver
3636

37-
#endif // MULTI_OBJECT_TRACKER__DATA_ASSOCIATION__SOLVER__SUCCESSIVE_SHORTEST_PATH_HPP_
37+
#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

+6-6
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__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"
2626

2727
class BicycleTracker : public Tracker
2828
{
@@ -67,4 +67,4 @@ class BicycleTracker : public Tracker
6767
const geometry_msgs::msg::Transform & self_transform) const;
6868
};
6969

70-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_
70+
#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

+6-6
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__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"
2626

2727
class BigVehicleTracker : public Tracker
2828
{
@@ -70,4 +70,4 @@ class BigVehicleTracker : public Tracker
7070
const geometry_msgs::msg::Transform & self_transform);
7171
};
7272

73-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_
73+
#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

+6-6
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__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

@@ -48,4 +48,4 @@ class MultipleVehicleTracker : public Tracker
4848
virtual ~MultipleVehicleTracker() {}
4949
};
5050

51-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_
51+
#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

+6-6
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__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"
2626

2727
class NormalVehicleTracker : public Tracker
2828
{
@@ -70,4 +70,4 @@ class NormalVehicleTracker : public Tracker
7070
const geometry_msgs::msg::Transform & self_transform);
7171
};
7272

73-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_
73+
#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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
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"
@@ -44,4 +44,4 @@ class PassThroughTracker : public Tracker
4444
autoware_perception_msgs::msg::TrackedObject & object) const override;
4545
};
4646

47-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_
47+
#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

+6-6
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__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"
2626

2727
class PedestrianAndBicycleTracker : public Tracker
2828
{
@@ -46,4 +46,4 @@ class PedestrianAndBicycleTracker : public Tracker
4646
virtual ~PedestrianAndBicycleTracker() {}
4747
};
4848

49-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_
49+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_

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

+6-6
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__TRACKER__MODEL__PEDESTRIAN_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_TRACKER_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
23+
#include "autoware/multi_object_tracker/tracker/motion_model/ctrv_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/ctrv_motion_model.hpp"
25-
#include "multi_object_tracker/tracker/object_model/object_model.hpp"
2626

2727
// cspell: ignore CTRV
2828

@@ -75,4 +75,4 @@ class PedestrianTracker : public Tracker
7575
const geometry_msgs::msg::Transform & self_transform) const;
7676
};
7777

78-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_TRACKER_HPP_
78+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_TRACKER_HPP_

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

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

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
2121

2222
#define EIGEN_MPL2_ONLY
23-
#include "multi_object_tracker/utils/utils.hpp"
23+
#include "autoware/multi_object_tracker/utils/utils.hpp"
2424
#include "object_recognition_utils/object_recognition_utils.hpp"
2525

2626
#include <Eigen/Core>
@@ -114,4 +114,4 @@ class Tracker
114114
virtual bool predict(const rclcpp::Time & time) = 0;
115115
};
116116

117-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
117+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_

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

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

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
23+
#include "autoware/multi_object_tracker/tracker/motion_model/cv_motion_model.hpp"
2224
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/model/tracker_base.hpp"
24-
#include "multi_object_tracker/tracker/motion_model/cv_motion_model.hpp"
2525

2626
class UnknownTracker : public Tracker
2727
{
@@ -62,4 +62,4 @@ class UnknownTracker : public Tracker
6262
autoware_perception_msgs::msg::TrackedObject & object) const override;
6363
};
6464

65-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_
65+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/tracker/motion_model/bicycle_motion_model.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
// Author: v1.0 Taekjin Lee
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__BICYCLE_MOTION_MODEL_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__BICYCLE_MOTION_MODEL_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__BICYCLE_MOTION_MODEL_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__BICYCLE_MOTION_MODEL_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/motion_model/motion_model_base.hpp"
2223
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/motion_model/motion_model_base.hpp"
2424

2525
#include <Eigen/Core>
2626
#include <rclcpp/rclcpp.hpp>
@@ -107,4 +107,4 @@ class BicycleMotionModel : public MotionModel
107107
geometry_msgs::msg::Twist & twist, std::array<double, 36> & twist_cov) const override;
108108
};
109109

110-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__BICYCLE_MOTION_MODEL_HPP_
110+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__BICYCLE_MOTION_MODEL_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/motion_model/ctrv_motion_model.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/tracker/motion_model/ctrv_motion_model.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
// Author: v1.0 Taekjin Lee
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CTRV_MOTION_MODEL_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CTRV_MOTION_MODEL_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CTRV_MOTION_MODEL_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CTRV_MOTION_MODEL_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/motion_model/motion_model_base.hpp"
2223
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/motion_model/motion_model_base.hpp"
2424

2525
#include <Eigen/Core>
2626
#include <rclcpp/rclcpp.hpp>
@@ -92,4 +92,4 @@ class CTRVMotionModel : public MotionModel
9292
geometry_msgs::msg::Twist & twist, std::array<double, 36> & twist_cov) const override;
9393
};
9494

95-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CTRV_MOTION_MODEL_HPP_
95+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CTRV_MOTION_MODEL_HPP_

‎perception/multi_object_tracker/include/multi_object_tracker/tracker/motion_model/cv_motion_model.hpp ‎perception/multi_object_tracker/include/autoware/multi_object_tracker/tracker/motion_model/cv_motion_model.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
// Author: v1.0 Taekjin Lee
1717
//
1818

19-
#ifndef MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CV_MOTION_MODEL_HPP_
20-
#define MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CV_MOTION_MODEL_HPP_
19+
#ifndef AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CV_MOTION_MODEL_HPP_
20+
#define AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CV_MOTION_MODEL_HPP_
2121

22+
#include "autoware/multi_object_tracker/tracker/motion_model/motion_model_base.hpp"
2223
#include "kalman_filter/kalman_filter.hpp"
23-
#include "multi_object_tracker/tracker/motion_model/motion_model_base.hpp"
2424

2525
#include <Eigen/Core>
2626
#include <rclcpp/rclcpp.hpp>
@@ -85,4 +85,4 @@ class CVMotionModel : public MotionModel
8585
geometry_msgs::msg::Twist & twist, std::array<double, 36> & twist_cov) const override;
8686
};
8787

88-
#endif // MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CV_MOTION_MODEL_HPP_
88+
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CV_MOTION_MODEL_HPP_

0 commit comments

Comments
 (0)