Skip to content

Commit 1e0a417

Browse files
committed
Fix a few typos.
1 parent 392ee0e commit 1e0a417

6 files changed

Lines changed: 27 additions & 22 deletions

src/documentation_glossary.jl

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -427,16 +427,16 @@ define!(
427427
:Variable,
428428
:grad_f,
429429
:description,
430-
(; M = "M", p = "p") ->
431-
"the (Riemannian) gradient ``$(_tex(:grad))f: $(_math(:M, M = M))$(_math(:TpM; M = M, p = p))`` of f as a function `(M, p) -> X` or a function `(M, X, p) -> X` computing `X` in-place",
430+
(; M = "M", p = "p", f="f", kwargs...) ->
431+
"the (Riemannian) gradient ``$(_tex(:grad))$f: $(_math(:M, M = M))$(_math(:TpM; M = M, p = p))`` of $f as a function `(M, p) -> X` or a function `(M, X, p) -> X` computing `X` in-place",
432432
)
433433

434434
define!(
435435
:Variable,
436436
:Hess_f,
437437
:description,
438-
(; M = "M", p = "p") ->
439-
"the (Riemannian) Hessian ``$(_tex(:Hess))f: $(_math(:TpM, M = M, p = p))$(_math(:TpM; M = M, p = p))`` of f as a function `(M, p, X) -> Y` or a function `(M, Y, p, X) -> Y` computing `Y` in-place",
438+
(; M = "M", p = "p", f="f") ->
439+
"the (Riemannian) Hessian ``$(_tex(:Hess))$f: $(_math(:TpM, M = M, p = p))$(_math(:TpM; M = M, p = p))`` of $f as a function `(M, p, X) -> Y` or a function `(M, Y, p, X) -> Y` computing `Y` in-place",
440440
)
441441

442442
define!(
@@ -542,19 +542,10 @@ define!(
542542
:Variable,
543543
:subgrad_f,
544544
:description,
545-
(; M = "M", p = "p") -> """
546-
the subgradient ``∂f: $(_math(:M; M = M))$(_math(:TM; M = M))`` of f as a function `(M, p) -> X`
547-
or a function `(M, X, p) -> X` computing `X` in-place.
548-
This function should always only return one element from the subgradient.
545+
(; M = "M", p = "p", f="f", kwargs...) -> """
546+
the subgradient ``∂$f: $(_math(:M; M = M))$(_math(:TM; M = M))`` of ``$f`` as a function `(M, p) -> X` or a function `(M, X, p) -> X` computing `X` in-place. This function should always only return one element from the subgradient.
549547
""",
550548
)
551-
define!(
552-
:Variable,
553-
:subgrad_f,
554-
:description,
555-
(; M = "M") ->
556-
" a state to specify the sub solver to use. For a closed form solution, this indicates the type of function.",
557-
)
558549

559550
define!(
560551
:Variable,

src/solvers/DouglasRachford.jl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ _doc_Douglas_Rachford = """
147147
DouglasRachford!(M, f, proxes_f, p)
148148
DouglasRachford!(M, mpo, p)
149149
150-
Compute the Douglas-Rachford algorithm on the manifold ``$(_math(:M))``, starting from `p``
151-
given the (two) proximal maps `proxes_f`, see [ BergmannPerschSteidl:2016](@cite).
150+
Compute the Douglas-Rachford algorithm on the manifold ``$(_math(:M))``, starting from `p`
151+
given the (two) proximal maps `proxes_f`, see [BergmannPerschSteidl:2016](@cite).
152152
153153
For ``k>2`` proximal maps, the problem is reformulated using the parallel Douglas Rachford:
154154
a vectorial proximal map on the power manifold ``$(_math(:M))^k`` is introduced as the first
@@ -157,10 +157,9 @@ This hence also boils down to two proximal maps, though each evaluates proximal
157157
that is, component wise in a vector.
158158
159159
!!! note
160-
161-
The parallel Douglas Rachford does not work in-place for now, since
162-
while creating the new staring point `p'` on the power manifold, a copy of `p`
163-
Is created
160+
The parallel Douglas Rachford does not work in-place for now, since
161+
while creating the new staring point `p'` on the power manifold, a copy of `p`
162+
Is created
164163
165164
If you provide a [`ManifoldProximalMapObjective`](@ref) `mpo` instead, the proximal maps are kept unchanged.
166165

src/solvers/difference_of_convex_algorithm.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@ Then repeat for ``k=0,1,…``
131131
132132
until the stopping criterion (see the `stopping_criterion` keyword is fulfilled.
133133
134+
# Input
135+
136+
$(_var(:Argument, :M; type = true))
137+
$(_var(:Argument, :f; add = "total cost function `f = g - h`"))
138+
* `g`: the smooth part ``g``of the cost function
139+
$(_var(:Argument, :subgrad_f, "∂h"; f="h"))
140+
$(_var(:Argument, :p))
141+
134142
# Keyword arguments
135143
136144
$(_var(:Keyword, :evaluation))

src/solvers/difference_of_convex_proximal_point.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,12 @@ See [AlmeidaNetoOliveiraSouza:2020](@cite) for more details on the modified vari
186186
where steps 4-6 are slightly changed, since here the classical proximal point method for
187187
DC functions is obtained for ``s_k = 1`` and one can hence employ usual line search method.
188188
189+
# Input
190+
191+
$(_var(:Argument, :M; type = true))
192+
$(_var(:Argument, :f; add = "total cost function `f = g - h`"))
193+
$(_var(:Argument, :grad_f, "grad_h"; f="h"))
194+
$(_var(:Argument, :p))
189195
190196
# Keyword arguments
191197

src/solvers/proximal_gradient_method.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $(_var(:Argument, :M; type = true))
3535
$(_var(:Argument, :f; add = "total cost function `f = g + h`"))
3636
* `g`: the smooth part of the cost function
3737
* `grad_g`: a gradient `(M,p) -> X` or `(M, X, p) -> X` of the smooth part ``g`` of the problem
38+
$(_var(:Argument, :p))
3839
3940
# Keyword Arguments
4041

src/solvers/subgradient.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ For more details see [FerreiraOliveira:1998](@cite).
102102
103103
$(_var(:Argument, :M; type = true))
104104
$(_var(:Argument, :f))
105-
* `∂f`: the (sub)gradient ``∂ f: $(_math(:M)) → T$(_math(:M))`` of f
105+
* `∂f`: the (sub)gradient ``∂ f: $(_math(:M)) → T$(_math(:M))`` of ``f``
106106
$(_var(:Argument, :p))
107107
108108
alternatively to `f` and `∂f` a [`ManifoldSubgradientObjective`](@ref) `sgo` can be provided.

0 commit comments

Comments
 (0)