fix conflict

Signed-off-by: scepter914 <scepter914@gmail.com>
autowarefoundation · Jul 11, 2022 · ba508d1 · ba508d1
2 parents d322cee + 2b3734f
commit ba508d1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/perception/radar_fusion_to_detected_object/README.md b/perception/radar_fusion_to_detected_object/README.md
@@ -17,7 +17,7 @@ The document of core algorithm is [here](docs/algorithm.md)
 | :----------------------- | :----- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------ |
 | bounding_box_margin      | double | The distance to extend the 2D bird's-eye view Bounding Box on each side. This distance is used as a threshold to find radar centroids falling inside the extended box. [m]                                                                                                       | 2.0           |
 | split_threshold_velocity | double | The object's velocity threshold to decide to split for two objects from radar information (currently not implemented) [m/s]                                                                                                                                                      | 5.0           |
-| threshold_yaw_diff       | double | The yaw orientation threshold. If $ \vert \theta _{ob} - \theta_ {ra} \vert < threshold_yaw_diff $ attached to radar information include estimated velocity, where $ \theta _{ob} $ is yaw angle from 3d detected object, $ \theta_ {ra} $ is yaw angle from radar object. [rad] | 0.35          |
+| threshold_yaw_diff       | double | The yaw orientation threshold. If $ \vert \theta _{ob} - \theta_ {ra} \vert < threshold*yaw_diff $ attached to radar information include estimated velocity, where $ \theta*{ob} $ is yaw angle from 3d detected object, $ \theta\_ {ra} $ is yaw angle from radar object. [rad] | 0.35          |
 
 ### Weight parameters for velocity estimation
 

diff --git a/perception/radar_fusion_to_detected_object/src/radar_fusion_to_detected_object.cpp b/perception/radar_fusion_to_detected_object/src/radar_fusion_to_detected_object.cpp
@@ -106,7 +106,6 @@ RadarFusionToDetectedObject::Output RadarFusionToDetectedObject::update(
           std::atan2(twist_with_covariance.twist.linear.y, twist_with_covariance.twist.linear.x));
         const double object_yaw = tier4_autoware_utils::normalizeRadian(
           tf2::getYaw(split_object.kinematics.pose_with_covariance.pose.orientation));
-        ;
         const double diff_yaw = tier4_autoware_utils::normalizeRadian(twist_yaw - object_yaw);
         if (isYawCorrect(diff_yaw, param_.threshold_yaw_diff)) {
           split_object.kinematics.twist_with_covariance = twist_with_covariance;