Skip to content

Commit 4568d1c

Browse files
committed
refactor: set namespace
Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent bb4ca98 commit 4568d1c

34 files changed

+160
-3
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -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

66+
} // namespace autoware::multi_object_tracker
67+
6468
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__ASSOCIATION_HPP_

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

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
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

3539
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_

perception/multi_object_tracker/include/autoware/multi_object_tracker/association/solver/mu_ssp.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
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

3741
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_

perception/multi_object_tracker/include/autoware/multi_object_tracker/association/solver/ssp.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
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

3741
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
#include "autoware/multi_object_tracker/tracker/object_model/object_model.hpp"
2525
#include "kalman_filter/kalman_filter.hpp"
2626

27+
namespace autoware::multi_object_tracker
28+
{
29+
2730
class BicycleTracker : public Tracker
2831
{
2932
private:
@@ -67,4 +70,6 @@ class BicycleTracker : public Tracker
6770
const geometry_msgs::msg::Transform & self_transform) const;
6871
};
6972

73+
} // namespace autoware::multi_object_tracker
74+
7075
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BICYCLE_TRACKER_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
#include "autoware/multi_object_tracker/tracker/object_model/object_model.hpp"
2525
#include "kalman_filter/kalman_filter.hpp"
2626

27+
namespace autoware::multi_object_tracker
28+
{
29+
2730
class BigVehicleTracker : public Tracker
2831
{
2932
private:
@@ -70,4 +73,6 @@ class BigVehicleTracker : public Tracker
7073
const geometry_msgs::msg::Transform & self_transform);
7174
};
7275

76+
} // namespace autoware::multi_object_tracker
77+
7378
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__BIG_VEHICLE_TRACKER_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
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

54+
} // namespace autoware::multi_object_tracker
55+
5156
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__MULTIPLE_VEHICLE_TRACKER_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
#include "autoware/multi_object_tracker/tracker/object_model/object_model.hpp"
2525
#include "kalman_filter/kalman_filter.hpp"
2626

27+
namespace autoware::multi_object_tracker
28+
{
29+
2730
class NormalVehicleTracker : public Tracker
2831
{
2932
private:
@@ -70,4 +73,6 @@ class NormalVehicleTracker : public Tracker
7073
const geometry_msgs::msg::Transform & self_transform);
7174
};
7275

76+
} // namespace autoware::multi_object_tracker
77+
7378
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__NORMAL_VEHICLE_TRACKER_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
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

50+
} // namespace autoware::multi_object_tracker
51+
4752
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PASS_THROUGH_TRACKER_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
#include "autoware/multi_object_tracker/tracker/model/tracker_base.hpp"
2525
#include "kalman_filter/kalman_filter.hpp"
2626

27+
namespace autoware::multi_object_tracker
28+
{
29+
2730
class PedestrianAndBicycleTracker : public Tracker
2831
{
2932
private:
@@ -46,4 +49,6 @@ class PedestrianAndBicycleTracker : public Tracker
4649
virtual ~PedestrianAndBicycleTracker() {}
4750
};
4851

52+
} // namespace autoware::multi_object_tracker
53+
4954
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_AND_BICYCLE_TRACKER_HPP_

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
#include "autoware/multi_object_tracker/tracker/object_model/object_model.hpp"
2525
#include "kalman_filter/kalman_filter.hpp"
2626

27-
// cspell: ignore CTRV
27+
namespace autoware::multi_object_tracker
28+
{
2829

2930
class PedestrianTracker : public Tracker
3031
{
@@ -49,7 +50,7 @@ class PedestrianTracker : public Tracker
4950
};
5051
BoundingBox bounding_box_;
5152
Cylinder cylinder_;
52-
53+
// cspell: ignore CTRV
5354
CTRVMotionModel motion_model_;
5455
using IDX = CTRVMotionModel::IDX;
5556

@@ -75,4 +76,6 @@ class PedestrianTracker : public Tracker
7576
const geometry_msgs::msg::Transform & self_transform) const;
7677
};
7778

79+
} // namespace autoware::multi_object_tracker
80+
7881
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__PEDESTRIAN_TRACKER_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
#include <vector>
3535

36+
namespace autoware::multi_object_tracker
37+
{
38+
3639
class Tracker
3740
{
3841
private:
@@ -114,4 +117,6 @@ class Tracker
114117
virtual bool predict(const rclcpp::Time & time) = 0;
115118
};
116119

120+
} // namespace autoware::multi_object_tracker
121+
117122
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
#include "autoware/multi_object_tracker/tracker/motion_model/cv_motion_model.hpp"
2424
#include "kalman_filter/kalman_filter.hpp"
2525

26+
namespace autoware::multi_object_tracker
27+
{
28+
2629
class UnknownTracker : public Tracker
2730
{
2831
private:
@@ -62,4 +65,6 @@ class UnknownTracker : public Tracker
6265
autoware_perception_msgs::msg::TrackedObject & object) const override;
6366
};
6467

68+
} // namespace autoware::multi_object_tracker
69+
6570
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MODEL__UNKNOWN_TRACKER_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
#endif
3333
#include <geometry_msgs/msg/twist.hpp>
3434

35+
namespace autoware::multi_object_tracker
36+
{
37+
3538
class BicycleMotionModel : public MotionModel
3639
{
3740
private:
@@ -107,4 +110,6 @@ class BicycleMotionModel : public MotionModel
107110
geometry_msgs::msg::Twist & twist, std::array<double, 36> & twist_cov) const override;
108111
};
109112

113+
} // namespace autoware::multi_object_tracker
114+
110115
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__BICYCLE_MOTION_MODEL_HPP_

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@
3232
#endif
3333
#include <geometry_msgs/msg/twist.hpp>
3434

35-
// cspell: ignore CTRV
35+
namespace autoware::multi_object_tracker
36+
{
3637

38+
// cspell: ignore CTRV
3739
class CTRVMotionModel : public MotionModel
3840
{
3941
private:
@@ -92,4 +94,6 @@ class CTRVMotionModel : public MotionModel
9294
geometry_msgs::msg::Twist & twist, std::array<double, 36> & twist_cov) const override;
9395
};
9496

97+
} // namespace autoware::multi_object_tracker
98+
9599
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CTRV_MOTION_MODEL_HPP_

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

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
#endif
3333
#include <geometry_msgs/msg/twist.hpp>
3434

35+
namespace autoware::multi_object_tracker
36+
{
37+
3538
class CVMotionModel : public MotionModel
3639
{
3740
private:
@@ -85,4 +88,6 @@ class CVMotionModel : public MotionModel
8588
geometry_msgs::msg::Twist & twist, std::array<double, 36> & twist_cov) const override;
8689
};
8790

91+
} // namespace autoware::multi_object_tracker
92+
8893
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__CV_MOTION_MODEL_HPP_

perception/multi_object_tracker/include/autoware/multi_object_tracker/tracker/motion_model/motion_model_base.hpp

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
#endif
3232
#include <geometry_msgs/msg/twist.hpp>
3333

34+
namespace autoware::multi_object_tracker
35+
{
36+
3437
class MotionModel
3538
{
3639
private:
@@ -65,4 +68,6 @@ class MotionModel
6568
geometry_msgs::msg::Twist & twist, std::array<double, 36> & twist_cov) const = 0;
6669
};
6770

71+
} // namespace autoware::multi_object_tracker
72+
6873
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__MOTION_MODEL__MOTION_MODEL_BASE_HPP_

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

+4
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ constexpr T kmph2mps(const T kmph)
4646

4747
} // namespace
4848

49+
namespace autoware::multi_object_tracker
50+
{
51+
4952
namespace object_model
5053
{
5154

@@ -301,5 +304,6 @@ static const ObjectModel bicycle(ObjectModelType::Bicycle);
301304
static const ObjectModel pedestrian(ObjectModelType::Pedestrian);
302305

303306
} // namespace object_model
307+
} // namespace autoware::multi_object_tracker
304308

305309
#endif // AUTOWARE__MULTI_OBJECT_TRACKER__TRACKER__OBJECT_MODEL__OBJECT_MODEL_HPP_

perception/multi_object_tracker/lib/association/association.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ double getFormedYawAngle(
6868
}
6969
} // namespace
7070

71+
namespace autoware::multi_object_tracker
72+
{
73+
7174
DataAssociation::DataAssociation(
7275
std::vector<int> can_assign_vector, std::vector<double> max_dist_vector,
7376
std::vector<double> max_area_vector, std::vector<double> min_area_vector,
@@ -224,3 +227,5 @@ Eigen::MatrixXd DataAssociation::calcScoreMatrix(
224227

225228
return score_matrix;
226229
}
230+
231+
} // namespace autoware::multi_object_tracker

perception/multi_object_tracker/lib/association/mu_successive_shortest_path/mu_ssp.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
#include <unordered_map>
2525
#include <vector>
2626

27+
namespace autoware::multi_object_tracker
28+
{
2729
namespace gnn_solver
2830
{
2931
void MuSSP::maximizeLinearAssignment(
@@ -39,3 +41,5 @@ void MuSSP::maximizeLinearAssignment(
3941
solve_muSSP(cost, direct_assignment, reverse_assignment);
4042
}
4143
} // namespace gnn_solver
44+
45+
} // namespace autoware::multi_object_tracker

perception/multi_object_tracker/lib/association/successive_shortest_path/ssp.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include <utility>
2323
#include <vector>
2424

25+
namespace autoware::multi_object_tracker
26+
{
2527
namespace gnn_solver
2628
{
2729
struct ResidualEdge
@@ -368,3 +370,5 @@ void SSP::maximizeLinearAssignment(
368370
#endif
369371
}
370372
} // namespace gnn_solver
373+
374+
} // namespace autoware::multi_object_tracker

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

+5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
4141
#endif
4242

43+
namespace autoware::multi_object_tracker
44+
{
45+
4346
using Label = autoware_perception_msgs::msg::ObjectClassification;
4447

4548
BicycleTracker::BicycleTracker(
@@ -334,3 +337,5 @@ bool BicycleTracker::getTrackedObject(
334337

335338
return true;
336339
}
340+
341+
} // namespace autoware::multi_object_tracker

perception/multi_object_tracker/lib/tracker/model/big_vehicle_tracker.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
4141
#endif
4242

43+
namespace autoware::multi_object_tracker
44+
{
4345
using Label = autoware_perception_msgs::msg::ObjectClassification;
4446

4547
BigVehicleTracker::BigVehicleTracker(
@@ -398,3 +400,5 @@ bool BigVehicleTracker::getTrackedObject(
398400

399401
return true;
400402
}
403+
404+
} // namespace autoware::multi_object_tracker

0 commit comments

Comments
 (0)