Skip to content

Commit f4174ec

Browse files
committed
improve function name
1 parent 8dd1647 commit f4174ec

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ocs2_ipm/include/ocs2_ipm/IpmInitialization.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ vector_t initializeTerminalSlackVariable(OptimalControlProblem& ocpDefinition, s
109109
* @param initialSlackMarginRate : Additional margin rate of the initial slack variables. Corresponds to `slack_bound_frac` option of IPOPT.
110110
* @return Initialized slack variable of the pre-jump state-only constraints.
111111
*/
112-
vector_t initializePreJumpSlackVariable(OptimalControlProblem& ocpDefinition, scalar_t time, const vector_t& state,
113-
scalar_t initialSlackLowerBound, scalar_t initialSlackMarginRate);
112+
vector_t initializeEventSlackVariable(OptimalControlProblem& ocpDefinition, scalar_t time, const vector_t& state,
113+
scalar_t initialSlackLowerBound, scalar_t initialSlackMarginRate);
114114

115115
} // namespace ipm
116116
} // namespace ocs2

ocs2_ipm/src/IpmInitialization.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ vector_t initializeTerminalSlackVariable(OptimalControlProblem& ocpDefinition, s
6969
return initializeSlackVariable(ineqConstraint, initialSlackLowerBound, initialSlackMarginRate);
7070
}
7171

72-
vector_t initializePreJumpSlackVariable(OptimalControlProblem& ocpDefinition, scalar_t time, const vector_t& state,
73-
scalar_t initialSlackLowerBound, scalar_t initialSlackMarginRate) {
72+
vector_t initializeEventSlackVariable(OptimalControlProblem& ocpDefinition, scalar_t time, const vector_t& state,
73+
scalar_t initialSlackLowerBound, scalar_t initialSlackMarginRate) {
7474
if (ocpDefinition.preJumpInequalityConstraintPtr->empty()) {
7575
return vector_t();
7676
}

ocs2_ipm/src/IpmSolver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ void IpmSolver::initializeSlackDualTrajectory(const std::vector<AnnotatedTime>&
425425
std::tie(slackStateIneq[i], std::ignore) = ipm::fromMultiplierCollection(slackIneqTrajectory_.preJumps[cachedEventIndex]);
426426
std::tie(dualStateIneq[i], std::ignore) = ipm::fromMultiplierCollection(dualIneqTrajectory_.preJumps[cachedEventIndex]);
427427
} else {
428-
slackStateIneq[i] = ipm::initializePreJumpSlackVariable(ocpDefinition, getIntervalStart(timeDiscretization[i]), x[i],
429-
settings_.initialSlackLowerBound, settings_.initialSlackMarginRate);
428+
slackStateIneq[i] = ipm::initializeEventSlackVariable(ocpDefinition, getIntervalStart(timeDiscretization[i]), x[i],
429+
settings_.initialSlackLowerBound, settings_.initialSlackMarginRate);
430430
dualStateIneq[i] =
431431
ipm::initializeDualVariable(slackStateIneq[i], barrierParam, settings_.initialDualLowerBound, settings_.initialDualMarginRate);
432432
}

0 commit comments

Comments
 (0)