-
Notifications
You must be signed in to change notification settings - Fork 19
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
Feature/concatenate trajs #354
base: master
Are you sure you want to change the base?
Changes from 8 commits
f490eff
aff4283
8c71662
50b5902
53d04a1
2bc1b2a
0846444
a704149
fdcf7fa
1bd969a
b167c0a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2129,3 +2129,61 @@ def GetPointFrom(focus): | |
raise ValueError('Focus of the point is an unknown object') | ||
|
||
return coord | ||
|
||
def ConcatenateTrajectories(traj_list): | ||
""" | ||
Given a list of trajectories for a single manipulator, | ||
concatenate them into a single trajectory | ||
|
||
@param traj_list List of consective trajectories for a given manipulator | ||
@return base_traj Combined trajectory | ||
""" | ||
from planning.base import Tags | ||
|
||
if len(traj_list) == 0: | ||
raise ValueError('Trajectory list is empty') | ||
|
||
base_traj = traj_list[0] | ||
base_cspec = base_traj.GetConfigurationSpecification() | ||
|
||
smoothFlag = True | ||
constrainedFlag = False | ||
deterministicTrajectoryFlag = True | ||
deterministicEndPointFlag = False | ||
|
||
offset = base_traj.GetNumWaypoints() | ||
for i in xrange(1, len(traj_list)): | ||
traj_i = traj_list[i] | ||
|
||
cspec_i = traj_i.GetConfigurationSpecification() | ||
if base_cspec != cspec_i: | ||
raise ValueError('The configuration specifications of the trajectory do not match') | ||
|
||
tags_i = GetTrajectoryTags(traj_i) | ||
# Only True if all trajectories have this set | ||
if 'smooth' in tags_i and not tags_i['smooth']: | ||
smoothFlag = False | ||
|
||
# True if any trajectory has this set | ||
if 'constrained' in tags_i and tags_i['constrained']: | ||
constrainedFlag = True | ||
|
||
# Only True if all trajectories have this set | ||
if 'deterministic' in tags_i and not tags_i['deterministic']: | ||
deterministcTrajectoryFlag = False | ||
|
||
# True if the last trajectory has this set | ||
if i == len(traj_list)-1 and 'deterministic_endpoint' in tags_i and tags_i['determinstic_endpoint']: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wouldn't it be cleaner to do this outside of the loop? |
||
deterministicEndPointFlag = True | ||
|
||
# Add trajectory in by inserting each waypoint | ||
for j in xrange(traj_i.GetNumWaypoints()): | ||
waypoint = traj_i.GetWaypoint(j) | ||
base_traj.Insert(offset, waypoint) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For example, this would break if the trajectories did not already have the same |
||
offset += 1 | ||
|
||
flagSettings = {TAGS.SMOOTH: smoothFlag, TAGS.CONSTRAINED: constrainedFlag, | ||
TAGS.DETERMINISTIC_TRAJECTORY: deterministicTrajectoryFlag, | ||
TAGS.DETERMINISTIC_ENDPOINT: deterministicEndPointFlag} | ||
SetTrajectoryTags(base_traj, flagSettings, append=True) | ||
return base_traj |
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.
This would be skipped if
smooth
is not intags
. Issmooth
by default true?