-
Notifications
You must be signed in to change notification settings - Fork 493
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
Use adjustable waypoint batch sizes for Ruckig #1719
Conversation
71be35c
to
8a099a6
Compare
Codecov ReportBase: 50.28% // Head: 50.31% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## main #1719 +/- ##
==========================================
+ Coverage 50.28% 50.31% +0.04%
==========================================
Files 374 374
Lines 31286 31325 +39
==========================================
+ Hits 15728 15759 +31
- Misses 15558 15566 +8
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. |
378777c
to
ea605da
Compare
ea605da
to
0705c0a
Compare
moveit_core/trajectory_processing/src/ruckig_traj_smoothing.cpp
Outdated
Show resolved
Hide resolved
fe19f77
to
f5dca42
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, just a couple of minor comments
moveit_core/trajectory_processing/include/moveit/trajectory_processing/ruckig_traj_smoothing.h
Outdated
Show resolved
Hide resolved
moveit_core/trajectory_processing/src/ruckig_traj_smoothing.cpp
Outdated
Show resolved
Hide resolved
moveit_core/trajectory_processing/src/ruckig_traj_smoothing.cpp
Outdated
Show resolved
Hide resolved
moveit_core/trajectory_processing/src/ruckig_traj_smoothing.cpp
Outdated
Show resolved
Hide resolved
moveit_core/trajectory_processing/src/ruckig_traj_smoothing.cpp
Outdated
Show resolved
Hide resolved
6ca7695
to
b7d2ad0
Compare
moveit_core/trajectory_processing/src/ruckig_traj_smoothing.cpp
Outdated
Show resolved
Hide resolved
4d52527
to
43179d8
Compare
moveit_core/trajectory_processing/include/moveit/trajectory_processing/ruckig_traj_smoothing.h
Outdated
Show resolved
Hide resolved
size_t first_new_waypoint = first_point_previously_smoothed ? 1 : 0; | ||
|
||
// Add smoothed waypoints to the output | ||
for (size_t waypoint_idx = first_new_waypoint; waypoint_idx < sub_trajectory.getWayPointCount(); ++waypoint_idx) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this could use RobotTrajectory::append(). Same for the loop further up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea but I don't think that will work because of the dt
argument. We might not have a constant dt
.
RobotTrajectory& append(const RobotTrajectory& source, double dt, size_t start_index = 0,
size_t end_index = std::numeric_limits<std::size_t>::max());
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's only the dt between the two trajectories. All other steps remain the same
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 I replaced the second loop. The first loop --> [move_group-4] [WARN] [1671207429.602316971] [RobotTrajectory]: First and only waypoint has a duration of 0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sigh, I think there may be a bug in append()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug report here: #1813
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we merge this in the meantime?
b1d06df
to
196963d
Compare
55f9ead
to
9601311
Compare
Addresses #1439.
This feeds waypoints into Ruckig in batches of min(100 waypoints, 10% of waypoints).
Hopefully this is a happy medium. @swiz23 are you able to test this?
This can be tested easily by adding this line to moveit_resources/panda/ompl_planning.yaml, then run any of the motion planning MoveIt2 tutorials: