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(freespace_planner): can't stop before blocking obstacle in parking#980 #1872

Merged
merged 15 commits into from
Oct 3, 2022

Conversation

alanmengg
Copy link
Contributor

@alanmengg alanmengg commented Sep 15, 2022

Description

To close #980.

This PR modifies stop trajectory function in freespace planner. Current stop trajectory is only one point of current pose which will not be used in motion velocity smoother. Make stop trajectory points equal to current trajectory points with zero velocity can successfully be optimized in motion velocity smoother and executed by control module.

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.

@alanmengg alanmengg changed the title fix(freespace_planner): Can't stop before blocking obstacle in parki… fix(freespace_planner): Can't stop before blocking obstacle in parking #980 Sep 15, 2022
@alanmengg alanmengg changed the title fix(freespace_planner): Can't stop before blocking obstacle in parking #980 fix(freespace_planner): Can't stop before blocking obstacle in parking Sep 15, 2022
@alanmengg alanmengg changed the title fix(freespace_planner): Can't stop before blocking obstacle in parking fix(freespace_planner): Can't stop before blocking obstacle in parki… Sep 15, 2022
@alanmengg alanmengg changed the title fix(freespace_planner): Can't stop before blocking obstacle in parki… fix(freespace_planner): Can't stop before blocking obstacle in parking #980 Sep 15, 2022
@shmpwk shmpwk requested review from shmpwk and kosuke55 September 15, 2022 06:39
@shmpwk shmpwk added the component:planning Route planning, decision-making, and navigation. (auto-assigned) label Sep 15, 2022
@TakaHoribe
Copy link
Contributor

@kosuke55 @shmpwk would you review this PR?

@shmpwk shmpwk requested a review from NorahXiong September 15, 2022 08:10
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.

@alanmengg
Could you check CI test of
semantic-pull-request and DCO?

@alanmengg alanmengg changed the title fix(freespace_planner): Can't stop before blocking obstacle in parking #980 fix(freespace_planner): Can not stop before blocking obstacle in parking Sep 20, 2022
@alanmengg alanmengg changed the title fix(freespace_planner): Can not stop before blocking obstacle in parking fix(freespace_planner): can't stop before blocking obstacle in parking#980 Sep 20, 2022
@alanmengg
Copy link
Contributor Author

alanmengg commented Sep 20, 2022

@alanmengg Could you check CI test of semantic-pull-request and DCO?

ok. I have fixed them.

@shmpwk
Copy link
Contributor

shmpwk commented Sep 20, 2022

@alanmengg
Could you exclude these commits?
517a23c
515eb22

@alanmengg alanmengg force-pushed the adas branch 2 times, most recently from 391426f to 6f8075a Compare September 21, 2022 02:13
@alanmengg
Copy link
Contributor Author

@alanmengg Could you exclude these commits? 517a23c 515eb22
ok, I think now I have excluded them.

@codecov
Copy link

codecov bot commented Sep 21, 2022

Codecov Report

Base: 9.63% // Head: 9.61% // Decreases project coverage by -0.01% ⚠️

Coverage data is based on head (a5cbd74) compared to base (30a0f2b).
Patch coverage: 0.00% of modified lines in pull request are covered.

❗ Current head a5cbd74 differs from pull request most recent head a7de81f. Consider uploading reports for the commit a7de81f to get more accurate results

Additional details and impacted files
@@           Coverage Diff            @@
##            main   #1872      +/-   ##
========================================
- Coverage   9.63%   9.61%   -0.02%     
========================================
  Files        907     907              
  Lines      56544   56658     +114     
  Branches    6694    6694              
========================================
  Hits        5448    5448              
- Misses     46601   46715     +114     
  Partials    4495    4495              
Flag Coverage Δ *Carryforward flag
differential 0.00% <0.00%> (?)
total 9.63% <0.00%> (ø) Carriedforward from b91a7fa

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

Impacted Files Coverage Δ
...ption_rviz_plugin/src/tools/interactive_object.hpp 0.00% <ø> (ø)
...r/src/freespace_planner/freespace_planner_node.cpp 0.00% <0.00%> (ø)
...clude/freespace_planner/freespace_planner_node.hpp 0.00% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

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.

Excellent!

wep21 and others added 14 commits September 24, 2022 20:17
…owarefoundation#791)

* fix(tier4_perception_rviz_plugin): modify build error in rolling

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

* fix(tier4_perception_rviz_plugin): add target compile definitions

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
…#782)

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
…oundation#793)

* fix(ndt_pcl_modified): modify build error in rolling

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

* fix(ndt): modify build error in rolling

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

* fix(ndt_scan_matcher): modify build error in rolling

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

* ci(pre-commit): autofix

* remove unused find_package

* fix(ndt): remove memory.h

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

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
…nner_node.cpp

Co-authored-by: Kosuke Takeuchi <kosuke.tnp@gmail.com>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
…undation#782)"

This reverts commit 7075fca.

Signed-off-by: guiping meng <alan.meng@autocore.ai>
…utowarefoundation#793)"

This reverts commit a235363.

Signed-off-by: guiping meng <alan.meng@autocore.ai>
…nner_node.cpp

    Co-authored-by: Kosuke Takeuchi <kosuke.tnp@gmail.com>
    Signed-off-by: guiping meng <alan.meng@autocore.ai>

Signed-off-by: guiping meng <alan.meng@autocore.ai>
….com>

Signed-off-by: guiping meng <alan.meng@autocore.ai>
….com>

Signed-off-by: guiping meng <alan.meng@autocore.ai>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
…ing (autowarefoundation#791)"

This reverts commit eac57fb.

Signed-off-by: guiping meng <alan.meng@autocore.ai>
Copy link
Contributor

@kosuke55 kosuke55 left a comment

Choose a reason for hiding this comment

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

LGTM!
The sample freespace parking scenario also works fine.

free_space_2022-09-25-01-52-11.mp4

stop if finding an obstacle

free_space_stop_2022-09-25-02-20-29.mp4

@kosuke55
Copy link
Contributor

@TakaHoribe
Could you please approve it as a code owner for merging?

@alanmengg
Copy link
Contributor Author

@TakaHoribe friendly pin.

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. Thank you!

@shmpwk shmpwk enabled auto-merge (squash) October 3, 2022 12:07
@shmpwk shmpwk merged commit c7698fc into autowarefoundation:main Oct 3, 2022
boyali pushed a commit to boyali/autoware.universe that referenced this pull request Oct 19, 2022
…g#980 (autowarefoundation#1872)

* fix(tier4_perception_rviz_plugin): modify build error in rolling (tier4#791)

* fix(tier4_perception_rviz_plugin): modify build error in rolling

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

* fix(tier4_perception_rviz_plugin): add target compile definitions

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
Signed-off-by: guiping meng <alan.meng@autocore.ai>

* fix(had_map_utils): modify build error in rolling (tier4#782)

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
Signed-off-by: guiping meng <alan.meng@autocore.ai>

* fix: modify build error of ndt related packages in rolling (tier4#793)

* fix(ndt_pcl_modified): modify build error in rolling

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

* fix(ndt): modify build error in rolling

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

* fix(ndt_scan_matcher): modify build error in rolling

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

* ci(pre-commit): autofix

* remove unused find_package

* fix(ndt): remove memory.h

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

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Signed-off-by: guiping meng <alan.meng@autocore.ai>

* fix(freespace_planner):  Can't stop before blocking obstacle in parking tier4#980

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* ci(pre-commit): autofix

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* Update planning/freespace_planner/src/freespace_planner/freespace_planner_node.cpp

Co-authored-by: Kosuke Takeuchi <kosuke.tnp@gmail.com>
Signed-off-by: guiping meng <alan.meng@autocore.ai>

* Revert "fix(had_map_utils): modify build error in rolling (tier4#782)"

This reverts commit 7075fca.

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* Revert "fix: modify build error of ndt related packages in rolling (tier4#793)"

This reverts commit a235363.

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* Update planning/freespace_planner/src/freespace_planner/freespace_planner_node.cpp

    Co-authored-by: Kosuke Takeuchi <kosuke.tnp@gmail.com>
    Signed-off-by: guiping meng <alan.meng@autocore.ai>

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* revert some changes Co-authored-by: Kosuke Takeuchi <kosuke.tnp@gmail.com>

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* revert some changes Co-authored-by: Kosuke Takeuchi <kosuke.tnp@gmail.com>

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* ci(pre-commit): autofix

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* revert some changes

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* fix mistakes

Signed-off-by: guiping meng <alan.meng@autocore.ai>

* Revert "fix(tier4_perception_rviz_plugin): modify build error in rolling (tier4#791)"

This reverts commit eac57fb.

Signed-off-by: guiping meng <alan.meng@autocore.ai>

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
Signed-off-by: guiping meng <alan.meng@autocore.ai>
Co-authored-by: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Kosuke Takeuchi <kosuke.tnp@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:planning Route planning, decision-making, and navigation. (auto-assigned)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't stop before blocking obstacle in parking
6 participants