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

feat(behavior_path_planner): add occupancy_grid_based_collision_detector #1259

Merged

Conversation

kosuke55
Copy link
Contributor

@kosuke55 kosuke55 commented Jul 6, 2022

Description

Add occupancy_grid_map used for processes(like collision check) in behavior_path_planner
This is the part of #873

This class is almost same to https://github.com/autowarefoundation/autoware.universe/blob/main/planning/freespace_planning_algorithms/src/abstract_algorithm.cpp

Related links

depends on #1257
#873

Tests performed

check pull_over module #873 can work.

Notes for reviewers

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.

  • The PR follows the pull request guidelines.
  • The PR has been properly tested.
  • The PR has been reviewed by the code owners.

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.
  • The PR is ready for merge.

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

@kosuke55 kosuke55 marked this pull request as ready for review July 6, 2022 10:30
@kosuke55 kosuke55 changed the title (behavior_path_planner): add occupancy_grid_map feat(behavior_path_planner): add occupancy_grid_map Jul 6, 2022
@kosuke55 kosuke55 force-pushed the feature/behavior_path_occ_grid branch from 59d4173 to 5db0d63 Compare July 6, 2022 10:33
@kosuke55 kosuke55 requested a review from TakaHoribe July 6, 2022 10:46
@@ -0,0 +1,205 @@
// Copyright 2021 Tier IV, Inc. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

Tier IV -> TIER IV

@@ -0,0 +1,147 @@
// Copyright 2021 Tier IV, Inc. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

Tier IV -> TIER IV

@tkimura4 tkimura4 self-requested a review July 7, 2022 00:42
@tkimura4
Copy link
Contributor

tkimura4 commented Jul 7, 2022

With #873 ,
I confirmed that the pull_over module correctly performed collision detection using the occupation grid map

2022-07-07-09-37-48.mp4

e

return pose_local;
}

geometry_msgs::msg::Pose global2local(
Copy link
Contributor

Choose a reason for hiding this comment

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

please consider using free space planner's package

int discretizeAngle(const double theta, const int theta_size)

image

or make library later to reduce maintenance cost.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I want to make it common since it is almost the same.
Currently, It can't include free_space_planner in behavior_path, so it is like a duplicate. I would like to leave it as it is this time...

Copy link
Contributor

Choose a reason for hiding this comment

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

Then Please add comment TODO that this is duplicated and will be replaced to common package

@yukkysaito
Copy link
Contributor

this occ grid is only for pull over?

@kosuke55
Copy link
Contributor Author

kosuke55 commented Jul 7, 2022

@yukkysaito
yes, now it is only used in pull_over. but maybe it will be used also in pull_out.

@yukkysaito
Copy link
Contributor

@kosuke55 I wanna discuss the directory structure and name about occ grid.
Can you talk face to face? (the result will be shared here)

@kosuke55 kosuke55 force-pushed the feature/behavior_path_occ_grid branch from ff212ea to 5957d4d Compare July 7, 2022 10:04
@codecov
Copy link

codecov bot commented Jul 7, 2022

Codecov Report

Merging #1259 (98efbff) into main (dccd042) will decrease coverage by 0.07%.
The diff coverage is 0.00%.

@@           Coverage Diff            @@
##            main   #1259      +/-   ##
========================================
- Coverage   9.72%   9.64%   -0.08%     
========================================
  Files       1073    1078       +5     
  Lines      73996   74581     +585     
  Branches   16304   16624     +320     
========================================
  Hits        7195    7195              
- Misses     60214   60793     +579     
- Partials    6587    6593       +6     
Flag Coverage Δ *Carryforward flag
differential 0.87% <0.00%> (?)
total 9.70% <0.00%> (ø) Carriedforward from dccd042

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

Impacted Files Coverage Δ
.../include/behavior_path_planner/debug_utilities.hpp 0.00% <ø> (ø)
...lanner/scene_module/avoidance/avoidance_module.hpp 0.00% <ø> (ø)
...r/scene_module/avoidance/avoidance_module_data.hpp 0.00% <ø> (ø)
...nner/scene_module/lane_change/lane_change_path.hpp 0.00% <ø> (ø)
...th_planner/scene_module/pull_out/pull_out_path.hpp 0.00% <ø> (ø)
..._planner/scene_module/pull_over/pull_over_path.hpp 0.00% <ø> (ø)
...nner/scene_module/side_shift/side_shift_module.hpp 0.00% <ø> (ø)
.../utils/occupancy_grid_based_collision_detector.hpp 0.00% <0.00%> (ø)
...r_path_planner/scene_module/utils/path_shifter.hpp 0.00% <ø> (ø)
...path_planner/src/scene_module/lane_change/util.cpp 0.00% <ø> (ø)
... and 11 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 1a1540b...98efbff. Read the comment docs.

@kosuke55 kosuke55 force-pushed the feature/behavior_path_occ_grid branch from c758bd2 to 319e157 Compare July 7, 2022 10:52
@kosuke55
Copy link
Contributor Author

kosuke55 commented Jul 7, 2022

@yukkysaito
moved path_shifter and occupancy_grid_based_collision_checker to scene_module/utils in 3c3ea26
I put *cpp files in utils directly.

@kosuke55 kosuke55 force-pushed the feature/behavior_path_occ_grid branch from 319e157 to 3c3ea26 Compare July 7, 2022 11:23
Copy link
Contributor

@yukkysaito yukkysaito left a comment

Choose a reason for hiding this comment

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

LGTM

@kosuke55 kosuke55 force-pushed the feature/behavior_path_occ_grid branch from 4035c10 to 2912b92 Compare July 7, 2022 15:26
@kosuke55 kosuke55 changed the title feat(behavior_path_planner): add occupancy_grid_map feat(behavior_path_planner): add occupancy_grid_based_collision_detector Jul 7, 2022
@kosuke55 kosuke55 force-pushed the feature/behavior_path_occ_grid branch from 2912b92 to 98efbff Compare July 7, 2022 15:33
@kosuke55 kosuke55 merged commit bbe9420 into autowarefoundation:main Jul 7, 2022
@kosuke55 kosuke55 deleted the feature/behavior_path_occ_grid branch July 7, 2022 15:57
esteve pushed a commit that referenced this pull request Jul 8, 2022
…tor (#1259)

* feat(behavior_path_planner): add occupancy_grid_based_collision_detector

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

* modify copyright

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

* move occ and path_shifter to utils

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

* fix humble werror

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

* fix precomit

Signed-off-by: kosuke55 <[email protected]>
boyali referenced this pull request in boyali/autoware.universe Sep 28, 2022
…tor (tier4#1259)

* feat(behavior_path_planner): add occupancy_grid_based_collision_detector

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

* modify copyright

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

* move occ and path_shifter to utils

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

* fix humble werror

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

* fix precomit

Signed-off-by: kosuke55 <[email protected]>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
…tor (tier4#1259)

* feat(behavior_path_planner): add occupancy_grid_based_collision_detector

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

* modify copyright

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

* move occ and path_shifter to utils

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

* fix humble werror

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

* fix precomit

Signed-off-by: kosuke55 <[email protected]>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
…tor (tier4#1259)

* feat(behavior_path_planner): add occupancy_grid_based_collision_detector

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

* modify copyright

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

* move occ and path_shifter to utils

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

* fix humble werror

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

* fix precomit

Signed-off-by: kosuke55 <[email protected]>
yukke42 pushed a commit to tzhong518/autoware.universe that referenced this pull request Oct 14, 2022
…tor (autowarefoundation#1259)

* feat(behavior_path_planner): add occupancy_grid_based_collision_detector

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

* modify copyright

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

* move occ and path_shifter to utils

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

* fix humble werror

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

* fix precomit

Signed-off-by: kosuke55 <[email protected]>
boyali referenced this pull request in boyali/autoware.universe Oct 19, 2022
…tor (tier4#1259)

* feat(behavior_path_planner): add occupancy_grid_based_collision_detector

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

* modify copyright

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

* move occ and path_shifter to utils

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

* fix humble werror

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

* fix precomit

Signed-off-by: kosuke55 <[email protected]>
badai-nguyen pushed a commit to badai-nguyen/autoware.universe that referenced this pull request May 2, 2024
…et prev_state_stop when using time to red signal (autowarefoundation#1259)

* fix(behavior_velocity_traffic_light): stop when the signal is timed out

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

* fix(behavior_velocity_traffic_light): set prev_state_stop when using time to red signal

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.

4 participants