Skip to content

Commit

Permalink
Fix TSR parameter from manip to manipindex.
Browse files Browse the repository at this point in the history
  • Loading branch information
brianhou committed Feb 25, 2017
1 parent 9bd9caf commit 8dbb20a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/prpy/planning/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def CreateTSRChains(cls, robot, direction, distance):
T0_w=numpy.dot(H_world_w, Hw_end),
Tw_e=H_w_ee,
Bw=numpy.zeros((6, 2)),
manip=manip_index))
manipindex=manip_index))
constraint_chain = TSRChain(constrain=True, TSR=TSR(
T0_w=H_world_w,
Tw_e=H_w_ee,
Expand All @@ -85,6 +85,6 @@ def CreateTSRChains(cls, robot, direction, distance):
[-cls.epsilon, cls.epsilon],
[-cls.epsilon, cls.epsilon],
[-cls.epsilon, cls.epsilon]]),
manip=manip_index))
manipindex=manip_index))

return [goal_chain, constraint_chain]
2 changes: 1 addition & 1 deletion src/prpy/planning/cbirrt.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def PlanToEndEffectorPose(self, robot, goal_pose, **kw_args):
@return traj output path
"""
manipulator_index = robot.GetActiveManipulatorIndex()
goal_tsr = TSR(T0_w=goal_pose, manip=manipulator_index)
goal_tsr = TSR(T0_w=goal_pose, manipindex=manipulator_index)
tsr_chain = TSRChain(sample_goal=True, TSR=goal_tsr)

kw_args.setdefault('psample', 0.1)
Expand Down

0 comments on commit 8dbb20a

Please sign in to comment.