Skip to content

Commit 9a5e6c6

Browse files
authored
refactor(multi_object_tracker): use constexpr properly (#7206)
reafctor multi_object_tracker Signed-off-by: Ryuta Kambe <ryuta.kambe@tier4.jp>
1 parent 1b7c600 commit 9a5e6c6

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ BicycleTracker::BicycleTracker(
127127
constexpr double p0_stddev_y = 0.5; // in object coordinate [m]
128128
constexpr double p0_stddev_yaw =
129129
tier4_autoware_utils::deg2rad(25); // in map coordinate [rad]
130-
constexpr double p0_cov_x = std::pow(p0_stddev_x, 2.0);
131-
constexpr double p0_cov_y = std::pow(p0_stddev_y, 2.0);
132-
constexpr double p0_cov_yaw = std::pow(p0_stddev_yaw, 2.0);
130+
constexpr double p0_cov_x = p0_stddev_x * p0_stddev_x;
131+
constexpr double p0_cov_y = p0_stddev_y * p0_stddev_y;
132+
constexpr double p0_cov_yaw = p0_stddev_yaw * p0_stddev_yaw;
133133

134134
const double cos_yaw = std::cos(yaw);
135135
const double sin_yaw = std::sin(yaw);

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ BigVehicleTracker::BigVehicleTracker(
147147
constexpr double p0_stddev_y = 0.5; // in object coordinate [m]
148148
constexpr double p0_stddev_yaw =
149149
tier4_autoware_utils::deg2rad(25); // in map coordinate [rad]
150-
constexpr double p0_cov_x = std::pow(p0_stddev_x, 2.0);
151-
constexpr double p0_cov_y = std::pow(p0_stddev_y, 2.0);
152-
constexpr double p0_cov_yaw = std::pow(p0_stddev_yaw, 2.0);
150+
constexpr double p0_cov_x = p0_stddev_x * p0_stddev_x;
151+
constexpr double p0_cov_y = p0_stddev_y * p0_stddev_y;
152+
constexpr double p0_cov_yaw = p0_stddev_yaw * p0_stddev_yaw;
153153

154154
const double cos_yaw = std::cos(yaw);
155155
const double sin_yaw = std::sin(yaw);

perception/multi_object_tracker/src/tracker/model/normal_vehicle_tracker.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ NormalVehicleTracker::NormalVehicleTracker(
148148
constexpr double p0_stddev_y = 0.3; // in object coordinate [m]
149149
constexpr double p0_stddev_yaw =
150150
tier4_autoware_utils::deg2rad(25); // in map coordinate [rad]
151-
constexpr double p0_cov_x = std::pow(p0_stddev_x, 2.0);
152-
constexpr double p0_cov_y = std::pow(p0_stddev_y, 2.0);
153-
constexpr double p0_cov_yaw = std::pow(p0_stddev_yaw, 2.0);
151+
constexpr double p0_cov_x = p0_stddev_x * p0_stddev_x;
152+
constexpr double p0_cov_y = p0_stddev_y * p0_stddev_y;
153+
constexpr double p0_cov_yaw = p0_stddev_yaw * p0_stddev_yaw;
154154

155155
const double cos_yaw = std::cos(yaw);
156156
const double sin_yaw = std::sin(yaw);

perception/multi_object_tracker/src/tracker/model/pedestrian_tracker.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ PedestrianTracker::PedestrianTracker(
122122
constexpr double p0_stddev_y = 2.0; // in object coordinate [m]
123123
constexpr double p0_stddev_yaw =
124124
tier4_autoware_utils::deg2rad(1000); // in map coordinate [rad]
125-
constexpr double p0_cov_x = std::pow(p0_stddev_x, 2.0);
126-
constexpr double p0_cov_y = std::pow(p0_stddev_y, 2.0);
127-
constexpr double p0_cov_yaw = std::pow(p0_stddev_yaw, 2.0);
125+
constexpr double p0_cov_x = p0_stddev_x * p0_stddev_x;
126+
constexpr double p0_cov_y = p0_stddev_y * p0_stddev_y;
127+
constexpr double p0_cov_yaw = p0_stddev_yaw * p0_stddev_yaw;
128128

129129
const double cos_yaw = std::cos(yaw);
130130
const double sin_yaw = std::sin(yaw);

0 commit comments

Comments
 (0)