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.

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

fix: avoid same name nodes in detection module #1301

Merged

Conversation

tkimura4
Copy link
Contributor

@tkimura4 tkimura4 commented Jul 11, 2022

Signed-off-by: tomoya.kimura tomoya.kimura@tier4.jp

Description

avoid to launch duplicated-named nodes in detection module.

/perception/object_recognition/detection/clustering/detected_object_feature_remover_($ anon)
/perception/object_recognition/detection/clustering/shape_estimation 
/perception/object_recognition/detection/object_association_merger_($ anon)

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.

After all checkboxes are checked, anyone who has write access can merge the PR.

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
@shmpwk shmpwk self-requested a review July 11, 2022 07:13
@codecov
Copy link

codecov bot commented Jul 11, 2022

Codecov Report

Merging #1301 (ea03687) into main (44c4bd1) will increase coverage by 0.00%.
The diff coverage is 0.00%.

@@          Coverage Diff          @@
##            main   #1301   +/-   ##
=====================================
  Coverage   9.48%   9.49%           
=====================================
  Files       1096    1096           
  Lines      76293   76293           
  Branches   16990   16990           
=====================================
+ Hits        7239    7244    +5     
+ Misses     62440   62436    -4     
+ Partials    6614    6613    -1     
Flag Coverage Δ *Carryforward flag
differential 0.00% <ø> (?)
total 9.47% <0.00%> (+<0.01%) ⬆️ Carriedforward from b2ebf0a

*This pull request uses carry forward flags. Click here to find out more.

Impacted Files Coverage Δ
..._planner/include/scene_module/blind_spot/scene.hpp 0.00% <ø> (ø)
...city_planner/src/scene_module/blind_spot/debug.cpp 0.00% <0.00%> (ø)
...city_planner/src/scene_module/blind_spot/scene.cpp 0.00% <0.00%> (ø)
...vehicle_model/sim_model_ideal_steer_acc_geared.cpp 73.58% <0.00%> (+9.43%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9375358...ea03687. Read the comment docs.

Copy link
Contributor

@shmpwk shmpwk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works fine, but better to fix indent.
Also pre-commit.ci - pr ERROR.

tkimura4 and others added 4 commits July 11, 2022 17:05
…tion/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
…tion/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
…tion/lidar_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>
@tkimura4 tkimura4 merged commit 86c2be0 into autowarefoundation:main Jul 11, 2022
@tkimura4 tkimura4 deleted the fix/same_node_name_in_detection branch July 11, 2022 09:39
miursh pushed a commit to miursh/autoware.universe that referenced this pull request Jul 12, 2022
* release v0.4.0

* remove ROS1 packages temporarily

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* Revert "remove ROS1 packages temporarily"

This reverts commit a2dc52036f5950188b5b4caedb2edcd36d3e5860.

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* add COLCON_IGNORE to ros1 packages

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* ROS2 Porting: raw_vehicle_cmd_converter (autowarefoundation#9)

* remove dependency to unused std_msgs package

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* rm COLCON_IGNORE

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* port raw_vehicle_cmd_converter to ROS2

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* port raw_vehicle_cmd_converter.launch to ROS2

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* fix typo

Co-authored-by: Frederik Beaujean <72439809+fred-apex-ai@users.noreply.github.com>

* fix typo

Co-authored-by: Frederik Beaujean <72439809+fred-apex-ai@users.noreply.github.com>

* remove include_directories form CMakeLists.txt

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* fix order of includes

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* add missing comments

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

Co-authored-by: Frederik Beaujean <72439809+fred-apex-ai@users.noreply.github.com>

* fix duration unit for RCLCPP_*_THROTTLE (autowarefoundation#75)

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* Rename h files to hpp (autowarefoundation#142)

* Change includes

* Rename files

* Adjustments to make things compile

* Other packages

* Adjust copyright notice on 532 out of 699 source files (autowarefoundation#143)

* Use quotes for includes where appropriate (autowarefoundation#144)

* Use quotes for includes where appropriate

* Fix lint tests

* Make tests pass hopefully

* Run uncrustify on the entire Pilot.Auto codebase (autowarefoundation#151)

* Run uncrustify on the entire Pilot.Auto codebase

* Exclude open PRs

* ROS2 Linting: raw_vehicle_cmd_converter (autowarefoundation#161)

* Add linters

* Process linter corrections

* apply env_var to  use_sim_time (autowarefoundation#222)

* Ros2 v0.8.0 raw vehicle cmd converter (autowarefoundation#268)

* restore raw_vehicle_cmd_converter files for 0.8.0 update

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* fix typos in vehicle modules (autowarefoundation#954)

* add get func (autowarefoundation#1088)

* Revert "restore raw_vehicle_cmd_converter files for 0.8.0 update"

This reverts commit f243f26e20490757a332566aa92196553a682aa6.

Co-authored-by: Kazuki Miyahara <kmiya@outlook.com>
Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>

* update target branch for ci (autowarefoundation#309)

* update target branch for ci

Signed-off-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>

* [as]: Fix lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [latlon_muxer]: Fix lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [map_based_prediction]: Fix lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [raw_vehicle_cmd_converter]: Fix lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [remote_cmd_converter]: Fix lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* [turn_signal_decider]: Fix lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

Co-authored-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Unify Apache-2.0 license name (autowarefoundation#1242)

* Remove use_sim_time for set_parameter (autowarefoundation#1260)

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* add plot_accel_brake_map.py (autowarefoundation#1249) (autowarefoundation#1296)

* add plot_accel_brake_map.py (autowarefoundation#1249)

* add plot_accel_brake_map.py

* call plotter from rosrun

* add permission

Signed-off-by: Takamasa Horibe <horibe.takamasa@gmail.com>

Co-authored-by: Takamasa Horibe <horibe.takamasa@gmail.com>

* delete debug message

* Add license

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* apply format

* fix code

Co-authored-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Co-authored-by: wep21 <border_goldenmarket@yahoo.co.jp>
Co-authored-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* Fix lint errors (autowarefoundation#1378)

* Fix lint errors

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix variable names

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* enable to designate directory of maps (autowarefoundation#1301) (autowarefoundation#1480)

* enable to designate directory of maps

* add error handling

* use argparser

Co-authored-by: Takayuki Murooka <takayuki5168@gmail.com>

* Fix -Wunused-parameter (autowarefoundation#1836)

* Fix -Wunused-parameter

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix mistake

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* fix spell

* Fix lint issues

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Ignore flake8 warnings

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

Co-authored-by: Hiroki OTA <hiroki.ota@tier4.jp>

* add sort-package-xml hook in pre-commit (autowarefoundation#1881)

* add sort xml hook in pre-commit

* change retval to exit_status

* rename

* add prettier plugin-xml

* use early return

* add license note

* add tier4 license

* restore prettier

* change license order

* move local hooks to public repo

* move prettier-xml to pre-commit-hooks-ros

* update version for bug-fix

* apply pre-commit

* Feature/vehicle interface improvements (autowarefoundation#1361) (autowarefoundation#1688)

* Feature/vehicle interface improvements (autowarefoundation#1361)

* add vehicle msg

* add pacmod interface

* add eps controller

* use each control commands instead of vehicle command

* fixed details

* fixed speell check

* const

* fixed brake status

* publish cmd when recieving ctrl cmd

* fix shift cmd ptr

* remove unused function and set proper license

* fix names

* fix typo for pacmod

* remove unnecessary waiting

* use flags, limit, multiarray

* remove accel brake dependency

* fix retrun value

* replace eps to steer

* cosmetic change for namespace

* fix segfo and retval

* Use Enum instead of int

* remove unused var

* add const

* rename to calcFFMap

* prev time steer calc

* add sample csv

* add new line

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Apply lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Fix build failure for remote cmd converter

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Fix lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* replace to vehicle cmd emergency (autowarefoundation#1710) (autowarefoundation#1717)

* Fix subscriber topic type

Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>

* Fix rclcpp::Time initialization

Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>

Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>

* default debug value false in raw vehicle cmd converter (autowarefoundation#1755)

* default debug value false in raw vehicle cmd converter

* spell check

* Change formatter to clang-format and black (autowarefoundation#2332)

* Revert "Temporarily comment out pre-commit hooks"

This reverts commit 748e9cdb145ce12f8b520bcbd97f5ff899fc28a3.

* Replace ament_lint_common with autoware_lint_common

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Remove ament_cmake_uncrustify and ament_clang_format

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Apply Black

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Apply clang-format

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix build errors

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix for cpplint

* Fix include double quotes to angle brackets

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Apply clang-format

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix build errors

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Add COLCON_IGNORE (autowarefoundation#500)

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* [raw vehicle cmd converter] apply autoware auto msgs (autowarefoundation#519)

* remove ignore

* replace to autoware auto control message

* use localization odometry

* apply steering report

* appluy clang format

* cosmetic change

* fix spell check

* update to readme

* update launch

* minor fix

* precommit fix

* update README.md

Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>

* using AckermannControlCommand

* fix format

Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>

* move cmd converters to control pkg (autowarefoundation#642)

* auto/revert cmd converter (autowarefoundation#680)

* Revert "move cmd converters to control pkg (autowarefoundation#642)"

This reverts commit 19a10f9419aa25ef7a37e51c5df8f65b75cf8887.

* fix topic

* Auto/readme cmd converter (autowarefoundation#692)

* fix format

* add readme external cmd converter

* fix lint

* fiix sentence

Co-authored-by: Kazuki Miyahara <kmiya@outlook.com>

* fix format

Co-authored-by: Kazuki Miyahara <kmiya@outlook.com>

* fix sentence

Co-authored-by: Kazuki Miyahara <kmiya@outlook.com>

* better expression

Co-authored-by: Kazuki Miyahara <kmiya@outlook.com>

Co-authored-by: taikitanaka3 <taiki.tanaka@tier4.jp>
Co-authored-by: Kazuki Miyahara <kmiya@outlook.com>

* fix door cmd topic (autowarefoundation#711)

* fix door cmd topic

* fix topic

Co-authored-by: mitsudome-r <ryohsuke.mitsudome@tier4.jp>
Co-authored-by: Ryohsuke Mitsudome <43976834+mitsudome-r@users.noreply.github.com>
Co-authored-by: Frederik Beaujean <72439809+fred-apex-ai@users.noreply.github.com>
Co-authored-by: Takamasa Horibe <horibe.takamasa@gmail.com>
Co-authored-by: Nikolai Morin <nnmmgit@gmail.com>
Co-authored-by: Jilada Eccleston <jilada.eccleston@gmail.com>
Co-authored-by: Kosuke Murakami <kosuke.murakami@tier4.jp>
Co-authored-by: Kazuki Miyahara <kmiya@outlook.com>
Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>
Co-authored-by: wep21 <border_goldenmarket@yahoo.co.jp>
Co-authored-by: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com>
Co-authored-by: Keisuke Shima <keisuke.shima@tier4.jp>
Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Co-authored-by: Takayuki Murooka <takayuki5168@gmail.com>
Co-authored-by: Hiroki OTA <hiroki.ota@tier4.jp>
Co-authored-by: Keisuke Shima <19993104+KeisukeShima@users.noreply.github.com>
Co-authored-by: taikitanaka3 <taiki.tanaka@tier4.jp>
Co-authored-by: Takeshi Miura <57553950+1222-takeshi@users.noreply.github.com>
kosuke55 referenced this pull request in tier4/autoware.universe Jul 14, 2022
* fix: avoid same name nodes in detection module

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* add node_name of object_association_merger

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* apply pre-commit

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
boyali referenced this pull request in boyali/autoware.universe Sep 28, 2022
* fix: avoid same name nodes in detection module

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* add node_name of object_association_merger

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* apply pre-commit

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
* fix: avoid same name nodes in detection module

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* add node_name of object_association_merger

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* apply pre-commit

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
* fix: avoid same name nodes in detection module

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* add node_name of object_association_merger

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* apply pre-commit

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
yukke42 pushed a commit to tzhong518/autoware.universe that referenced this pull request Oct 14, 2022
* fix: avoid same name nodes in detection module

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* add node_name of object_association_merger

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* apply pre-commit

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
boyali referenced this pull request in boyali/autoware.universe Oct 19, 2022
* fix: avoid same name nodes in detection module

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* add node_name of object_association_merger

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* Update launch/tier4_perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>

* apply pre-commit

Signed-off-by: tomoya.kimura <tomoya.kimura@tier4.jp>

Co-authored-by: Shumpei Wakabayashi <42209144+shmpwk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants