remove mentions of ProximableFunction

Author: dpo

src/Fista_alg.jl

@@ -41,10 +41,10 @@ end
 function FISTA(
   f::F,
   ∇f!::G,
-  h::ProximableFunction,
+  h::H,
   options::ROSolverOptions,
   x0::AbstractVector,
-) where {F <: Function, G <: Function}
+) where {F <: Function, G <: Function, H}
   start_time = time()
   elapsed_time = 0.0
   ϵ = options.ϵ

src/LMTR_alg.jl

@@ -20,8 +20,8 @@ where F(x) and J(x) are the residual and its Jacobian at x, respectively, ψ(s;
 ### Arguments
 
 * `nls::AbstractNLSModel`: a smooth nonlinear least-squares problem
-* `h::ProximableFunction`: a regularizer
-* `χ::ProximableFunction`: a norm used to define the trust region
+* `h`: a regularizer such as those defined in ProximalOperators
+* `χ`: a norm used to define the trust region in the form of a regularizer
 * `options::ROSolverOptions`: a structure containing algorithmic parameters
 
 ### Keyword arguments
@@ -40,14 +40,14 @@ where F(x) and J(x) are the residual and its Jacobian at x, respectively, ψ(s;
 """
 function LMTR(
   nls::AbstractNLSModel,
-  h::ProximableFunction,
-  χ::ProximableFunction,
+  h::H,
+  χ::X,
   options::ROSolverOptions;
   x0::AbstractVector = nls.meta.x0,
   subsolver_logger::Logging.AbstractLogger = Logging.NullLogger(),
   subsolver = R2,
   subsolver_options = ROSolverOptions(),
-)
+) where {H, X}
   start_time = time()
   elapsed_time = 0.0
   # initialize passed options

src/LM_alg.jl

@@ -20,7 +20,7 @@ and σ > 0 is a regularization parameter.
 ### Arguments
 
 * `nls::AbstractNLSModel`: a smooth nonlinear least-squares problem
-* `h::ProximableFunction`: a regularizer
+* `h`: a regularizer such as those defined in ProximalOperators
 * `options::ROSolverOptions`: a structure containing algorithmic parameters
 
 ### Keyword arguments
@@ -39,13 +39,13 @@ and σ > 0 is a regularization parameter.
 """
 function LM(
   nls::AbstractNLSModel,
-  h::ProximableFunction,
+  h::H,
   options::ROSolverOptions;
   x0::AbstractVector = nls.meta.x0,
   subsolver_logger::Logging.AbstractLogger = Logging.NullLogger(),
   subsolver = R2,
   subsolver_options = ROSolverOptions(),
-)
+) where H
   start_time = time()
   elapsed_time = 0.0
   # initialize passed options

src/PG_alg.jl

@@ -42,10 +42,10 @@ end
 function PG(
   f::F,
   ∇f!::G,
-  h::ProximableFunction,
+  h::H,
   options::ROSolverOptions,
   x0::AbstractVector,
-) where {F <: Function, G <: Function}
+) where {F <: Function, G <: Function, H}
   start_time = time()
   elapsed_time = 0.0
   ϵ = options.ϵ

src/R2_alg.jl

@@ -21,7 +21,7 @@ where φ(s ; xₖ) = f(xₖ) + ∇f(xₖ)ᵀs is the Taylor linear approximation
 ### Arguments
 
 * `nlp::AbstractNLPModel`: a smooth optimization problem
-* `h::ProximableFunction`: a regularizer
+* `h`: a regularizer such as those defined in ProximalOperators
 * `options::ROSolverOptions`: a structure containing algorithmic parameters
 * `x0::AbstractVector`: an initial guess (in the second calling form)
 
@@ -68,10 +68,10 @@ end
 function R2(
   f::F,
   ∇f!::G,
-  h::ProximableFunction,
+  h::H,
   options::ROSolverOptions,
   x0::AbstractVector,
-) where {F <: Function, G <: Function}
+) where {F <: Function, G <: Function, H}
   start_time = time()
   elapsed_time = 0.0
   ϵ = options.ϵ

src/TR_alg.jl

@@ -22,8 +22,8 @@ method or the quadratic regularization method.
 ### Arguments
 
 * `nlp::AbstractNLPModel`: a smooth optimization problem
-* `h::ProximableFunction`: a regularizer
-* `χ::ProximableFunction`: a norm used to define the trust region
+* `h`: a regularizer such as those defined in ProximalOperators
+* `χ`: a norm used to define the trust region in the form of a regularizer
 * `options::ROSolverOptions`: a structure containing algorithmic parameters
 
 The objective, gradient and Hessian of `nlp` will be accessed.
@@ -45,14 +45,14 @@ The Hessian is accessed as an abstract operator and need not be the exact Hessia
 """
 function TR(
   f::AbstractNLPModel,
-  h::ProximableFunction,
-  χ::ProximableFunction,
+  h::H,
+  χ::X,
   options::ROSolverOptions;
   x0::AbstractVector = f.meta.x0,
   subsolver_logger::Logging.AbstractLogger = Logging.NullLogger(),
   subsolver = R2,
   subsolver_options = ROSolverOptions(),
-)
+) where {H, X}
   start_time = time()
   elapsed_time = 0.0
   # initialize passed options