update demos

Author: dpo

examples/Project.toml

@@ -12,7 +12,7 @@ RegularizedProblems = "ea076b23-609f-44d2-bb12-a4ae45328278"
 ADNLPModels = "0.7"
 DifferentialEquations = "7"
 NLPModels = "0.19, 0.20"
-NLPModelsModifiers = "0.6"
+NLPModelsModifiers = "0.7"
 PGFPlots = "^3.4"
 ProximalOperators = "0.15"
 RegularizedOptimization = "0.1"

examples/demo-bpdn-constr.jl

@@ -15,13 +15,10 @@ function demo_solver(f, nls, sol, h, χ, suffix = "l0-linf")
     ϵa = 1e-6,
     ϵr = 1e-6,
     verbose = 10,
-    spectral = false,
-    psb = true,
   )
 
   @info " using TR to solve with" h χ
-  reset!(f)
-  TR_out = TR(f, h, χ, options, x0 = f.meta.x0)
+  TR_out = TR(LSR1Model(f), h, χ, options, x0 = f.meta.x0)
   @info "TR relative error" norm(TR_out.solution - sol) / norm(sol)
   plot_bpdn(TR_out, sol, "constr-tr-r2-$(suffix)")
 
@@ -32,8 +29,7 @@ function demo_solver(f, nls, sol, h, χ, suffix = "l0-linf")
   plot_bpdn(R2_out, sol, "constr-r2-$(suffix)")
 
   @info " using TRDH to solve with" h χ
-  reset!(f)
-  TRDH_out = TRDH(f, h, χ, options, x0 = f.meta.x0)
+  TRDH_out = TRDH(DiagonalPSBModel(f), h, χ, options, x0 = f.meta.x0)
   @info "TRDH relative error" norm(TRDH_out.solution - sol) / norm(sol)
   # plot_bpdn(TRDH_out, sol, "constr-trdh-$(suffix)")
 
@@ -52,11 +48,10 @@ end
 
 function demo_bpdn_constr(compound = 1)
   model, nls_model, sol = bpdn_model(compound, bounds = true)
-  f = LSR1Model(model)
   λ = norm(grad(model, zeros(model.meta.nvar)), Inf) / 10
-  demo_solver(f, nls_model, sol, NormL0(λ), NormLinf(1.0))
+  demo_solver(model, nls_model, sol, NormL0(λ), NormLinf(1.0))
   λ = norm(grad(model, zeros(model.meta.nvar)), Inf) / 3
-  demo_solver(f, nls_model, sol, NormL1(λ), NormLinf(1.0), "l1-linf")
+  demo_solver(model, nls_model, sol, NormL1(λ), NormLinf(1.0), "l1-linf")
 end
 
 demo_bpdn_constr()

examples/demo-nnmf-constr.jl

@@ -16,23 +16,21 @@ function demo_solver(f, h, χ, selected, Avec, m, n, k, suffix = "l0-linf")
     ϵr = 1e-6,
     verbose = 10,
     maxIter = 500,
-    spectral = true,
   )
   @info " using TR to solve with" h χ
-  reset!(f)
-  TR_out = TR(f, h, χ, options, selected = selected)
+  TR_out = TR(LSR1Model(f), h, χ, options, selected = selected)
   plot_nnmf(TR_out, Avec, m, n, k, "tr-r2-$suffix")
 
   @info " using R2 to solve with" h
   reset!(f)
   R2_out = R2(f, h, options, selected = selected)
   plot_nnmf(R2_out, Avec, m, n, k, "r2-$suffix")
 
-  subsolver_options = ROSolverOptions(spectral = false, psb = true, ϵa = options.ϵa)
+  subsolver_options = ROSolverOptions(ϵa = options.ϵa)
   @info " using TR with TRDH as subproblem to solve with" h χ
   reset!(f)
   TR2_out = TR(
-    f,
+    LSR1Model(f),
     h,
     χ,
     options,
@@ -43,19 +41,17 @@ function demo_solver(f, h, χ, selected, Avec, m, n, k, suffix = "l0-linf")
   plot_nnmf(TR2_out, Avec, m, n, k, "tr-trdh-$suffix")
 
   @info " using TRDH to solve with" h χ
-  reset!(f)
-  TRDH_out = TRDH(f, h, χ, options, selected = selected)
+  TRDH_out = TRDH(DiagonalPSBModel(f), h, χ, options, selected = selected)
   plot_nnmf(TRDH_out, Avec, m, n, k, "trdh-$suffix")
 end
 
 function demo_nnmf()
   m, n, k = 100, 50, 5
   model, nls_model, A, selected = nnmf_model(m, n, k)
-  f = LSR1Model(model)
   λ = norm(grad(model, rand(model.meta.nvar)), Inf) / 200
-  demo_solver(f, NormL0(λ), NormLinf(1.0), selected, A, m, n, k, "l0-linf")
+  demo_solver(model, NormL0(λ), NormLinf(1.0), selected, A, m, n, k, "l0-linf")
   λ = norm(grad(model, rand(model.meta.nvar)), Inf) / 100000
-  demo_solver(f, NormL1(λ), NormLinf(1.0), selected, A, m, n, k, "l1-linf")
+  demo_solver(model, NormL1(λ), NormLinf(1.0), selected, A, m, n, k, "l1-linf")
 end
 
 demo_nnmf()