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 #4822

Merged
merged 9 commits into from
Jan 14, 2025

Conversation

redvinaa
Copy link
Contributor

@redvinaa redvinaa commented Jan 3, 2025

Reopen #4812 against main

Copy link
Contributor

mergify bot commented Jan 3, 2025

@redvinaa, your PR has failed to build. Please check CI outputs and resolve issues.
You may need to rebase or pull in main due to API changes (or your contribution genuinely fails).

@SteveMacenski
Copy link
Member

@redvinaa before you ask, no this CI failure is also not from you. Geometry2 just changed a bunch of headers from .h to .hpp and the Rolling release with those changes came out last night. #4732 resolves, but need to merge that in and you'll need to pull in those changes or rebase. Then any CI failures are real 😆

@SteveMacenski
Copy link
Member

Rebase with #4823 for CI

@redvinaa redvinaa force-pushed the mppi-goal-to-critic branch from 07c373c to b9c3055 Compare January 6, 2025 09:41
Copy link
Member

@SteveMacenski SteveMacenski left a comment

Choose a reason for hiding this comment

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

This breaks a MPPI unit test - please make sure that this works properly. You may need to broadcast a transformation in that test so that the getTransformedGoal method can function. Likewise in your other PR.

Otherwise, LGTM

Copy link
Contributor

mergify bot commented Jan 9, 2025

@redvinaa, your PR has failed to build. Please check CI outputs and resolve issues.
You may need to rebase or pull in main due to API changes (or your contribution genuinely fails).

Copy link
Member

@SteveMacenski SteveMacenski left a comment

Choose a reason for hiding this comment

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

Waiting on CI to turn over - sorry you've hit landmine after landmine in our usually very stable CI. I'm not sure why circle's not cloning but its not your fault. I'm asking our CI guru to investigate :-)

Copy link
Contributor

mergify bot commented Jan 10, 2025

@redvinaa, your PR has failed to build. Please check CI outputs and resolve issues.
You may need to rebase or pull in main due to API changes (or your contribution genuinely fails).

@ruffsl
Copy link
Member

ruffsl commented Jan 10, 2025

Cloning git repository - [email protected]:ros-navigation/navigation2.git
Cloning into '.'...
[email protected]: Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
error running git clone "[email protected]:ros-navigation/navigation2.git": exit status 128

Hmm, it failed to even clone the repo. That is strange...

Looks like the CircleCI Deploy key got deleted from GitHub for this GitHub repo.
Did anyone purge this repo's Deploy keys

Seems to be cloning the repo just fine now after re-adding a new deploy key!

@SteveMacenski
Copy link
Member

@redvinaa you have a test failing:

/opt/overlay_ws/src/navigation2/nav2_mppi_controller/test/controller_state_transition_test.cpp:67
Expected: controller->computeVelocityCommands(pose, velocity, {}) doesn't throw an exception.
  Actual: it throws nav2_core::ControllerTFError with description "Unable to transform goal pose into costmap frame".

/opt/overlay_ws/src/navigation2/nav2_mppi_controller/test/controller_state_transition_test.cpp:67
Expected: controller->computeVelocityCommands(pose, velocity, {}) doesn't throw an exception.
  Actual: it throws nav2_core::ControllerTFError with description "Unable to transform goal pose into costmap frame".

@SteveMacenski SteveMacenski linked an issue Jan 14, 2025 that may be closed by this pull request
@redvinaa
Copy link
Contributor Author

I'm not sure what's the best way to go here, because the dummy path is generated with "odom" frame, while the costmap is in "map" frame. @SteveMacenski if you have a better solution than mine, do tell me.

The test now fails because of docking. :D Could you maybe rerun it? It passed on my machine on humble.

@SteveMacenski SteveMacenski merged commit d11de56 into ros-navigation:main Jan 14, 2025
9 of 10 checks passed
mergify bot pushed a commit that referenced this pull request Jan 14, 2025
* 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
@SteveMacenski
Copy link
Member

I'm not sure what's the best way to go here, because the dummy path is generated with "odom" frame, while the costmap is in "map" frame. @SteveMacenski if you have a better solution than mine, do tell me.

Fine by me - that test is a really basic exercising of the lifecycle and functions to make sure it can come up, do work, and shut down cleanly. Its not really doing any "work" in that test and each method have their own extensive test cases below.

The test now fails because of docking. :D Could you maybe rerun it? It passed on my machine on humble.

Something's going on with that test right now, not your fault. Merging! Thanks for the great contribution, as always 😄

SteveMacenski added a commit that referenced this pull request Jan 14, 2025
* Mppi goal to critic (#4822)

* 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

* Update utils.hpp

Signed-off-by: Steve Macenski <[email protected]>

---------

Signed-off-by: Steve Macenski <[email protected]>
Co-authored-by: Vince Reda <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>
@redvinaa redvinaa mentioned this pull request Jan 15, 2025
7 tasks
@mergify mergify bot mentioned this pull request Jan 15, 2025
7 tasks
RBT22 pushed a commit to EnjoyRobotics/navigation2 that referenced this pull request Jan 22, 2025
* 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]>
Signed-off-by: RBT22 <[email protected]>
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.

MPPI GoalCritic bug
3 participants