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 Pilz blending times (backport #2961) #3000

Merged
merged 4 commits into from
Sep 15, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 14, 2024

Description

Found the issue!

Turns out that Pilz's appendWithStrictTimeIncrease() function had a single if-statement that encompassed two conditions:

  1. If trajectory is empty
  2. If the end state of one segment is not equal to the start state of the second segment

In both cases, the whole trajectory segment was appended with a dt=0.

The problem is that in case 1, it's appropriate to add a dt=0 (as the trajectory is empty, the first point should be at t=0). In case 2, we needed to apply a non-zero sample time offset dictated by the actual dt of that trajectory's first waypoint.

Closes #2945

Checklist

  • Required by CI: Code is auto formatted using clang-format
  • Extend the tutorials / documentation reference
  • Document API changes relevant to the user in the MIGRATION.md notes
  • Create tests, which fail without this PR reference
  • Include a screenshot if changing a GUI
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers

This is an automatic backport of pull request #2961 done by [Mergify](https://mergify.com).

* Fix Pilz blending times... the right way

* Remove more debugs

* Format

(cherry picked from commit 4fad0d0)

# Conflicts:
#	moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp
#	moveit_planners/pilz_industrial_motion_planner/src/trajectory_blender_transition_window.cpp
Copy link
Author

mergify bot commented Sep 14, 2024

Cherry-pick of 4fad0d0 has failed:

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

You are currently cherry-picking commit 4fad0d0de.
  (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:   moveit_planners/pilz_industrial_motion_planner/src/plan_components_builder.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/command_list_manager.cpp
	both modified:   moveit_planners/pilz_industrial_motion_planner/src/trajectory_blender_transition_window.cpp

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

@mergify mergify bot added the conflicts label Sep 14, 2024
@codecov-commenter
Copy link

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.15%. Comparing base (c9079e9) to head (59cb2f4).
Report is 1 commits behind head on humble.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #3000      +/-   ##
==========================================
- Coverage   51.20%   51.15%   -0.04%     
==========================================
  Files         382      382              
  Lines       31910    31902       -8     
==========================================
- Hits        16335    16317      -18     
- Misses      15575    15585      +10     

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

@sea-bass sea-bass changed the title Fix Pilz blending times... the right way (backport #2961) Fix Pilz blending times (backport #2961) Sep 14, 2024
@sea-bass sea-bass merged commit ccf7e5c into humble Sep 15, 2024
5 checks passed
@sea-bass sea-bass deleted the mergify/bp/humble/pr-2961 branch September 15, 2024 13:14
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.

3 participants