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

Mppi goal to critic (backport #4822) #4853

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2025

Reopen #4812 against main


This is an automatic backport of pull request #4822 done by Mergify.

* Add goal pose to CriticData

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

* Pass goal pose directly to withinPositionGoalTolerance

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

* Fix condition not

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

* Add goal positions to tests

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

* Use plan stamp

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

* Use float instead of auto

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

* Throw nav2_core exceptions

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

* Set pose frame id in test

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

* Fix frame id in test vol 2

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

---------

Signed-off-by: redvinaa <[email protected]>
(cherry picked from commit d11de56)

# Conflicts:
#	nav2_mppi_controller/include/nav2_mppi_controller/tools/utils.hpp
@mergify mergify bot added the conflicts label Jan 14, 2025
Copy link
Contributor Author

mergify bot commented Jan 14, 2025

Cherry-pick of d11de56 has failed:

On branch mergify/bp/jazzy/pr-4822
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit d11de564.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   nav2_mppi_controller/include/nav2_mppi_controller/critic_data.hpp
	modified:   nav2_mppi_controller/include/nav2_mppi_controller/optimizer.hpp
	modified:   nav2_mppi_controller/include/nav2_mppi_controller/tools/path_handler.hpp
	modified:   nav2_mppi_controller/src/controller.cpp
	modified:   nav2_mppi_controller/src/critics/cost_critic.cpp
	modified:   nav2_mppi_controller/src/critics/goal_angle_critic.cpp
	modified:   nav2_mppi_controller/src/critics/goal_critic.cpp
	modified:   nav2_mppi_controller/src/critics/obstacles_critic.cpp
	modified:   nav2_mppi_controller/src/critics/path_align_critic.cpp
	modified:   nav2_mppi_controller/src/critics/path_angle_critic.cpp
	modified:   nav2_mppi_controller/src/critics/path_follow_critic.cpp
	modified:   nav2_mppi_controller/src/critics/prefer_forward_critic.cpp
	modified:   nav2_mppi_controller/src/critics/twirling_critic.cpp
	modified:   nav2_mppi_controller/src/optimizer.cpp
	modified:   nav2_mppi_controller/src/path_handler.cpp
	modified:   nav2_mppi_controller/test/controller_state_transition_test.cpp
	modified:   nav2_mppi_controller/test/critic_manager_test.cpp
	modified:   nav2_mppi_controller/test/critics_tests.cpp
	modified:   nav2_mppi_controller/test/optimizer_smoke_test.cpp
	modified:   nav2_mppi_controller/test/optimizer_unit_tests.cpp
	modified:   nav2_mppi_controller/test/utils_test.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_mppi_controller/include/nav2_mppi_controller/tools/utils.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Jan 14, 2025

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @jazzy, but it must be in main
to have these changes reflected into new distributions.

Signed-off-by: Steve Macenski <[email protected]>
@SteveMacenski SteveMacenski merged commit a6a4c26 into jazzy Jan 14, 2025
7 of 8 checks passed
@SteveMacenski SteveMacenski deleted the mergify/bp/jazzy/pr-4822 branch January 14, 2025 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants