From 25331a00c69a5a16018d0dfbb2b7f1b9a626ce48 Mon Sep 17 00:00:00 2001 From: Servando German Date: Mon, 14 Jan 2019 09:08:15 +0000 Subject: [PATCH 1/2] Remove obsolete lidar_pf_track --- .../packages/lidar_pf_track/CHANGELOG.rst | 194 ------------------ .../packages/lidar_pf_track/CMakeLists.txt | 44 ---- .../packages/lidar_pf_track/interface.yaml | 3 - .../launch/lidar_pf_track.launch | 6 - .../nodes/lidar_pf_track/lidar_pf_track.cpp | 61 ------ .../packages/lidar_pf_track/package.xml | 19 -- 6 files changed, 327 deletions(-) delete mode 100644 ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CHANGELOG.rst delete mode 100644 ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CMakeLists.txt delete mode 100644 ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/interface.yaml delete mode 100644 ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/launch/lidar_pf_track.launch delete mode 100644 ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/nodes/lidar_pf_track/lidar_pf_track.cpp delete mode 100644 ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/package.xml diff --git a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CHANGELOG.rst b/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CHANGELOG.rst deleted file mode 100644 index a539debcaac..00000000000 --- a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CHANGELOG.rst +++ /dev/null @@ -1,194 +0,0 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package lidar_pf_track -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -1.9.1 (2018-11-06) ------------------- - -1.9.0 (2018-10-31) ------------------- - -1.8.0 (2018-08-31) ------------------- -* [Fix] Moved C++11 flag to autoware_build_flags (`#1395 `_) -* [Feature] Makes sure that all binaries have their dependencies linked (`#1385 `_) -* Contributors: Esteve Fernandez - -1.7.0 (2018-05-16) ------------------- -* Add code in cmakelists -* update Version from 1.6.3 to 1.7.0 in package.xml and CHANGELOG.rst -* Remove history of sub-branches -* Add automatically-generated CHANGELOG.rst -* [Fix] rename packages (`#1269 `_) - * rename lidar_tracker - * Modify pf_lidar_track's cmake file - * Refactor code - * Rename from euclidean_lidar_tracker to lidar_euclidean_track - * Rename from kf_contour_track to lidar_kf_contour_track - * Rename from kf_lidar_track to lidar_kf_track, but need some modification in euclidean cluster(Cluster.h) - * Rename from pf_lidar_tarck to lidar_pf_track - * Rename range_fusion - * Rename obj_reproj - * Rename euclidean_cluster to lidar_euclidean_cluster_detect - * Rename svm_lidar_detect to lidar_svm_detect - * Rename kf_lidar_track to lidar_kf_track - * Change version 1.6.3 to 1.7.0 in pacakge.xml - * Modify CMake so that extrenal header would be loaded - * Remove obj_reproj from cv_tracker - * Add interface.yaml - * Rename road_wizard to trafficlight_recognizer - * create common directory - * Add lidar_imm_ukf_pda_track - * create vision_detector and moved cv - * Modify interface.yaml and package.xml - * remove dpm_ocv - * moved directory - * Delete unnecessary launch file - * Delete rcnn related file and code - * separated dummy_track from cv_tracker - * separated klt_track from cv_tracker - * Fix a cmake - * Remove unnecessary dependency of lidar_euclidean_cluster_detect package - * Rename image_segmenter to vision_segment_enet_detect - * Remove unnecessary dependency of lidar_svm_detect package - * separated kf_track and fix a some compiling issue - * move viewers - * merge ndt_localizer and icp_localizer, and rename to lidar_localizer - * Remove unnecessary dependency of lidar_euclidean_track - * moved image lib - * add launch - * lib move under lidar_tracker - * Rename dpm_ttic to vision_dpm_ttic_detect - * rename yolo3detector to vision_yolo3_detect - * Modify cmake and package.xml in vision_dpm_ttic_detect - * moved sourcefiles into nodes dir - * moved sourcefiles into nodes dir - * Move cv_tracker/data folder and delete cv_tracker/model folder - * fix a package file and cmake - * Rename yolo2 -> vision_yolo2_detect - * fix a package file and cmake - * Fix package name of launch file - * Rename ssd to vision_ssd_detect - * fixed cmake and package for decerese dependencies - * remove top packages dir for detection - * fixed cmake for cuda - * Rename lane_detector to vision_lane_detect - * Modify package.xml in lidar-related packages - * Remove unnecessary dependencies in lidar_detector and lidar_tracker - * Modify computing.yaml for dpm_ttic - * Modify dpm_ttic launch file - * Remove/Add dependencies to trafficlight_recognizer - * Update data folder in dpm_ttic - * Modified CMake and package file in dpm_ttic. - * Remove src dir in imm_ukf_pda_track - * removed unnecessary comments - * rename lidar_tracker - * Modify pf_lidar_track's cmake file - * Refactor code - * Rename from euclidean_lidar_tracker to lidar_euclidean_track - * Rename from kf_contour_track to lidar_kf_contour_track - * Rename from kf_lidar_track to lidar_kf_track, but need some modification in euclidean cluster(Cluster.h) - * Rename from pf_lidar_tarck to lidar_pf_track - * Rename range_fusion - * Rename obj_reproj - * Rename road_wizard to trafficlight_recognizer - * Rename euclidean_cluster to lidar_euclidean_cluster_detect - * Rename svm_lidar_detect to lidar_svm_detect - * Rename kf_lidar_track to lidar_kf_track - * Change version 1.6.3 to 1.7.0 in pacakge.xml - * Modify CMake so that extrenal header would be loaded - * Remove obj_reproj from cv_tracker - * Add interface.yaml - * create common directory - * Add lidar_imm_ukf_pda_track - * create vision_detector and moved cv - * Modify interface.yaml and package.xml - * remove dpm_ocv - * moved directory - * Delete unnecessary launch file - * Delete rcnn related file and code - * separated dummy_track from cv_tracker - * separated klt_track from cv_tracker - * Fix a cmake - * Remove unnecessary dependency of lidar_euclidean_cluster_detect package - * Rename image_segmenter to vision_segment_enet_detect - * Remove unnecessary dependency of lidar_svm_detect package - * separated kf_track and fix a some compiling issue - * move viewers - * merge ndt_localizer and icp_localizer, and rename to lidar_localizer - * Remove unnecessary dependency of lidar_euclidean_track - * moved image lib - * add launch - * lib move under lidar_tracker - * Rename dpm_ttic to vision_dpm_ttic_detect - * rename yolo3detector to vision_yolo3_detect - * Modify cmake and package.xml in vision_dpm_ttic_detect - * moved sourcefiles into nodes dir - * moved sourcefiles into nodes dir - * Move cv_tracker/data folder and delete cv_tracker/model folder - * fix a package file and cmake - * Rename yolo2 -> vision_yolo2_detect - * fix a package file and cmake - * Fix package name of launch file - * Rename ssd to vision_ssd_detect - * fixed cmake and package for decerese dependencies - * remove top packages dir for detection - * fixed cmake for cuda - * Rename lane_detector to vision_lane_detect - * Modify package.xml in lidar-related packages - * Remove unnecessary dependencies in lidar_detector and lidar_tracker - * Modify computing.yaml for dpm_ttic - * Modify dpm_ttic launch file - * Remove/Add dependencies to trafficlight_recognizer - * Update data folder in dpm_ttic - * Modified CMake and package file in dpm_ttic. - * Remove src dir in imm_ukf_pda_track - * Fix bug for not starting run time manager - * Remove invalid dependency -* Contributors: Kenji Funaoka, Kosuke Murakami - -1.6.3 (2018-03-06) ------------------- - -1.6.2 (2018-02-27) ------------------- - -1.6.1 (2018-01-20) ------------------- - -1.6.0 (2017-12-11) ------------------- - -1.5.1 (2017-09-25) ------------------- - -1.5.0 (2017-09-21) ------------------- - -1.4.0 (2017-08-04) ------------------- - -1.3.1 (2017-07-16) ------------------- - -1.3.0 (2017-07-14) ------------------- - -1.2.0 (2017-06-07) ------------------- - -1.1.2 (2017-02-27 23:10) ------------------------- - -1.1.1 (2017-02-27 22:25) ------------------------- - -1.1.0 (2017-02-24) ------------------- - -1.0.1 (2017-01-14) ------------------- - -1.0.0 (2016-12-22) ------------------- diff --git a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CMakeLists.txt b/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CMakeLists.txt deleted file mode 100644 index ed4565f7208..00000000000 --- a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) -project(lidar_pf_track) - - -find_package(autoware_build_flags REQUIRED) - -find_package(autoware_msgs REQUIRED) -find_package(catkin REQUIRED COMPONENTS - roscpp - autoware_msgs - ) - - -set(CMAKE_CXX_FLAGS "-O2 -Wall ${CMAKE_CXX_FLAGS}") - -catkin_package( - CATKIN_DEPENDS - roscpp - autoware_msgs - ) - -include_directories( - ${catkin_INCLUDE_DIRS} - ${autoware_msgs_INCLUDE_DIRS} - ) - -#ParticleFilter Track -add_executable(lidar_pf_track - nodes/lidar_pf_track/lidar_pf_track.cpp - ) -target_link_libraries(lidar_pf_track - ${catkin_LIBRARIES} - ${PCL_LIBRARIES} - ) -add_dependencies(lidar_pf_track - ${catkin_EXPORTED_TARGETS} - ) - -install(TARGETS - lidar_pf_track - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} -) diff --git a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/interface.yaml b/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/interface.yaml deleted file mode 100644 index eee63491d34..00000000000 --- a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/interface.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- name: lidar_pf_track - publish: [/detected_objects] - subscribe: [/cloud_clusters_class] diff --git a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/launch/lidar_pf_track.launch b/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/launch/lidar_pf_track.launch deleted file mode 100644 index b1b2ccc4d0d..00000000000 --- a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/launch/lidar_pf_track.launch +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/nodes/lidar_pf_track/lidar_pf_track.cpp b/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/nodes/lidar_pf_track/lidar_pf_track.cpp deleted file mode 100644 index 1abb131906a..00000000000 --- a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/nodes/lidar_pf_track/lidar_pf_track.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * pf_track.cpp - * - * Created on: Nov 3, 2016 - * Author: ne0 - */ - -#include "ros/ros.h" - -#include "autoware_msgs/CloudCluster.h" -#include "autoware_msgs/CloudClusterArray.h" -#include "autoware_msgs/DetectedObject.h" -#include "autoware_msgs/DetectedObjectArray.h" - -class PfTrack { -public: - PfTrack(); - -private: - ros::NodeHandle node_handle_; - ros::Subscriber cloud_clusters_sub_; - ros::Publisher detected_objects_pub_; - - void CloudClustersCallback( - const autoware_msgs::CloudClusterArray::Ptr &in_cloud_cluster_array_ptr); -}; - -PfTrack::PfTrack() : node_handle_("~") { - cloud_clusters_sub_ = node_handle_.subscribe( - "/cloud_clusters_class", 10, &PfTrack::CloudClustersCallback, this); - detected_objects_pub_ = - node_handle_.advertise( - "/detected_objects", 10); -} - -void PfTrack::CloudClustersCallback( - const autoware_msgs::CloudClusterArray::Ptr &in_cloud_cluster_array_ptr) { - autoware_msgs::DetectedObjectArray detected_objects; - detected_objects.header = in_cloud_cluster_array_ptr->header; - for (auto i = in_cloud_cluster_array_ptr->clusters.begin(); - i != in_cloud_cluster_array_ptr->clusters.end(); i++) { - autoware_msgs::DetectedObject detected_object; - detected_object.header = i->header; - detected_object.id = i->id; - detected_object.label = i->label; - detected_object.dimensions = i->bounding_box.dimensions; - detected_object.pose = i->bounding_box.pose; - - detected_objects.objects.push_back(detected_object); - } - detected_objects_pub_.publish(detected_objects); -} - -int main(int argc, char **argv) { - - ros::init(argc, argv, "lidar_pf_detect"); - PfTrack node; - ros::spin(); - - return 0; -} diff --git a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/package.xml b/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/package.xml deleted file mode 100644 index 2a0b31cfd12..00000000000 --- a/ros/src/computing/perception/detection/lidar_tracker/packages/lidar_pf_track/package.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - lidar_pf_track - 1.9.1 - The lidar_pf_tracker package - - amc - BSD - - catkin - autoware_build_flags - - roscpp - autoware_msgs - - roscpp - autoware_msgs - - From a1198209f8910d9e8745af020d70aee2218af2f9 Mon Sep 17 00:00:00 2001 From: Servando German Date: Mon, 14 Jan 2019 09:24:03 +0000 Subject: [PATCH 2/2] Removed lidar_pf_track ui entry --- .../util/packages/runtime_manager/scripts/computing.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ros/src/util/packages/runtime_manager/scripts/computing.yaml b/ros/src/util/packages/runtime_manager/scripts/computing.yaml index b0e71dd4b5a..ec2535e70de 100755 --- a/ros/src/util/packages/runtime_manager/scripts/computing.yaml +++ b/ros/src/util/packages/runtime_manager/scripts/computing.yaml @@ -307,13 +307,6 @@ subs : gui : sync : func : self.button_synchronization.GetValue() - - name : lidar_pf_track - desc : lidar_pf_track desc sample - cmd : roslaunch lidar_pf_track lidar_pf_track.launch - param: lidar_pf_track - gui : - sync : - func : self.button_synchronization.GetValue() - name : lidar_euclidean_track desc : lidar_euclidean_track desc sample cmd : roslaunch lidar_euclidean_track lidar_euclidean_track.launch