Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(autoware_radar_object_tracker): move headers to src and rename package #7808

Closed
wants to merge 2 commits into from
Closed

refactor(autoware_radar_object_tracker): move headers to src and rename package #7808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc44379
refactor(autoware_radar_object_tracker): move headers to src and rena…
esteve Jul 3, 2024
d1a4353
style(pre-commit): autofix
pre-commit-ci[bot] Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
control/autoware_pid_longitudinal_controller/** [email protected] [email protected] [email protected]
control/autoware_pure_pursuit/** [email protected] [email protected]
control/autoware_shift_decider/** [email protected] [email protected]
control/autoware_smart_mpc_trajectory_follower/** [email protected] [email protected] [email protected] [email protected]

Check warning on line 58 in .github/CODEOWNERS

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (masayuki)

Check warning on line 58 in .github/CODEOWNERS

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (aino)
control/autoware_trajectory_follower_base/** [email protected] [email protected]
control/autoware_trajectory_follower_node/** [email protected] [email protected]
control/autoware_vehicle_cmd_gate/** [email protected] [email protected]
Expand Down Expand Up @@ -105,6 +105,7 @@
map/util/lanelet2_map_preprocessor/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
perception/autoware_crosswalk_traffic_light_estimator/** [email protected] [email protected] [email protected]
perception/autoware_map_based_prediction/** [email protected] [email protected] [email protected] [email protected] [email protected]
perception/autoware_radar_object_tracker/** [email protected] [email protected] [email protected] [email protected]
perception/bytetrack/** [email protected] [email protected]
perception/cluster_merger/** [email protected] [email protected] [email protected]
perception/compare_map_segmentation/** [email protected] [email protected] [email protected]
Expand All @@ -129,7 +130,6 @@
perception/radar_crossing_objects_noise_filter/** [email protected] [email protected] [email protected] [email protected]
perception/radar_fusion_to_detected_object/** [email protected] [email protected] [email protected] [email protected]
perception/radar_object_clustering/** [email protected] [email protected] [email protected] [email protected]
perception/radar_object_tracker/** [email protected] [email protected] [email protected] [email protected]
perception/radar_tracks_msgs_converter/** [email protected] [email protected] [email protected] [email protected]
perception/raindrop_cluster_filter/** [email protected] [email protected] [email protected]
perception/shape_estimation/** [email protected] [email protected]
Expand Down
4 changes: 2 additions & 2 deletions launch/tier4_perception_launch/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

<exec_depend>autoware_crosswalk_traffic_light_estimator</exec_depend>
<exec_depend>autoware_map_based_prediction</exec_depend>
<exec_depend>autoware_radar_object_clustering</exec_depend>
<exec_depend>autoware_radar_object_tracker</exec_depend>
<exec_depend>cluster_merger</exec_depend>
<exec_depend>compare_map_segmentation</exec_depend>
<exec_depend>detected_object_feature_remover</exec_depend>
Expand All @@ -35,8 +37,6 @@
<exec_depend>probabilistic_occupancy_grid_map</exec_depend>
<exec_depend>radar_crossing_objects_noise_filter</exec_depend>
<exec_depend>radar_fusion_to_detected_object</exec_depend>
<exec_depend>radar_object_clustering</exec_depend>
<exec_depend>radar_object_tracker</exec_depend>
<exec_depend>shape_estimation</exec_depend>
<exec_depend>topic_tools</exec_depend>
<exec_depend>tracking_object_merger</exec_depend>
Expand Down
5 changes: 4 additions & 1 deletion ...ption/radar_object_tracker/CMakeLists.txt → ...oware_radar_object_tracker/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(radar_object_tracker)
project(autoware_radar_object_tracker)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down Expand Up @@ -42,6 +42,9 @@ target_link_libraries(${PROJECT_NAME}
${PROJECT_NAME}_utils
)

target_include_directories(${PROJECT_NAME}
PRIVATE src)

rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::radar_object_tracker::RadarObjectTrackerNode"
EXECUTABLE radar_object_tracker_node
Expand Down
0 perception/radar_object_tracker/README.md → ...n/autoware_radar_object_tracker/README.md
View file
Open in desktop
File renamed without changes.
0 ...config/data_association_matrix.param.yaml → ...config/data_association_matrix.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...tracker/config/default_tracker.param.yaml → ...tracker/config/default_tracker.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...er/config/radar_object_tracker.param.yaml → ...er/config/radar_object_tracker.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...cker/config/simulation_tracker.param.yaml → ...cker/config/simulation_tracker.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...ng/constant_turn_rate_motion_tracker.yaml → ...ng/constant_turn_rate_motion_tracker.yaml
View file
Open in desktop
File renamed without changes.
0 ...onfig/tracking/linear_motion_tracker.yaml → ...onfig/tracking/linear_motion_tracker.yaml
View file
Open in desktop
File renamed without changes.
0 ..._tracker/image/noise_filtering.drawio.svg → ..._tracker/image/noise_filtering.drawio.svg
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion ...er/launch/radar_object_tracker.launch.xml → ...er/launch/radar_object_tracker.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<arg name="radar_object_tracker_param_path" default="$(find-pkg-share radar_object_tracker)/config/radar_object_tracker.param.yaml"/>
<arg name="vector_map_topic" default="/map/vector_map"/>

<node pkg="radar_object_tracker" exec="radar_object_tracker_node" name="radar_object_tracker" output="screen">
<node pkg="autoware_radar_object_tracker" exec="radar_object_tracker_node" name="radar_object_tracker" output="screen">
<remap from="input" to="$(var input)"/>
<remap from="output" to="$(var output)"/>
<remap from="/vector_map" to="$(var vector_map_topic)"/>
Expand Down
0 perception/radar_object_tracker/models.md → ...n/autoware_radar_object_tracker/models.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion perception/radar_object_tracker/package.xml → ...autoware_radar_object_tracker/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>radar_object_tracker</name>
<name>autoware_radar_object_tracker</name>
<version>0.0.0</version>
<description>Do tracking radar object</description>
<maintainer email="[email protected]">Yoshi Ri</maintainer>
Expand Down
0 ...cker/src/association/data_association.cpp → ...cker/src/association/data_association.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ..._tracker/association/data_association.hpp → ...cker/src/association/data_association.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
// Author: v1.0 Yukihiro Saito
//

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#ifndef ASSOCIATION__DATA_ASSOCIATION_HPP_
#define ASSOCIATION__DATA_ASSOCIATION_HPP_

#define EIGEN_MPL2_ONLY

Expand Down Expand Up @@ -65,4 +65,4 @@ class DataAssociation
virtual ~DataAssociation() {}
};
} // namespace autoware::radar_object_tracker
#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#endif // ASSOCIATION__DATA_ASSOCIATION_HPP_
0 ...p/mu_successive_shortest_path_wrapper.cpp → ...p/mu_successive_shortest_path_wrapper.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...tracker/association/solver/gnn_solver.hpp → ...ker/src/association/solver/gnn_solver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#ifndef ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define ASSOCIATION__SOLVER__GNN_SOLVER_HPP_

#include "autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp"
#include "autoware_radar_object_tracker/association/solver/mu_ssp.hpp"
#include "autoware_radar_object_tracker/association/solver/ssp.hpp"

#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#endif // ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
6 changes: 3 additions & 3 deletions ...sociation/solver/gnn_solver_interface.hpp → ...sociation/solver/gnn_solver_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#ifndef ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_

#include <unordered_map>
#include <vector>
Expand All @@ -32,4 +32,4 @@ class GnnSolverInterface
};
} // namespace autoware::radar_object_tracker::gnn_solver

#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#endif // ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
6 changes: 3 additions & 3 deletions ...ect_tracker/association/solver/mu_ssp.hpp → ...tracker/src/association/solver/mu_ssp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#ifndef ASSOCIATION__SOLVER__MU_SSP_HPP_
#define ASSOCIATION__SOLVER__MU_SSP_HPP_

#include "autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp"

Expand All @@ -34,4 +34,4 @@ class MuSSP : public GnnSolverInterface
};
} // namespace autoware::radar_object_tracker::gnn_solver

#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#endif // ASSOCIATION__SOLVER__MU_SSP_HPP_
6 changes: 3 additions & 3 deletions ...object_tracker/association/solver/ssp.hpp → ...ct_tracker/src/association/solver/ssp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_
#ifndef ASSOCIATION__SOLVER__SSP_HPP_
#define ASSOCIATION__SOLVER__SSP_HPP_

#include "autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp"

Expand All @@ -34,4 +34,4 @@ class SSP : public GnnSolverInterface
};
} // namespace autoware::radar_object_tracker::gnn_solver

#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_
#endif // ASSOCIATION__SOLVER__SSP_HPP_
0 ...ociation/ssp/successive_shortest_path.cpp → ...ociation/ssp/successive_shortest_path.cpp
View file
Open in desktop
File renamed without changes.
0 ...tracker/src/radar_object_tracker_node.cpp → ...tracker/src/radar_object_tracker_node.cpp
View file
Open in desktop
File renamed without changes.
0 ...tracker/src/radar_object_tracker_node.hpp → ...tracker/src/radar_object_tracker_node.hpp
View file
Open in desktop
File renamed without changes.
0 ...del/constant_turn_rate_motion_tracker.cpp → ...del/constant_turn_rate_motion_tracker.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...del/constant_turn_rate_motion_tracker.hpp → ...del/constant_turn_rate_motion_tracker.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_
#ifndef TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_
#define TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_

#include "autoware_radar_object_tracker/tracker/model/tracker_base.hpp"
#include "kalman_filter/kalman_filter.hpp"
Expand Down Expand Up @@ -109,4 +109,4 @@ class ConstantTurnRateMotionTracker : public Tracker // means constant turn rat
virtual ~ConstantTurnRateMotionTracker() {}
};
} // namespace autoware::radar_object_tracker
#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_
#endif // TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_
0 ...c/tracker/model/linear_motion_tracker.cpp → ...c/tracker/model/linear_motion_tracker.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...r/tracker/model/linear_motion_tracker.hpp → ...c/tracker/model/linear_motion_tracker.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_
#ifndef TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_
#define TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_

#include "autoware_radar_object_tracker/tracker/model/tracker_base.hpp"
#include "kalman_filter/kalman_filter.hpp"
Expand Down Expand Up @@ -114,4 +114,4 @@ class LinearMotionTracker : public Tracker
virtual ~LinearMotionTracker() {}
};
} // namespace autoware::radar_object_tracker
#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_
#endif // TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_
0 ...racker/src/tracker/model/tracker_base.cpp → ...racker/src/tracker/model/tracker_base.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ct_tracker/tracker/model/tracker_base.hpp → ...racker/src/tracker/model/tracker_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
// Author: v1.0 Yukihiro Saito
//

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
#ifndef TRACKER__MODEL__TRACKER_BASE_HPP_
#define TRACKER__MODEL__TRACKER_BASE_HPP_

#define EIGEN_MPL2_ONLY
#include "autoware_radar_object_tracker/utils/utils.hpp"
Expand Down Expand Up @@ -95,4 +95,4 @@ class Tracker
virtual bool predict(const rclcpp::Time & time) = 0;
};
} // namespace autoware::radar_object_tracker
#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_
#endif // TRACKER__MODEL__TRACKER_BASE_HPP_
6 changes: 3 additions & 3 deletions ..._radar_object_tracker/tracker/tracker.hpp → ...ar_object_tracker/src/tracker/tracker.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__TRACKER_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__TRACKER_HPP_
#ifndef TRACKER__TRACKER_HPP_
#define TRACKER__TRACKER_HPP_

#include "model/constant_turn_rate_motion_tracker.hpp"
#include "model/linear_motion_tracker.hpp"
#include "model/tracker_base.hpp"

#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__TRACKER_HPP_
#endif // TRACKER__TRACKER_HPP_
0 .../src/utils/radar_object_tracker_utils.cpp → .../src/utils/radar_object_tracker_utils.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...cker/utils/radar_object_tracker_utils.hpp → .../src/utils/radar_object_tracker_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_
#ifndef UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_
#define UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_

#include "autoware/universe_utils/geometry/geometry.hpp"
#include "autoware/universe_utils/math/unit_conversion.hpp"
Expand Down Expand Up @@ -73,4 +73,4 @@ bool hasValidVelocityDirectionToLanelet(

} // namespace autoware::radar_object_tracker::utils

#endif // AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_
#endif // UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_
0 .../radar_object_tracker/src/utils/utils.cpp → ..._radar_object_tracker/src/utils/utils.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ware_radar_object_tracker/utils/utils.hpp → ..._radar_object_tracker/src/utils/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
// Author: v1.0 Yukihiro Saito
//

#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__UTILS_HPP_
#define AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__UTILS_HPP_
#ifndef UTILS__UTILS_HPP_
#define UTILS__UTILS_HPP_

#include <Eigen/Core>
#include <Eigen/Dense>
Expand All @@ -41,4 +41,4 @@ Eigen::MatrixXd stackMatricesDiagonally(const std::vector<Eigen::MatrixXd> & mat

} // namespace autoware::radar_object_tracker::utils

#endif // AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__UTILS_HPP_
#endif // UTILS__UTILS_HPP_
0 .../test/test_radar_object_tracker_utils.cpp → .../test/test_radar_object_tracker_utils.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions perception/radar_object_clustering/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>radar_object_clustering</name>
<name>autoware_radar_object_clustering</name>
<version>0.1.0</version>
<description>radar_object_clustering</description>
<description>autoware_radar_object_clustering</description>
<maintainer email="[email protected]">Sathshi Tanaka</maintainer>
<maintainer email="[email protected]">Shunsuke Miura</maintainer>
<maintainer email="[email protected]">Yoshi Ri</maintainer>
Expand Down
Loading