Skip to content

Commit 24506c8

Browse files
rename engine related functions
1 parent d30a609 commit 24506c8

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

ext/SEMNLOptExt/NLopt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ end
109109

110110
SEM.SemOptimizer(::Val{:NLopt}, args...; kwargs...) = SemOptimizerNLopt(args...; kwargs...)
111111

112-
SEM.engine_info(engine::Val{:NLopt}) = doc(SemOptimizerNLopt)
112+
SEM.optimizer_engine_doc(engine::Val{:NLopt}) = doc(SemOptimizerNLopt)
113113

114114
############################################################################################
115115
### Recommended methods

ext/SEMProximalOptExt/ProximalAlgorithms.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ end
99

1010
SEM.SemOptimizer{:Proximal}(args...; kwargs...) = SemOptimizerProximal(args...; kwargs...)
1111

12-
SEM.engine_info(engine::Val{:Proximal}) = doc(SemOptimizerProximal)
12+
SEM.optimizer_engine_doc(engine::Val{:Proximal}) = doc(SemOptimizerProximal)
1313

1414
"""
1515
Connects to `ProximalAlgorithms.jl` as the optimization backend. For more information on

src/StructuralEquationModels.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export AbstractSem,
124124
SemWLS,
125125
loss,
126126
SemOptimizer,
127-
engine_info,
127+
optimizer_engine_doc,
128128
optimizer_engines,
129129
optimizer,
130130
n_iterations,

src/frontend/fit/SemFit.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function Base.show(io::IO, semfit::SemFit)
4141
print(io, "------------- Optimization result ------------- \n")
4242
print(io, "\n")
4343
print(io, "engine: ")
44-
print(io, engine(semfit))
44+
print(io, optimizer_engine(semfit))
4545
print(io, "\n")
4646
print(io, "\n")
4747
print(io, semfit.optimization_result)
@@ -63,7 +63,7 @@ model(sem_fit::SemFit) = sem_fit.model
6363
optimization_result(sem_fit::SemFit) = sem_fit.optimization_result
6464

6565
# optimizer properties
66-
engine(sem_fit::SemFit) = engine(sem_fit.optimizer)
66+
optimizer_engine(sem_fit::SemFit) = optimizer_engine(sem_fit.optimizer)
6767
optimizer(sem_fit::SemFit) = optimizer(optimization_result(sem_fit))
6868
n_iterations(sem_fit::SemFit) = n_iterations(optimization_result(sem_fit))
6969
convergence(sem_fit::SemFit) = convergence(optimization_result(sem_fit))

src/optimizer/Empty.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct SemOptimizerEmpty <: SemOptimizer{:Empty} end
1414

1515
SemOptimizer(::Val{:Empty}) = SemOptimizerEmpty()
1616

17-
engine_info(engine::Val{:Empty}) = doc(SemOptimizerEmpty)
17+
optimizer_engine_doc(engine::Val{:Empty}) = doc(SemOptimizerEmpty)
1818

1919
############################################################################################
2020
### Recommended methods

src/optimizer/abstract.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
engine(::Type{<:SemOptimizer{E}}) where {E} = E
2-
engine(::SemOptimizer{E}) where {E} = E
1+
optimizer_engine(::Type{<:SemOptimizer{E}}) where {E} = E
2+
optimizer_engine(::SemOptimizer{E}) where {E} = E
33

44
"""
55
SemOptimizer(args...; engine::Symbol = :Optim, kwargs...)
@@ -9,7 +9,7 @@ of the numerical optimization involved in fitting a SEM.
99
1010
The keyword `engine` controlls which Julia package is used, with `:Optim` being the default.
1111
- `optimizer_engines()` prints a list of currently available engines.
12-
- `engine_info(EngineName)` prints information on the usage of a specific engine.
12+
- `optimizer_engine_doc(EngineName)` prints information on the usage of a specific engine.
1313
1414
More engines become available if specific packages are loaded, for example
1515
[*NLopt.jl*](https://github.com/JuliaOpt/NLopt.jl) (also see [Constrained optimization](@ref)
@@ -19,7 +19,7 @@ in the online documentation) or
1919
2020
The additional arguments `args...` and `kwargs...` are engine-specific and control further
2121
aspects of the optimization process, such as the algorithm, convergence criteria or constraints.
22-
Information on those can be accessed with `engine_info`.
22+
Information on those can be accessed with `optimizer_engine_doc`.
2323
2424
To connect the SEM package to a completely new optimization backend, you can implement a new
2525
subtype of SemOptimizer.
@@ -51,17 +51,17 @@ the [`SemOptimizer`](@ref) constructor.
5151
The list of engines depends on the Julia packages loaded (with the `using` directive)
5252
into the current session.
5353
"""
54-
optimizer_engines() = Symbol[engine(opt_type) for opt_type in subtypes(SemOptimizer)]
54+
optimizer_engines() = Symbol[optimizer_engine(opt_type) for opt_type in subtypes(SemOptimizer)]
5555

5656
"""
57-
engine_info(engine::Symbol)
57+
optimizer_engine_doc(engine::Symbol)
5858
5959
Shows information on the optimizer engine.
6060
For a list of available engines, call `optimizer_engines`.
6161
"""
62-
engine_info(engine) = engine_info(Val(engine))
62+
optimizer_engine_doc(engine) = optimizer_engine_doc(Val(engine))
6363

64-
engine_info(engine::Val) =
64+
optimizer_engine_doc(engine::Val) =
6565
throw(ArgumentError("Unknown engine. Did you forget to load the necessary packages?"))
6666

6767
"""

src/optimizer/optim.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ SemOptimizerOptim(;
6161

6262
SemOptimizer(::Val{:Optim}, args...; kwargs...) = SemOptimizerOptim(args...; kwargs...)
6363

64-
SEM.engine_info(engine::Val{:Optim}) = doc(SemOptimizerOptim)
64+
SEM.optimizer_engine_doc(engine::Val{:Optim}) = doc(SemOptimizerOptim)
6565

6666
############################################################################################
6767
### Recommended methods

0 commit comments

Comments
 (0)