Skip to content

Commit 449492c

Browse files
Copilotdellaert
andcommitted
Fix review comments: logic error and spelling corrections
Co-authored-by: dellaert <10515273+dellaert@users.noreply.github.com>
1 parent a8f9f58 commit 449492c

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

gtdynamics/constrained_optimizer/ConstrainedOptProblem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ EConsOptProblem IEConsOptProblem::auxiliaryProblem() const {
7777
Key aux_key1 = AuxilaryKey(k++);
7878
aux_constraints.emplace_back(CreateAuxiliaryConstraint(p1, aux_key1));
7979
aux_values.insert(aux_key1, ComputeAuxiliaryValue(p1, values_));
80-
DoubleExpressionInequality::shared_ptr p2 = p->constraint1();
80+
DoubleExpressionInequality::shared_ptr p2 = p->constraint2();
8181
Key aux_key2 = AuxilaryKey(k++);
8282
aux_constraints.emplace_back(CreateAuxiliaryConstraint(p2, aux_key2));
8383
aux_values.insert(aux_key2, ComputeAuxiliaryValue(p2, values_));

gtdynamics/constrained_optimizer/ConstrainedOptProblem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ struct IEConsOptProblem : public EConsOptProblem {
8888
return i_constraints_.evaluateViolationL2Norm(values);
8989
}
9090

91-
/// Equivalent equality-constrained optimization probelm with auxiliary
91+
/// Equivalent equality-constrained optimization problem with auxiliary
9292
/// variables z. Inequality constraints g(x)>=0 are transformed into equality
9393
/// constraints g(x)-z^2=0.
9494
EConsOptProblem auxiliaryProblem() const;

gtdynamics/constrained_optimizer/ConstrainedOptimizer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class ConstrainedOptimizer {
6565
* only.
6666
*
6767
* @param graph A Nonlinear factor graph representing cost.
68-
* @param cosntraints All the constraints.
68+
* @param constraints All the constraints.
6969
* @param initial_values Initial values for all variables.
7070
* @return Values The result of the constrained optimization.
7171
*/
@@ -81,7 +81,7 @@ class ConstrainedOptimizer {
8181
* inequality constraints.
8282
*
8383
* @param graph A Nonlinear factor graph representing cost.
84-
* @param e_cosntraints All the nonlinear equality constraints.
84+
* @param e_constraints All the nonlinear equality constraints.
8585
* @param i_constraints All the nonlinear inequality constraints.
8686
* @param initial_values Initial values for all variables.
8787
* @return Values The result of the constrained optimization.

gtdynamics/manifold/ManifoldOptimizerType1.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ class ManifoldOptimizerType1 : public ManifoldOptimizer {
9797
const Values& nopt_values) const;
9898

9999
protected:
100-
/** Create values for the manifold optimization probelm by (1) create
100+
/** Create values for the manifold optimization problem by (1) create
101101
* constraint manifolds for constraint-connected components; (2) identify if
102-
* the cosntraint manifold is fully constrained; (3) collect unconstrained
102+
* the constraint manifold is fully constrained; (3) collect unconstrained
103103
* variables.
104104
*/
105105
void constructMoptValues(const EConsOptProblem& ecopt_problem,

gtdynamics/manifold/MultiJacobian.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ MultiJacobian MultiJacobian::VerticalStack(const MultiJacobian &jac1,
3838

3939
MultiJacobian jac;
4040
for (const auto &[key, matrix] : jac1) {
41-
Matrix expaned_mat(dim, matrix.cols());
42-
expaned_mat << matrix, Matrix::Zero(dim2, matrix.cols());
43-
jac.addJacobian(key, expaned_mat);
41+
Matrix expanded_mat(dim, matrix.cols());
42+
expanded_mat << matrix, Matrix::Zero(dim2, matrix.cols());
43+
jac.addJacobian(key, expanded_mat);
4444
}
4545
for (const auto &[key, matrix] : jac2) {
46-
Matrix expaned_mat(dim, matrix.cols());
47-
expaned_mat << Matrix::Zero(dim1, matrix.cols()), matrix;
48-
jac.addJacobian(key, expaned_mat);
46+
Matrix expanded_mat(dim, matrix.cols());
47+
expanded_mat << Matrix::Zero(dim1, matrix.cols()), matrix;
48+
jac.addJacobian(key, expanded_mat);
4949
}
5050
return jac;
5151
}

gtdynamics/optimizer/ConvexIQPSolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ SolveConvexIQP(const GaussianFactorGraph &cost,
202202
// all constraints are tight
203203
return {x_new, active_indices, num_solves, true};
204204
} else {
205-
// can relieve constriant
205+
// can relieve constraint
206206
active_indices.erase(min_idx);
207207
if (num_solves > max_iters) {
208208
std::cout << "min_lambda: " << min_lambda << "\n";

gtdynamics/optimizer/ConvexIQPSolver.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ using gtsam::VectorValues;
2727

2828
/** Solve a convex inequality constrained QP problem defined in
2929
* Nocedal Sec. 16.5 using the algorithm in Nocedal Alg. 16.3.
30-
* @param graph Cost for IQP probelm.
30+
* @param graph Cost for IQP problem.
3131
* @param constraints Linear inequality constraints of IQP problem.
3232
* @param init_active_indices Initial indices of inequality constraints.
3333
* @param init_values Initial values for optimization.
34-
* @return [solution vector, active constriant indices, num solves, solve
34+
* @return [solution vector, active constraint indices, num solves, solve
3535
* successful]. */
3636
std::tuple<VectorValues, IndexSet, size_t, bool>
3737
SolveConvexIQP(const GaussianFactorGraph &graph,

0 commit comments

Comments
 (0)