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

Jump to bottom

fix(avoidance): fix build error #4667

Merged
merged 1 commit into from
Aug 18, 2023
Merged

fix(avoidance): fix build error #4667

merged 1 commit into from
Aug 18, 2023

Conversation

satoshi-ota
Copy link
Contributor

@satoshi-ota satoshi-ota commented Aug 18, 2023 •
edited
Loading

Description

🤖 Generated by Copilot at 9cde8e1

Refactored the code of the avoidance scene module in the behavior path planner. Renamed the variable avoidance_data_ to avoid_data_ in avoidance_module.cpp for consistency.

Tests performed

PASS BUILD in my local env.

Effects on system behavior

Not applicable.

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.

@github-actions github-actions bot added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Aug 18, 2023
@satoshi-ota satoshi-ota added the tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Aug 18, 2023
@satoshi-ota satoshi-ota enabled auto-merge (squash) August 18, 2023 09:31
@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

Patch coverage: 28.23% and project coverage change: +0.01% 🎉

Comparison is base (25355b5) 14.89% compared to head (9cde8e1) 14.90%.
Report is 4 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4667      +/-   ##
==========================================
+ Coverage   14.89%   14.90%   +0.01%     
==========================================
  Files        1548     1548              
  Lines      106770   106764       -6     
  Branches    32682    32672      -10     
==========================================
+ Hits        15900    15917      +17     
+ Misses      73555    73523      -32     
- Partials    17315    17324       +9
Flag Coverage Δ *Carryforward flag
differential 13.26% <28.23%> (?)
total 14.88% <ø> (-0.02%) ⬇️ Carriedforward from 25355b5

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

Files Changed Coverage Δ
...c/lanelet2_map_loader/lanelet2_map_loader_node.cpp 10.00% <ø> (+0.74%) ⬆️
...ap_projection_loader/src/map_projection_loader.cpp 29.62% <ø> (+2.04%) ⬆️
...lanner/scene_module/avoidance/avoidance_module.hpp 7.93% <ø> (ø)
...path_planner/test/test_drivable_area_expansion.cpp 32.74% <0.00%> (ø)
...rivable_area_expansion/drivable_area_expansion.cpp 38.40% <27.77%> (+10.21%) ⬆️
...er/src/scene_module/avoidance/avoidance_module.cpp 11.58% <31.14%> (+0.12%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@satoshi-ota satoshi-ota merged commit 93478b7 into autowarefoundation:main Aug 18, 2023
43 of 45 checks passed
@tier4-autoware-public-bot tier4-autoware-public-bot bot mentioned this pull request Aug 21, 2023
Merged
kminoda pushed a commit to kminoda/autoware.universe that referenced this pull request Aug 21, 2023
@satoshi-ota @kminoda
fix(avoidance): fix build error (autowarefoundation#4667)
817797a 
Signed-off-by: satoshi-ota <[email protected]>
kminoda pushed a commit to kminoda/autoware.universe that referenced this pull request Aug 22, 2023
@satoshi-ota @kminoda
fix(avoidance): fix build error (autowarefoundation#4667)
19cca13 
Signed-off-by: satoshi-ota <[email protected]>
TomohitoAndo added a commit to tier4/autoware.universe that referenced this pull request Aug 24, 2023
@TomohitoAndo
Squashed commit of the following:
fb2aee4 
commit 9c24f8f
Author: Tomohito Ando <[email protected]>
Date:   Mon Aug 21 12:59:59 2023 +0900

    add debug log when the signal data is outdated

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

commit 6448663
Author: Tomohito Ando <[email protected]>
Date:   Mon Aug 21 11:08:35 2023 +0900

    fix the traffic signal type in perception reproducer

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

commit fcb7a64
Merge: 1f5cf31 1f8ac87
Author: Tomohito Ando <[email protected]>
Date:   Mon Aug 21 10:38:56 2023 +0900

    Merge branch 'main' into support-new-traffic-signal-interface

    Resolved conflicts in perception_reproducer.py

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

commit 1f8ac87
Author: kminoda <[email protected]>
Date:   Mon Aug 21 09:24:07 2023 +0900

    ci: reverting control ignorance (autowarefoundation#4662)

    * ci: ignore svg for spell-check, as well as reverting control

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

    * remove svg

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

    ---------

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

commit d794bc0
Author: SakodaShintaro <[email protected]>
Date:   Mon Aug 21 09:22:08 2023 +0900

    fix(lanelet2_map_loader): fixed parameter declaration timing (autowarefoundation#4639)

    Change parameter declaration timing

    Signed-off-by: Shintaro Sakoda <[email protected]>

commit 338d4b0
Author: Takamasa Horibe <[email protected]>
Date:   Sun Aug 20 23:32:03 2023 +0900

    feat(mpc): 1d interpolate in steering rate limit calculation (autowarefoundation#4666)

    * feat(mpc): 1d interpolate in steering rate limit calculation

    Signed-off-by: Takamasa Horibe <[email protected]>

    * update

    Signed-off-by: Takamasa Horibe <[email protected]>

    * fix

    Signed-off-by: Takamasa Horibe <[email protected]>

    * fix clamp

    Signed-off-by: Takamasa Horibe <[email protected]>

    * remove unused funcs

    Signed-off-by: Takamasa Horibe <[email protected]>

    ---------

    Signed-off-by: Takamasa Horibe <[email protected]>

commit f91db6b
Author: Takamasa Horibe <[email protected]>
Date:   Sun Aug 20 19:01:43 2023 +0900

    fix(mpc): use optimization result when polish failed (autowarefoundation#4673)

    * fix(mpc): use optimization result when polish failed

    Signed-off-by: Takamasa Horibe <[email protected]>

    * fix arg

    Signed-off-by: Takamasa Horibe <[email protected]>

    ---------

    Signed-off-by: Takamasa Horibe <[email protected]>

commit c665d9d
Author: Kosuke Takeuchi <[email protected]>
Date:   Sun Aug 20 15:47:00 2023 +0900

    fix(start/goal_planner): set previous lane_ids if freespace path is out of lanes (autowarefoundation#4672)

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

commit 9dc104f
Author: Kosuke Takeuchi <[email protected]>
Date:   Sun Aug 20 10:31:41 2023 +0900

    feat(start_planner): support freespace pull out (autowarefoundation#4610)

    feat(start_planner): add freespace pull out

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

commit bc86f0e
Author: Takayuki Murooka <[email protected]>
Date:   Sun Aug 20 01:59:26 2023 +0900

    feat(obstacle_stop_planner): consider object velocity direction (autowarefoundation#4648)

    * feat(obstacle_stop_planner): consider object velocity direction

    Signed-off-by: Takayuki Murooka <[email protected]>

    * update

    Signed-off-by: Takayuki Murooka <[email protected]>

    ---------

    Signed-off-by: Takayuki Murooka <[email protected]>

commit 5ed7ca3
Author: Kosuke Takeuchi <[email protected]>
Date:   Sat Aug 19 01:32:05 2023 +0900

    feat(goal_planner): add lane ids to freespace path (autowarefoundation#4668)

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

commit 93478b7
Author: Satoshi OTA <[email protected]>
Date:   Fri Aug 18 19:04:07 2023 +0900

    fix(avoidance): fix build error (autowarefoundation#4667)

    Signed-off-by: satoshi-ota <[email protected]>

commit 04ca20c
Author: Kosuke Takeuchi <[email protected]>
Date:   Fri Aug 18 18:44:53 2023 +0900

    feat(behavior_path_planner): add combineLanelets (autowarefoundation#4657)

    * feat(behavior_path_planner): add combineLanelets

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

    * Update planning/behavior_path_planner/src/utils/utils.cpp

    ---------

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

commit 414a2ba
Author: Maxime CLEMENT <[email protected]>
Date:   Fri Aug 18 16:43:27 2023 +0900

    fix(behavior_path_planner): add fallback for splitting the dynamic drivable area into left and right bounds (autowarefoundation#4646)

    Signed-off-by: Maxime CLEMENT <[email protected]>

commit ab64a5a
Author: Satoshi OTA <[email protected]>
Date:   Fri Aug 18 15:56:49 2023 +0900

    fix(avoidance): don't extend backward path if driving lane is updated (autowarefoundation#4593)

    * fix(avoidance): don't extend backward path if driving lane is updated

    Signed-off-by: satoshi-ota <[email protected]>

    * chore(avoidance): rename variables

    Signed-off-by: satoshi-ota <[email protected]>

    ---------

    Signed-off-by: satoshi-ota <[email protected]>

commit 93b7d4d
Author: kminoda <[email protected]>
Date:   Fri Aug 18 15:28:15 2023 +0900

    fix(map_loader, map_projection_loader): use component interface specs (autowarefoundation#4585)

    * feat(map): use component_interface_specs in map_projection_loader

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

    * update map_loader

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

    * style(pre-commit): autofix

    * feat: add dummy typo

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

    * update name

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

    * fix test

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

    * fix test

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

    ---------

    Signed-off-by: kminoda <[email protected]>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

commit 25355b5
Author: taikitanaka3 <[email protected]>
Date:   Fri Aug 18 11:50:10 2023 +0900

    fix(ekf_localizer): fix True to true (autowarefoundation#4659)

commit 5551421
Author: Kyoichi Sugahara <[email protected]>
Date:   Fri Aug 18 11:08:26 2023 +0900

    refactor(behavior_path_planner): separete function in utils to objects_filtering  (autowarefoundation#4658)

    * separate utils function to object_filtering

    Signed-off-by: kyoichi-sugahara <[email protected]>

    * chenge call side of util functions

    Signed-off-by: kyoichi-sugahara <[email protected]>

    * refactor

    Signed-off-by: kyoichi-sugahara <[email protected]>

    * add explanation for parameters

    Signed-off-by: kyoichi-sugahara <[email protected]>

    ---------

    Signed-off-by: kyoichi-sugahara <[email protected]>

commit f398db4
Author: ito-san <[email protected]>
Date:   Fri Aug 18 09:07:22 2023 +0900

    fix(system_monitor): high-memory process are not provided in MEM order (autowarefoundation#4654)

    * fix(process_monitor): high-memory process are not being provided in %MEM order

    Signed-off-by: ito-san <[email protected]>

    * changed option from 'g' to 'n'

    Signed-off-by: ito-san <[email protected]>

    ---------

    Signed-off-by: ito-san <[email protected]>

commit 02ba0c6
Author: Takayuki Murooka <[email protected]>
Date:   Fri Aug 18 08:41:39 2023 +0900

    fix(planning_debug_tools): fix the bug of perception_replayer with detected objects publishing (autowarefoundation#4653)

    Signed-off-by: Takayuki Murooka <[email protected]>

commit 4df5f8a
Author: Kosuke Takeuchi <[email protected]>
Date:   Fri Aug 18 01:56:27 2023 +0900

    fix(start_planner): fix blinker direction (autowarefoundation#4363)

    * fix(start_planner): fix blinker direction

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

    * fix

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

    ---------

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

commit 1b10386
Author: Kasper Mecklenburg <[email protected]>
Date:   Thu Aug 17 05:49:00 2023 -0700

    refactor(joy_controller): rework parameters (autowarefoundation#3992)

    * refactor(joy_controller): rework parameters

    Updated adding a schema according to new ROS node config coding
    guidelines.

    Signed-off-by: kaspermeck-arm <[email protected]>
    Change-Id: Icf76852cd102bf70a27f7d4111f1b52de087a00d

    * refactor(joy_controller): rework parameters

    Updated adding a schema according to new ROS node config coding
    guidelines.

    Signed-off-by: kaspermeck-arm <[email protected]>
    Change-Id: Icf76852cd102bf70a27f7d4111f1b52de087a00d

    * Apply suggestions from code review

    Co-authored-by: Ryohsuke Mitsudome <[email protected]>

    * Added quotes for default values

    Signed-off-by: kaspermeck-arm <[email protected]>
    Change-Id: Ib754b9400003c0871ee1dd9bda8db07215852a78

    ---------

    Signed-off-by: kaspermeck-arm <[email protected]>
    Co-authored-by: Ryohsuke Mitsudome <[email protected]>
    Co-authored-by: Daisuke Nishimatsu <[email protected]>

commit 81a1e53
Author: Satoshi OTA <[email protected]>
Date:   Thu Aug 17 19:07:00 2023 +0900

    fix(intersection): guard invalid access (autowarefoundation#4655)

    Signed-off-by: satoshi-ota <[email protected]>

commit bb14a40
Author: Mamoru Sobue <[email protected]>
Date:   Thu Aug 17 18:52:39 2023 +0900

    fix(intersection): refactor first stop timeout (autowarefoundation#4457)

    Signed-off-by: Mamoru Sobue <[email protected]>

commit e9dfe5c
Author: Berkay Karaman <[email protected]>
Date:   Thu Aug 17 12:24:57 2023 +0300

    feat(pid_longitudinal_controller): take into account the current acceleration to calculate delayed pose (autowarefoundation#4616)

    * feat(pid_longitudinal_controller): take into account the current acceleration to calculate delayed pose

    Signed-off-by: Berkay Karaman <[email protected]>

    * Update for reverse driving

    Signed-off-by: Berkay Karaman <[email protected]>

    * update for wrong calculation

    Signed-off-by: Berkay Karaman <[email protected]>

    * update

    Signed-off-by: Berkay Karaman <[email protected]>

    ---------

    Signed-off-by: Berkay Karaman <[email protected]>

commit b5f83d0
Author: Takayuki Murooka <[email protected]>
Date:   Thu Aug 17 17:15:08 2023 +0900

    feat(obstacle_cruise_planner): consider object velocity direction (autowarefoundation#4647)

    * feat(obstacle_cruise_planner): consider object velocity direction

    Signed-off-by: Takayuki Murooka <[email protected]>

    * update

    Signed-off-by: Takayuki Murooka <[email protected]>

    * chore: spell fix

    ---------

    Signed-off-by: Takayuki Murooka <[email protected]>
    Co-authored-by: Shumpei Wakabayashi <[email protected]>

commit 4d66811
Author: Takayuki Murooka <[email protected]>
Date:   Thu Aug 17 17:12:01 2023 +0900

    feat(obstacle_velocity_limiter): consider object velocity direction (autowarefoundation#4649)

    * feat(obstacle_velocity_limiter): consider object velocity direction

    Signed-off-by: Takayuki Murooka <[email protected]>

    * fix

    Signed-off-by: Takayuki Murooka <[email protected]>

    ---------

    Signed-off-by: Takayuki Murooka <[email protected]>

commit 420af00
Author: Takayuki Murooka <[email protected]>
Date:   Thu Aug 17 17:11:33 2023 +0900

    feat(occlusion spot): consider object velocity direction (autowarefoundation#4650)

    Signed-off-by: Takayuki Murooka <[email protected]>

commit 2da561f
Author: Takayuki Murooka <[email protected]>
Date:   Thu Aug 17 17:10:55 2023 +0900

    feat(intersection): consider object velocity direction (autowarefoundation#4651)

    * feat(intersection): consider object velocity direction

    Signed-off-by: Takayuki Murooka <[email protected]>

    * update

    Signed-off-by: Takayuki Murooka <[email protected]>

    ---------

    Signed-off-by: Takayuki Murooka <[email protected]>

commit e1a86f9
Author: Kyoichi Sugahara <[email protected]>
Date:   Thu Aug 17 14:08:56 2023 +0900

    refactor(behavior_path_planner): create path_safety_checker directory (autowarefoundation#4644)

    * create safety_check directory

    Signed-off-by: kyoichi-sugahara <[email protected]>

    * style(pre-commit): autofix

    * rename directory name safety_check to path_safety_checker

    Signed-off-by: kyoichi-sugahara <[email protected]>

    * style(pre-commit): autofix

    * change directory name

    Signed-off-by: kyoichi-sugahara <[email protected]>

    ---------

    Signed-off-by: kyoichi-sugahara <[email protected]>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

commit 49f9d9d
Author: Satoshi OTA <[email protected]>
Date:   Thu Aug 17 13:32:52 2023 +0900

    fix(avoidance): fix trimmed shift line alignment (autowarefoundation#4632)

    * fix(avoidance): fix trimmed shift line alignment

    Signed-off-by: satoshi-ota <[email protected]>

    * fix(avoidance): fill shift line gap

    Signed-off-by: satoshi-ota <[email protected]>

    * fixup! fix(avoidance): fix trimmed shift line alignment

    ---------

    Signed-off-by: satoshi-ota <[email protected]>

commit ce01013
Author: Satoshi OTA <[email protected]>
Date:   Thu Aug 17 13:30:14 2023 +0900

    feat(avoidance): create detection area from latest generated path (autowarefoundation#4525)

    * feat(avoidance): create detection area from latest generated path

    Signed-off-by: satoshi-ota <[email protected]>

    * refactor(avoidance): remove unused marker utils

    Signed-off-by: satoshi-ota <[email protected]>

    ---------

    Signed-off-by: satoshi-ota <[email protected]>

commit 1f5cf31
Author: Tomohito Ando <[email protected]>
Date:   Fri Jul 28 09:51:29 2023 +0900

    change input topic of the traffic signals

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

commit 0769685
Merge: a6c8641 d0685fc
Author: Tomohito Ando <[email protected]>
Date:   Thu Jul 20 16:13:13 2023 +0900

    Merge branch 'main' into support-new-traffic-signal-interface

    Resolved conflicts in `scene_crosswalk.cpp`

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

commit a6c8641
Author: Tomohito Ando <[email protected]>
Date:   Wed Jul 12 14:18:24 2023 +0900

    do not return until the all regulatory elements are checked

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

commit 6eccb50
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Jul 11 05:09:54 2023 +0000

    style(pre-commit): autofix

commit 2c5bb3c
Merge: 9767e21 3ae0b00
Author: Tomohito Ando <[email protected]>
Date:   Tue Jul 11 14:08:10 2023 +0900

    Merge branch 'main' into support-new-traffic-signal-interface

    Resolved conflicts in planning/behavior_velocity_planner_common/package.xml

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

commit 9767e21
Merge: 636420a 5605b19
Author: Tomohito Ando <[email protected]>
Date:   Mon Jul 10 18:10:50 2023 +0900

    Merge branch 'main' into support-new-traffic-signal-interface

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

commit 636420a
Author: Tomohito Ando <[email protected]>
Date:   Mon Jul 10 17:57:26 2023 +0900

    change the input of traffic signal to traffic light arbiter

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

commit 1767ba5
Author: Tomohito Ando <[email protected]>
Date:   Mon Jul 10 17:56:52 2023 +0900

    use the regulatory element id instead of traffic light id

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

commit a10dc06
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Mon Jul 10 00:45:55 2023 +0000

    style(pre-commit): autofix

commit aacf390
Author: Tomohito Ando <[email protected]>
Date:   Mon Jul 10 09:42:04 2023 +0900

    replace TrafficLightElement with TrafficSignalElement

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

commit f900d48
Author: Tomohito Ando <[email protected]>
Date:   Tue Jul 4 19:33:39 2023 +0900

    remove the external signal input source in behavior_planning_launch.py

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

commit 127ce37
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Jul 4 02:31:15 2023 +0000

    style(pre-commit): autofix

commit 7c010c6
Author: Tomohito Ando <[email protected]>
Date:   Tue Jul 4 11:29:35 2023 +0900

    add missing dependency

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

commit 35a4e97
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Fri Jun 30 13:58:07 2023 +0000

    style(pre-commit): autofix

commit 1e5bf66
Author: Tomohito Ando <[email protected]>
Date:   Fri Jun 30 22:33:38 2023 +0900

    feat(behavior_velocity): support new traffic signal interface

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

Signed-off-by: Tomohito Ando <[email protected]>
@satoshi-ota satoshi-ota deleted the fix/build-avoid branch August 28, 2023 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TakaHoribe TakaHoribe TakaHoribe approved these changes

@rej55 rej55 Awaiting requested review from rej55

@kosuke55 kosuke55 Awaiting requested review from kosuke55

@kyoichi-sugahara kyoichi-sugahara Awaiting requested review from kyoichi-sugahara

@shmpwk shmpwk Awaiting requested review from shmpwk

@taikitanaka3 taikitanaka3 Awaiting requested review from taikitanaka3

@takayuki5168 takayuki5168 Awaiting requested review from takayuki5168

@tkimura4 tkimura4 Awaiting requested review from tkimura4

@purewater0901 purewater0901 Awaiting requested review from purewater0901

@zulfaqar-azmi-t4 zulfaqar-azmi-t4 Awaiting requested review from zulfaqar-azmi-t4

Assignees
No one assigned
Labels
component:planning Route planning, decision-making, and navigation. (auto-assigned) tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@satoshi-ota @TakaHoribe