refactor: update include paths for debugger and processor modules

Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>

Author: technolojin

perception/multi_object_tracker/CMakeLists.txt

@@ -20,32 +20,34 @@ include_directories(
 )
 
 # Generate exe file
-set(MULTI_OBJECT_TRACKER_SRC
-  src/multi_object_tracker_core.cpp
+set(${PROJECT_NAME}_src
+  src/multi_object_tracker_node.cpp
   src/debugger/debugger.cpp
   src/debugger/debug_object.cpp
   src/processor/processor.cpp
   src/processor/input_manager.cpp
-  src/data_association/data_association.cpp
-  src/data_association/mu_successive_shortest_path/mu_successive_shortest_path_wrapper.cpp
-  src/tracker/motion_model/motion_model_base.cpp
-  src/tracker/motion_model/bicycle_motion_model.cpp
+)
+set(${PROJECT_NAME}_lib
+  lib/data_association/data_association.cpp
+  lib/data_association/mu_successive_shortest_path/mu_successive_shortest_path_wrapper.cpp
+  lib/tracker/motion_model/motion_model_base.cpp
+  lib/tracker/motion_model/bicycle_motion_model.cpp
   # cspell: ignore ctrv
-  src/tracker/motion_model/ctrv_motion_model.cpp
-  src/tracker/motion_model/cv_motion_model.cpp
-  src/tracker/model/tracker_base.cpp
-  src/tracker/model/big_vehicle_tracker.cpp
-  src/tracker/model/normal_vehicle_tracker.cpp
-  src/tracker/model/multiple_vehicle_tracker.cpp
-  src/tracker/model/bicycle_tracker.cpp
-  src/tracker/model/pedestrian_tracker.cpp
-  src/tracker/model/pedestrian_and_bicycle_tracker.cpp
-  src/tracker/model/unknown_tracker.cpp
-  src/tracker/model/pass_through_tracker.cpp
+  lib/tracker/motion_model/ctrv_motion_model.cpp
+  lib/tracker/motion_model/cv_motion_model.cpp
+  lib/tracker/model/tracker_base.cpp
+  lib/tracker/model/big_vehicle_tracker.cpp
+  lib/tracker/model/normal_vehicle_tracker.cpp
+  lib/tracker/model/multiple_vehicle_tracker.cpp
+  lib/tracker/model/bicycle_tracker.cpp
+  lib/tracker/model/pedestrian_tracker.cpp
+  lib/tracker/model/pedestrian_and_bicycle_tracker.cpp
+  lib/tracker/model/unknown_tracker.cpp
+  lib/tracker/model/pass_through_tracker.cpp
 )
-
 ament_auto_add_library(${PROJECT_NAME} SHARED
-  ${MULTI_OBJECT_TRACKER_SRC}
+  ${${PROJECT_NAME}_src}
+  ${${PROJECT_NAME}_lib}
 )
 
 target_link_libraries(${PROJECT_NAME}
@@ -55,7 +57,7 @@ target_link_libraries(${PROJECT_NAME}
 
 rclcpp_components_register_node(${PROJECT_NAME}
   PLUGIN "multi_object_tracker::MultiObjectTracker"
-  EXECUTABLE ${PROJECT_NAME}_node
+  EXECUTABLE multi_object_tracker_node
 )
 
 ament_auto_package(INSTALL_TO_SHARE

perception/multi_object_tracker/src/data_association/data_association.cpp perception/multi_object_tracker/lib/data_association/data_association.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "multi_object_tracker/debugger/debug_object.hpp"
+#include "debug_object.hpp"
 
 #include "autoware_perception_msgs/msg/tracked_object.hpp"
 

perception/multi_object_tracker/src/data_association/mu_successive_shortest_path/mu_successive_shortest_path_wrapper.cpp perception/multi_object_tracker/lib/data_association/mu_successive_shortest_path/mu_successive_shortest_path_wrapper.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef MULTI_OBJECT_TRACKER__DEBUGGER__DEBUG_OBJECT_HPP_
-#define MULTI_OBJECT_TRACKER__DEBUGGER__DEBUG_OBJECT_HPP_
+#ifndef DEBUGGER__DEBUG_OBJECT_HPP_
+#define DEBUGGER__DEBUG_OBJECT_HPP_
 
 #include "autoware/universe_utils/ros/uuid_helper.hpp"
 #include "multi_object_tracker/tracker/model/tracker_base.hpp"
@@ -99,4 +99,4 @@ class TrackerObjectDebugger
   void getMessage(visualization_msgs::msg::MarkerArray & marker_array) const;
 };
 
-#endif  // MULTI_OBJECT_TRACKER__DEBUGGER__DEBUG_OBJECT_HPP_
+#endif  // DEBUGGER__DEBUG_OBJECT_HPP_

perception/multi_object_tracker/src/data_association/successive_shortest_path/successive_shortest_path.cpp perception/multi_object_tracker/lib/data_association/successive_shortest_path/successive_shortest_path.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "multi_object_tracker/debugger/debugger.hpp"
+#include "debugger.hpp"
 
 #include <memory>
 

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

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef MULTI_OBJECT_TRACKER__DEBUGGER__DEBUGGER_HPP_
-#define MULTI_OBJECT_TRACKER__DEBUGGER__DEBUGGER_HPP_
+#ifndef DEBUGGER__DEBUGGER_HPP_
+#define DEBUGGER__DEBUGGER_HPP_
 
 #include "autoware/universe_utils/ros/debug_publisher.hpp"
 #include "autoware/universe_utils/ros/published_time_publisher.hpp"
-#include "multi_object_tracker/debugger/debug_object.hpp"
+#include "debug_object.hpp"
 
 #include <diagnostic_updater/diagnostic_updater.hpp>
 #include <diagnostic_updater/publisher.hpp>
@@ -104,4 +104,4 @@ class TrackerDebugger
   void publishObjectsMarkers();
 };
 
-#endif  // MULTI_OBJECT_TRACKER__DEBUGGER__DEBUGGER_HPP_
+#endif  // DEBUGGER__DEBUGGER_HPP_

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

@@ -15,7 +15,7 @@
 //
 #define EIGEN_MPL2_ONLY
 
-#include "multi_object_tracker/multi_object_tracker_core.hpp"
+#include "multi_object_tracker_node.hpp"
 
 #include "multi_object_tracker/utils/utils.hpp"
 

perception/multi_object_tracker/src/tracker/model/multiple_vehicle_tracker.cpp perception/multi_object_tracker/lib/tracker/model/multiple_vehicle_tracker.cpp

@@ -16,14 +16,14 @@
 // Author: v1.0 Yukihiro Saito
 ///
 
-#ifndef MULTI_OBJECT_TRACKER__MULTI_OBJECT_TRACKER_CORE_HPP_
-#define MULTI_OBJECT_TRACKER__MULTI_OBJECT_TRACKER_CORE_HPP_
+#ifndef MULTI_OBJECT_TRACKER_NODE_HPP_
+#define MULTI_OBJECT_TRACKER_NODE_HPP_
 
+#include "debugger/debugger.hpp"
 #include "multi_object_tracker/data_association/data_association.hpp"
-#include "multi_object_tracker/debugger/debugger.hpp"
-#include "multi_object_tracker/processor/input_manager.hpp"
-#include "multi_object_tracker/processor/processor.hpp"
 #include "multi_object_tracker/tracker/model/tracker_base.hpp"
+#include "processor/input_manager.hpp"
+#include "processor/processor.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -105,4 +105,4 @@ class MultiObjectTracker : public rclcpp::Node
 
 }  // namespace multi_object_tracker
 
-#endif  // MULTI_OBJECT_TRACKER__MULTI_OBJECT_TRACKER_CORE_HPP_
+#endif  // MULTI_OBJECT_TRACKER_NODE_HPP_

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "multi_object_tracker/processor/input_manager.hpp"
+#include "input_manager.hpp"
 
 #include <cassert>
 

perception/multi_object_tracker/src/tracker/model/pass_through_tracker.cpp perception/multi_object_tracker/lib/tracker/model/pass_through_tracker.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef MULTI_OBJECT_TRACKER__PROCESSOR__INPUT_MANAGER_HPP_
-#define MULTI_OBJECT_TRACKER__PROCESSOR__INPUT_MANAGER_HPP_
+#ifndef PROCESSOR__INPUT_MANAGER_HPP_
+#define PROCESSOR__INPUT_MANAGER_HPP_
 
 #include "rclcpp/rclcpp.hpp"
 
@@ -157,4 +157,4 @@ class InputManager
 
 }  // namespace multi_object_tracker
 
-#endif  // MULTI_OBJECT_TRACKER__PROCESSOR__INPUT_MANAGER_HPP_
+#endif  // PROCESSOR__INPUT_MANAGER_HPP_

perception/multi_object_tracker/src/tracker/model/pedestrian_and_bicycle_tracker.cpp perception/multi_object_tracker/lib/tracker/model/pedestrian_and_bicycle_tracker.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "multi_object_tracker/processor/processor.hpp"
+#include "processor.hpp"
 
 #include "multi_object_tracker/tracker/tracker.hpp"
 #include "object_recognition_utils/object_recognition_utils.hpp"

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

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef MULTI_OBJECT_TRACKER__PROCESSOR__PROCESSOR_HPP_
-#define MULTI_OBJECT_TRACKER__PROCESSOR__PROCESSOR_HPP_
+#ifndef PROCESSOR__PROCESSOR_HPP_
+#define PROCESSOR__PROCESSOR_HPP_
 
 #include "multi_object_tracker/tracker/model/tracker_base.hpp"
 
@@ -78,4 +78,4 @@ class TrackerProcessor
     const geometry_msgs::msg::Transform & self_transform, const uint & channel_index) const;
 };
 
-#endif  // MULTI_OBJECT_TRACKER__PROCESSOR__PROCESSOR_HPP_
+#endif  // PROCESSOR__PROCESSOR_HPP_