From de5455ea3ddd2a022347d8709c893eef14b427d3 Mon Sep 17 00:00:00 2001 From: Matthew Powelson Date: Fri, 17 Apr 2020 13:59:59 -0500 Subject: [PATCH] Make FillJacobianBlock public in ConstraintSet --- ifopt_core/include/ifopt/constraint_set.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ifopt_core/include/ifopt/constraint_set.h b/ifopt_core/include/ifopt/constraint_set.h index 1e9cd90..991f003 100644 --- a/ifopt_core/include/ifopt/constraint_set.h +++ b/ifopt_core/include/ifopt/constraint_set.h @@ -82,15 +82,6 @@ class ConstraintSet : public Component { */ Jacobian GetJacobian() const final; -protected: - /** - * @brief Read access to the value of the optimization variables. - * - * This must be used to formulate the constraint violation and Jacobian. - */ - const VariablesPtr GetVariables() const { return variables_; }; - -private: /** * @brief Set individual Jacobians corresponding to each decision variable set. * @param var_set Set of variables the current Jacobian block belongs to. @@ -107,6 +98,17 @@ class ConstraintSet : public Component { * simply do nothing. */ virtual void FillJacobianBlock(std::string var_set, Jacobian& jac_block) const = 0; + +protected: + /** + * @brief Read access to the value of the optimization variables. + * + * This must be used to formulate the constraint violation and Jacobian. + */ + const VariablesPtr GetVariables() const { return variables_; }; + +private: + VariablesPtr variables_; /**