Skip to content

Commit 60b2074

Browse files
authored
Fix Bezier construction to match Drake's changed convention (#43)
1 parent d975258 commit 60b2074

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

gcs/bezier.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ def __init__(self, regions, order, continuity, edges=None, hdot_min=1e-6, full_d
6666
self.u_vars = np.concatenate((u_control.flatten("F"), u_duration))
6767
self.u_r_trajectory = BsplineTrajectory_[Expression](
6868
BsplineBasis_[Expression](order + 1, order + 1, KnotVectorType.kClampedUniform, 0., 1.),
69-
list(u_control.T))
69+
u_control)
7070
self.u_h_trajectory = BsplineTrajectory_[Expression](
7171
BsplineBasis_[Expression](order + 1, order + 1, KnotVectorType.kClampedUniform, 0., 1.),
72-
list(np.expand_dims(u_duration, 1)))
72+
np.expand_dims(u_duration, 0))
7373

7474
edge_vars = np.concatenate((u_control.flatten("F"), u_duration, v_control.flatten("F"), v_duration))
7575
v_r_trajectory = BsplineTrajectory_[Expression](
7676
BsplineBasis_[Expression](order + 1, order + 1, KnotVectorType.kClampedUniform, 0., 1.),
77-
list(v_control.T))
77+
v_control)
7878
v_h_trajectory = BsplineTrajectory_[Expression](
7979
BsplineBasis_[Expression](order + 1, order + 1, KnotVectorType.kClampedUniform, 0., 1.),
80-
list(np.expand_dims(v_duration, 1)))
80+
np.expand_dims(v_duration, 0))
8181

8282
# Continuity constraints
8383
self.contin_constraints = []
@@ -344,6 +344,9 @@ def SolvePath(self, rounding=False, verbose=False, preprocessing=False):
344344
for ii in range(len(time_control_points)):
345345
time_control_points[ii] -= offset
346346

347+
path_control_points = np.array(path_control_points).T
348+
time_control_points = np.array(time_control_points).T
349+
347350
path = BsplineTrajectory(BsplineBasis(self.order + 1, knots), path_control_points)
348351
time_traj = BsplineTrajectory(BsplineBasis(self.order + 1, knots), time_control_points)
349352

0 commit comments

Comments
 (0)