Skip to content

Commit 549ed19

Browse files
committed
fix doc and add resize
1 parent 4a2d390 commit 549ed19

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ocs2_ipm/include/ocs2_ipm/IpmSolver.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ class IpmSolver : public SolverBase {
160160
/** Constructs the primal solution based on the optimized state and input trajectories */
161161
PrimalSolution toPrimalSolution(const std::vector<AnnotatedTime>& time, vector_array_t&& x, vector_array_t&& u);
162162

163-
/** Decides on the step to take and overrides given trajectories {x(t), u(t)} <- {x(t) + a*dx(t), u(t) + a*du(t)} */
163+
/** Decides on the step to take and overrides given trajectories {x(t), u(t), slackStateIneq(t), slackStateInputIneq(t)}
164+
* <- {x(t) + a*dx(t), u(t) + a*du(t), slackStateIneq(t) + a*dslackStateIneq(t), slackStateInputIneq(t) + a*dslackStateInputIneq(t)} */
164165
ipm::StepInfo takePrimalStep(const PerformanceIndex& baseline, const std::vector<AnnotatedTime>& timeDiscretization,
165166
const vector_t& initState, const OcpSubproblemSolution& subproblemSolution, vector_array_t& x,
166167
vector_array_t& u, scalar_t barrierParam, vector_array_t& slackStateIneq,

ocs2_ipm/src/IpmSolver.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ PerformanceIndex IpmSolver::setupQuadraticSubproblem(const std::vector<Annotated
542542
ipm::initializeSlackVariable(result.ineqConstraints.f, settings_.initialSlackLowerBound, settings_.initialSlackMarginRate);
543543
dualStateIneq[i] = ipm::initializeDualVariable(slackStateIneq[i], barrierParam, settings_.initialDualLowerBound,
544544
settings_.initialDualMarginRate);
545+
slackStateInputIneq[i].resize(0);
546+
dualStateInputIneq[i].resize(0);
545547
}
546548
performance[workerId] += ipm::computePerformanceIndex(result, barrierParam, slackStateIneq[i]);
547549
dynamics_[i] = std::move(result.dynamics);

0 commit comments

Comments
 (0)