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

refactor(behavior_velocity)!: unite spline interpolation #411

Conversation

taikitanaka3
Copy link
Contributor

@taikitanaka3 taikitanaka3 commented Feb 18, 2022

Related Issue(required)

#361

Description(required)

unite duplicated spline interpolation into utils for behavior velocity(no behavior change but just unite completely same 3 spline interpolation code)

  • intersection
  • occlusion spot
  • blindspot(included intersection util)
  • no stopping area

Review Procedure(required)

see path interp in autoware.proj at private road
image

@kosuke55
can you test this PR in Psim?

Related PR(optional)

Pre-Review Checklist for the PR Author

PR Author should check the checkboxes below when creating the PR.

If you are adding new package following items are required:

  • Documentation with description of the package is available
  • A sample launch file and parameter file are available if the package contains executable nodes

Checklist for the PR Reviewer

Reviewers should check the checkboxes below before approval.

  • Commits are properly organized and messages are according to the guideline
  • PR title describes the changes

Post-Review Checklist for the PR Author

PR Author should check the checkboxes below before merging.

  • All open points are addressed and tracked via issues or tickets

CI Checks

  • Build and test for PR / build-and-test-pr: Required to pass before the merge.
  • Build and test for PR / clang-tidy-pr: NOT required to pass before the merge. It is up to the reviewer(s). Found false positives? See the [guidelines][clang-tidy-guidelines].
  • Check spelling: NOT required to pass before the merge. It is up to the reviewer(s). See here if you want to add some words to the spell check dictionary.

@taikitanaka3 taikitanaka3 changed the title !chore(behavior_velocity): unite spline interpolation chore!(behavior_velocity): unite spline interpolation Feb 18, 2022
@taikitanaka3 taikitanaka3 changed the title chore!(behavior_velocity): unite spline interpolation chore(behavior_velocity)!: unite spline interpolation Feb 18, 2022
@kenji-miyake kenji-miyake changed the title chore(behavior_velocity)!: unite spline interpolation refactor(behavior_velocity)!: unite spline interpolation Feb 18, 2022
@taikitanaka3 taikitanaka3 force-pushed the 361-unite-spline-interpolation-in-behavior-velocity branch from 8cb75b9 to 9e10cc3 Compare February 18, 2022 07:02
@codecov
Copy link

codecov bot commented Feb 18, 2022

Codecov Report

Merging #411 (0f10e01) into tier4/proposal (5fabc52) will decrease coverage by 3.95%.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                @@
##           tier4/proposal    #411      +/-   ##
=================================================
- Coverage           10.10%   6.14%   -3.96%     
=================================================
  Files                 705      72     -633     
  Lines               49295    4913   -44382     
  Branches             6265     698    -5567     
=================================================
- Hits                 4980     302    -4678     
+ Misses              40248    4468   -35780     
+ Partials             4067     143    -3924     
Impacted Files Coverage Δ
...city_planner/src/scene_module/blind_spot/scene.cpp 0.00% <0.00%> (ø)
...c/scene_module/intersection/scene_intersection.cpp 0.00% <ø> (ø)
...ity_planner/src/scene_module/intersection/util.cpp 0.00% <0.00%> (ø)
...module/no_stopping_area/scene_no_stopping_area.cpp 0.00% <0.00%> (ø)
...ene_module/occlusion_spot/occlusion_spot_utils.cpp 11.11% <ø> (+2.02%) ⬆️
...sion_spot/scene_occlusion_spot_in_private_road.cpp 0.00% <0.00%> (ø)
...usion_spot/scene_occlusion_spot_in_public_road.cpp 0.00% <0.00%> (ø)
...r_velocity_planner/src/utilization/interpolate.cpp 0.00% <0.00%> (ø)
...ity_planner/test/src/test_occlusion_spot_utils.cpp 33.33% <ø> (-9.53%) ⬇️
...ocity_planner/src/utilization/path_utilization.cpp 0.00% <0.00%> (-26.67%) ⬇️
... and 634 more

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 5fabc52...0f10e01. Read the comment docs.

Comment on lines 28 to 31
bool splineInterpolate(
const autoware_auto_planning_msgs::msg::PathWithLaneId & input, const double interval,
autoware_auto_planning_msgs::msg::PathWithLaneId * output, const rclcpp::Logger logger);

Copy link
Contributor

Choose a reason for hiding this comment

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

Should it be in interpolation namespace as well as LinearInterpolate

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed 0f10e01

@tkimura4 tkimura4 self-requested a review February 21, 2022 07:02
@taikitanaka3
Copy link
Contributor Author

cc : @yukkysaito
this PR is unite same spline interpolation into one utils

#include <vector>

namespace behavior_velocity_planner
{
namespace interpolation
{
bool splineInterpolate(
Copy link
Contributor

Choose a reason for hiding this comment

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

@taikitanaka3 I suggest putting this function in utilization/path_utilization.cpp. Then we can completely remove the utilization/interpolate.hpp, .cpp files with unused LinearInterpolate functions.

Copy link
Contributor

@TakaHoribe TakaHoribe left a comment

Choose a reason for hiding this comment

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

LGTM.

@taikitanaka3 taikitanaka3 merged commit 7f2b646 into autowarefoundation:tier4/proposal Feb 22, 2022
mitsudome-r added a commit to mitsudome-r/autoware.universe that referenced this pull request Mar 1, 2022
* Ros2 v0.8.0 topic state monitor (autowarefoundation#283)

* Add node_name_suffix to topic_state_monitor.launch (autowarefoundation#1157) (autowarefoundation#370)

Signed-off-by: Kenji Miyake <[email protected]>

* fix launch file (autowarefoundation#411)

* add transient local option to topic state monitor (autowarefoundation#410)

* add transient local option to topic state monitor

* sort parameters

* sort parameter

* [topic_state_monitor]: Add best effort option (autowarefoundation#430)

Signed-off-by: autoware <[email protected]>

Co-authored-by: autoware <[email protected]>

* add use_sim-time option (autowarefoundation#454)

* Fix for rolling (autowarefoundation#1226)

* Replace doc by description

Signed-off-by: Kenji Miyake <[email protected]>

* Replace ns by push-ros-namespace

Signed-off-by: Kenji Miyake <[email protected]>

* change to composable node (autowarefoundation#1233)

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

* Remove use_sim_time for set_parameter (autowarefoundation#1260)

Signed-off-by: wep21 <[email protected]>

* Fix lint errors (autowarefoundation#1378)

* Fix lint errors

Signed-off-by: Kenji Miyake <[email protected]>

* Fix variable names

Signed-off-by: Kenji Miyake <[email protected]>

* Use integrated generic subscription (autowarefoundation#1342)

Signed-off-by: wep21 <[email protected]>

* suppress warnings for declare parameters (autowarefoundation#1724)

* fix for lanelet2_extension

* fix for traffic light ssd fine detector

* fix for topic_state_monitor

* fix for dummy diag publisher

* fix for remote cmd converter

* fix for vehicle_info_util

* fix for multi object tracker

* fix for freespace planner

* fix for autoware_error_monitor

* add Werror for multi object tracker

* fix for multi object tracker

* add Werror for liraffic light ssd fine detector

* add Werror for topic state monitor

* add Werror

* add Werror

* add Werror

* add Werror

* fix style

* Fix -Wunused-parameter (autowarefoundation#1836)

* Fix -Wunused-parameter

Signed-off-by: Kenji Miyake <[email protected]>

* Fix mistake

Signed-off-by: Kenji Miyake <[email protected]>

* fix spell

* Fix lint issues

Signed-off-by: Kenji Miyake <[email protected]>

* Ignore flake8 warnings

Signed-off-by: Kenji Miyake <[email protected]>

Co-authored-by: Hiroki OTA <[email protected]>

* 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 <[email protected]>

* Remove ament_cmake_uncrustify and ament_clang_format

Signed-off-by: Kenji Miyake <[email protected]>

* Apply Black

Signed-off-by: Kenji Miyake <[email protected]>

* Apply clang-format

Signed-off-by: Kenji Miyake <[email protected]>

* Fix build errors

Signed-off-by: Kenji Miyake <[email protected]>

* Fix for cpplint

* Fix include double quotes to angle brackets

Signed-off-by: Kenji Miyake <[email protected]>

* Apply clang-format

Signed-off-by: Kenji Miyake <[email protected]>

* Fix build errors

Signed-off-by: Kenji Miyake <[email protected]>

* Add COLCON_IGNORE (autowarefoundation#500)

Signed-off-by: Kenji Miyake <[email protected]>

* remove COLCON_IGNORE in system_packages and map_tf_generator (autowarefoundation#532)

* [topic_state_monitor]add readme (autowarefoundation#565)

* add readme

* Update system/topic_state_monitor/Readme.md

Co-authored-by: Kazuki Miyahara <[email protected]>

* Update system/topic_state_monitor/Readme.md

Co-authored-by: Kazuki Miyahara <[email protected]>

* Update system/topic_state_monitor/Readme.md

Co-authored-by: Kazuki Miyahara <[email protected]>

* Update system/topic_state_monitor/Readme.md

Co-authored-by: Kazuki Miyahara <[email protected]>

* Update system/topic_state_monitor/Readme.md

Co-authored-by: Kazuki Miyahara <[email protected]>

Co-authored-by: Kazuki Miyahara <[email protected]>

Co-authored-by: Daisuke Nishimatsu <[email protected]>
Co-authored-by: Ryohsuke Mitsudome <[email protected]>
Co-authored-by: autoware <[email protected]>
Co-authored-by: Kenji Miyake <[email protected]>
Co-authored-by: Taichi Higashide <[email protected]>
Co-authored-by: Kazuki Miyahara <[email protected]>
Co-authored-by: Hiroki OTA <[email protected]>
Co-authored-by: Takeshi Miura <[email protected]>
Co-authored-by: taikitanaka3 <[email protected]>
mitsudome-r added a commit to mitsudome-r/autoware.universe that referenced this pull request Mar 1, 2022
* release v0.4.0

* removed ROS1 package

Signed-off-by: mitsudome-r <[email protected]>

* Revert "removed ROS1 package"

This reverts commit e002b78f1e1ddf980ee7c4010918f1c117ff4be1.

* add COLCON_IGNORE file to all ROS1 packages

Signed-off-by: mitsudome-r <[email protected]>

* rename *.launch files to *.launch.xml

Signed-off-by: mitsudome-r <[email protected]>

* Port to ROS 2

* Fix params file paths

* Re-add autoware_state_monitor

* Update system_launch/launch/system.launch.xml

Co-authored-by: Takamasa Horibe <[email protected]>

* Add linters and missing pakcages dependencies (autowarefoundation#37)

* V0.8 system launch (autowarefoundation#51)

* tmp rename launch file

Signed-off-by: Kosuke Murakami <[email protected]>

* Add system_monitor to system.launch (autowarefoundation#72)

* Add system_monitor to system.launch

Signed-off-by: Kenji Miyake <[email protected]>

* Fix typo

Signed-off-by: Kenji Miyake <[email protected]>

* Add config file of system_monitor (autowarefoundation#115)

Signed-off-by: Kenji Miyake <[email protected]>

* Add config of diagnostic_aggregator (autowarefoundation#128)

Signed-off-by: Kenji Miyake <[email protected]>

* Add vehicle cmd gate config (autowarefoundation#136)

* Add config_file of vehicle_cmd_gate

Signed-off-by: Kenji Miyake <[email protected]>

* Add use_emergency_stop

Signed-off-by: Kenji Miyake <[email protected]>

* Rename emergency_stop to external_emergency_stop

Signed-off-by: Kenji Miyake <[email protected]>

* Fix command_gate diag

Signed-off-by: Kenji Miyake <[email protected]>

* Add use_emergency_hold arg (autowarefoundation#142)

Signed-off-by: Kenji Miyake <[email protected]>

* Fix system.launch (autowarefoundation#161)

Signed-off-by: Kenji Miyake <[email protected]>

* Revert "tmp rename launch file"

This reverts commit d1bb989eac90f43bab2af6669b00638fd2147eeb.

* fix launch file

Signed-off-by: Kosuke Murakami <[email protected]>

* fix minor bug

Signed-off-by: Kosuke Murakami <[email protected]>

* rename .yaml -> .param.yaml

Signed-off-by: Kosuke Murakami <[email protected]>

* fix invalid way to use eval

Signed-off-by: Kosuke Murakami <[email protected]>

* Add new line in yaml

* add num_disks

Signed-off-by: Kosuke Murakami <[email protected]>

* rename .yaml to .param.yaml

Signed-off-by: Kosuke Murakami <[email protected]>

Co-authored-by: Kenji Miyake <[email protected]>

* Rename ROS-related .yaml to .param.yaml (autowarefoundation#65)

* Rename ROS-related .yaml to .param.yaml

Signed-off-by: Kenji Miyake <[email protected]>

* Add missing '--'

Signed-off-by: Kenji Miyake <[email protected]>

* Rename vehicle_info.yaml to vehicle_info.param.yaml

Signed-off-by: Kenji Miyake <[email protected]>

* Fix livox param name

Signed-off-by: Kenji Miyake <[email protected]>

* add clock_publisher and autoware_version (autowarefoundation#79)

* add clock_publisher and autoware_version

Signed-off-by: mitsudome-r <[email protected]>

* update package.xml

Signed-off-by: mitsudome-r <[email protected]>

* update build_depends.repos

Signed-off-by: mitsudome-r <[email protected]>

* fix CI

Signed-off-by: mitsudome-r <[email protected]>

* Split system_monitor config (autowarefoundation#98)

Signed-off-by: Kenji Miyake <[email protected]>

* add use_sim-time option (autowarefoundation#99)

* Replace doc by description (autowarefoundation#182)

Signed-off-by: Kenji Miyake <[email protected]>

* Use set_parameter for use_sim_time (autowarefoundation#198)

* Use set_parameter for use_sim_time

Signed-off-by: wep21 <[email protected]>

* Add default parameter for scenario simulator

Signed-off-by: wep21 <[email protected]>

* change system_monitor.launch.xml to launch.py (autowarefoundation#203)

* add README.md and svg files (autowarefoundation#328)

* add md and svg

* fix typo

* fix typo

* fix word

* fix typo

* add lack of things

* Update README

* fix depending packages

* fix word

* Fix pre-commit (autowarefoundation#407)

* Fix pre-commit errors

Signed-off-by: Kenji Miyake <[email protected]>

* Fix package.xml

Signed-off-by: Kenji Miyake <[email protected]>

* Update system.launch.xml (autowarefoundation#411)

* Feature/autoware api autoware versions (autowarefoundation#438)

* Add package version API

* Fix message type

* Modify api name

* use let variable in system_launch (autowarefoundation#473)

* Add sensor_model to system_launch (autowarefoundation#480)

Signed-off-by: Kenji Miyake <[email protected]>

* Change formatter to black (autowarefoundation#488)

* Update pre-commit settings

* Apply Black

* Replace ament_lint_common with autoware_lint_common

* Update build_depends.repos

* Fix build_depends

* Fix diagnostic_aggregator config path (autowarefoundation#118)

* update param

Signed-off-by: tomoya.kimura <[email protected]>

* update readme

Signed-off-by: tomoya.kimura <[email protected]>

* ci(pre-commit): autofix

Co-authored-by: mitsudome-r <[email protected]>
Co-authored-by: Esteve Fernandez <[email protected]>
Co-authored-by: Takamasa Horibe <[email protected]>
Co-authored-by: Jilada Eccleston <[email protected]>
Co-authored-by: Kosuke Murakami <[email protected]>
Co-authored-by: Kenji Miyake <[email protected]>
Co-authored-by: Ryohsuke Mitsudome <[email protected]>
Co-authored-by: Daisuke Nishimatsu <[email protected]>
Co-authored-by: Taichi Higashide <[email protected]>
Co-authored-by: Hiroki OTA <[email protected]>
Co-authored-by: Takagi, Isamu <[email protected]>
Co-authored-by: Keisuke Shima <[email protected]>
Co-authored-by: Kenji Miyake <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: taikitanaka3 <[email protected]>
@taikitanaka3 taikitanaka3 deleted the 361-unite-spline-interpolation-in-behavior-velocity branch April 14, 2022 00:51
satoshi-ota pushed a commit to satoshi-ota/autoware.universe that referenced this pull request May 20, 2022
…ndation#411)

* refactor(behavior_velocity)!: unite spline interpolation

Signed-off-by: tanaka3 <[email protected]>

* chore(behavior_velocity): to namespace interpolation

Signed-off-by: tanaka3 <[email protected]>
TomohitoAndo pushed a commit to TomohitoAndo/autoware.universe that referenced this pull request Oct 5, 2022
kyoichi-sugahara pushed a commit that referenced this pull request Sep 16, 2023
* chore: sync files

Signed-off-by: GitHub <[email protected]>

* Update sync-files.yaml

Co-authored-by: kenji-miyake <[email protected]>
Co-authored-by: Kenji Miyake <[email protected]>
HansOersted pushed a commit to HansOersted/autoware.universe that referenced this pull request Mar 8, 2024
…ation#411)

* chore: remove nubula related repositories

Signed-off-by: Tomohito Ando <[email protected]>

* chore: update aip_launcher to remove nebula dependency

Signed-off-by: Tomohito Ando <[email protected]>

* chore: comment out nebula related repository

Signed-off-by: Tomohito Ando <[email protected]>

---------

Signed-off-by: Tomohito Ando <[email protected]>
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