Skip to content

Commit ea1f2e3

Browse files
authored
Merge pull request #292 from JuliaControl/doc_modif
doc: clearer sentences in `getinfo`
2 parents bba9ce7 + 0a6eeab commit ea1f2e3

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/controller/execute.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ are also available:
110110
111111
- `:JE`: economic cost value at the optimum, ``J_E``
112112
- `:gc`: custom nonlinear constraints values at the optimum, ``\mathbf{g_c}``
113-
- `:∇J` or *`:nablaJ`* : gradient of the objective function, ``\mathbf{\nabla} J``
114-
- `:∇²J` or *`:nabla2J`* : Hessian of the objective function, ``\mathbf{\nabla^2}J``
115-
- `:∇g` or *`:nablag`* : Jacobian of the inequality constraint, ``\mathbf{\nabla g}``
116-
- `:∇²ℓg` or *`:nabla2lg`* : Hessian of the inequality Lagrangian, ``\mathbf{\nabla^2}\ell_{\mathbf{g}}``
117-
- `:∇geq` or *`:nablageq`* : Jacobian of the equality constraint, ``\mathbf{\nabla g_{eq}}``
118-
- `:∇²ℓgeq` or *`:nabla2lgeq`* : Hessian of the equality Lagrangian, ``\mathbf{\nabla^2}\ell_{\mathbf{g_{eq}}}``
119-
120-
Note that Hessian of Lagrangians are not fully supported yet. Their nonzero coefficients are
121-
random values for now.
113+
- `:∇J` or *`:nablaJ`* : optimal gradient of the objective function, ``\mathbf{\nabla} J``
114+
- `:∇²J` or *`:nabla2J`* : optimal Hessian of the objective function, ``\mathbf{\nabla^2}J``
115+
- `:∇g` or *`:nablag`* : optimal Jacobian of the inequality constraint, ``\mathbf{\nabla g}``
116+
- `:∇²ℓg` or *`:nabla2lg`* : optimal Hessian of the inequality Lagrangian, ``\mathbf{\nabla^2}\ell_{\mathbf{g}}``
117+
- `:∇geq` or *`:nablageq`* : optimal Jacobian of the equality constraint, ``\mathbf{\nabla g_{eq}}``
118+
- `:∇²ℓgeq` or *`:nabla2lgeq`* : optimal Hessian of the equality Lagrangian, ``\mathbf{\nabla^2}\ell_{\mathbf{g_{eq}}}``
119+
120+
Note that retrieving optimal Hessians of Lagrangian are not fully supported yet. Their
121+
nonzero coefficients are random values for now.
122122
123123
# Examples
124124
```jldoctest

src/estimator/mhe/execute.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ For [`NonLinModel`](@ref), it also includes the following derivative fields:
9898
9999
- `:JE`: economic cost value at the optimum, ``J_E``
100100
- `:gc`: custom nonlinear constraints values at the optimum, ``\mathbf{g_c}``
101-
- `:∇J` or *`:nablaJ`* : gradient of the objective function, ``\mathbf{\nabla} J``
102-
- `:∇²J` or *`:nabla2J`* : Hessian of the objective function, ``\mathbf{\nabla^2}J``
103-
- `:∇g` or *`:nablag`* : Jacobian of the inequality constraint, ``\mathbf{\nabla g}``
104-
- `:∇²ℓg` or *`:nabla2lg`* : Hessian of the inequality Lagrangian, ``\mathbf{\nabla^2}\ell_{\mathbf{g}}``
101+
- `:∇J` or *`:nablaJ`* : optimal gradient of the objective function, ``\mathbf{\nabla} J``
102+
- `:∇²J` or *`:nabla2J`* : optimal Hessian of the objective function, ``\mathbf{\nabla^2}J``
103+
- `:∇g` or *`:nablag`* : optimal Jacobian of the inequality constraint, ``\mathbf{\nabla g}``
104+
- `:∇²ℓg` or *`:nabla2lg`* : optimal Hessian of the inequality Lagrangian, ``\mathbf{\nabla^2}\ell_{\mathbf{g}}``
105105
106-
Note that Hessian of Lagrangians are not fully supported yet. Their nonzero coefficients are
107-
random values for now.
106+
Note that retrieving optimal Hessians of Lagrangian are not fully supported yet. Their
107+
nonzero coefficients are random values for now.
108108
109109
# Examples
110110
```jldoctest

src/general.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const ALL_COLORING_ORDERS = (
1818

1919
const HIDDEN_GETINFO_KEYS_MHE = (
2020
:What, :xhatarr, :epsilon, :Xhat, :xhat, :Vhat, :Pbar, :xbar, :Yhat, :Yhatm, ,
21-
:nablaJ, :nabla2J, :nablag, :nabla2lg
21+
:nablaJ, :nabla2J, :nablag, :nabla2lg, :nablageq, :nabla2lgeq
2222
)
2323

2424
const HIDDEN_GETINFO_KEYS_MPC = (

0 commit comments

Comments
 (0)