Skip to content

Commit fada42c

Browse files
committed
jtraj: fix qd1 ,mstraj qdf -- ensure they are ndarray using getvector
1 parent 276efaa commit fada42c

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

roboticstoolbox/tools/trajectory.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ def jtraj(q0, qf, tv, qd0=None, qd1=None):
416416
if qd1 is None:
417417
qd1 = np.zeros(q0.shape)
418418
else:
419-
qd0 = getvector(qd0)
419+
qd1 = getvector(qd1)
420420
if not len(qd1) == len(q0):
421421
raise ValueError('qd1 has wrong size')
422422

@@ -742,16 +742,19 @@ def mstraj(
742742
if isinstance(Tacc, (int, float)):
743743
Tacc = np.tile(Tacc, (ns,))
744744
else:
745+
Tacc = getvector(Tacc)
745746
if not len(Tacc) == ns:
746747
raise ValueError('Tacc is wrong size')
747748
if qd0 is None:
748749
qd0 = np.zeros((nj,))
749750
else:
751+
qd0 = getvector(qd0)
750752
if not len(qd0) == len(q0):
751753
raise ValueError('qd0 is wrong size')
752754
if qdf is None:
753755
qdf = np.zeros((nj,))
754756
else:
757+
qdf = getvector(qdf)
755758
if not len(qdf) == len(q0):
756759
raise ValueError('qdf is wrong size')
757760

0 commit comments

Comments
 (0)