Use the last release of NLPModelsTest.jl

Author: amontoison

Project.toml

@@ -16,10 +16,10 @@ JuMP = "1.25"
 LinearAlgebra = "1.10"
 MathOptInterface = "1.46"
 NLPModels = "0.21.6"
-NLPModelsTest = "0.10.5"
+NLPModelsTest = "0.10.6"
 Percival = "0.7.3"
 Printf = "1.10"
-SolverCore = "0.3"
+SolverCore = "0.3.9"
 SparseArrays = "1.10"
 Test = "1.10"
 julia = "1.10"

src/moi_nlp_model.jl

@@ -35,7 +35,7 @@ function nlp_model(moimodel::MOI.ModelLike; hessian::Bool = true, name::String =
     parser_MOI(moimodel, index_map, nvar)
 
   nlp_data = _nlp_block(moimodel)
-  nlcon, nl_lcon, nl_ucon = parser_NL(nlp_data, hessian = hessian)
+  nlcon = parser_NL(nlp_data, hessian = hessian)
   oracles = parser_oracles(moimodel)
   counters = Counters()
   λ = zeros(Float64, nlcon.nnln)  # Lagrange multipliers for hess_coord! and hprod! without y
@@ -49,8 +49,8 @@ function nlp_model(moimodel::MOI.ModelLike; hessian::Bool = true, name::String =
 
   # Total counts
   ncon = nlin + quadcon.nquad + nlcon.nnln + oracles.ncon
-  lcon = vcat(lin_lcon, quad_lcon, nl_lcon, oracles.lcon)
-  ucon = vcat(lin_ucon, quad_ucon, nl_ucon, oracles.ucon)
+  lcon = vcat(lin_lcon, quad_lcon, nlcon.nl_lcon, oracles.lcon)
+  ucon = vcat(lin_ucon, quad_ucon, nlcon.nl_ucon, oracles.ucon)
   nnzj = lincon.nnzj + quadcon.nnzj + nlcon.nnzj + oracles.nnzj
   nnzh = obj.nnzh + quadcon.nnzh + nlcon.nnzh + oracles.nnzh
   meta = NLPModelMeta(

src/moi_nls_model.jl

@@ -36,16 +36,16 @@ function MathOptNLSModel(cmodel::JuMP.Model, F; hessian::Bool = true, name::Stri
     parser_MOI(moimodel, index_map, nvar)
 
   nlp_data = _nlp_block(moimodel)
-  nlcon, nl_lcon, nl_ucon = parser_NL(nlp_data, hessian = hessian)
+  nlcon = parser_NL(nlp_data, hessian = hessian)
   λ = zeros(nlcon.nnln)  # Lagrange multipliers for hess_coord! and hprod! without y
 
   nequ = nlinequ + nnlnequ
   Fnnzj = linequ.nnzj + nlequ.nnzj
   Fnnzh = nlequ.nnzh
 
   ncon = nlin + quadcon.nquad + nlcon.nnln
-  lcon = vcat(lin_lcon, quad_lcon, nl_lcon)
-  ucon = vcat(lin_ucon, quad_ucon, nl_ucon)
+  lcon = vcat(lin_lcon, quad_lcon, nlcon.nl_lcon)
+  ucon = vcat(lin_ucon, quad_ucon, nlcon.nl_ucon)
   cnnzj = lincon.nnzj + quadcon.nnzj + nlcon.nnzj
   cnnzh = lls.nnzh + quadcon.nnzh + nlcon.nnzh
 

src/utils.jl

@@ -96,6 +96,8 @@ end
 
 Structure containing Jacobian and Hessian structures of nonlinear constraints:
 - nnln: number of nonlinear constraints
+- nl_lcon: lower bounds of nonlinear constraints
+- nl_ucon: upper bounds of nonlinear constraints
 - jac_rows: row indices of the Jacobian in Coordinate format (COO) format
 - jac_cols: column indices of the Jacobian in COO format
 - nnzj: number of non-zero entries in the Jacobian
@@ -105,6 +107,8 @@ Structure containing Jacobian and Hessian structures of nonlinear constraints:
 """
 mutable struct NonLinearStructure
   nnln::Int
+  nl_lcon::Vector{Float64}
+  nl_ucon::Vector{Float64}
   jac_rows::Vector{Int}
   jac_cols::Vector{Int}
   nnzj::Int
@@ -589,8 +593,6 @@ Parse nonlinear constraints of an `nlp_data`.
 
 Returns:
 - nlcon: NonLinearStructure containing Jacobian and Hessian structures
-- nl_lcon: lower bounds of nonlinear constraints
-- nl_ucon: upper bounds of nonlinear constraints
 """
 function parser_NL(nlp_data; hessian::Bool = true)
   nnln = length(nlp_data.constraint_bounds)
@@ -608,9 +610,9 @@ function parser_NL(nlp_data; hessian::Bool = true)
   hess_rows = hessian ? getindex.(hess, 1) : Int[]
   hess_cols = hessian ? getindex.(hess, 2) : Int[]
   nnzh = length(hess)
-  nlcon = NonLinearStructure(nnln, jac_rows, jac_cols, nnzj, hess_rows, hess_cols, nnzh)
+  nlcon = NonLinearStructure(nnln, nl_lcon, nl_ucon, jac_rows, jac_cols, nnzj, hess_rows, hess_cols, nnzh)
 
-  return nlcon, nl_lcon, nl_ucon
+  return nlcon
 end
 
 """
@@ -886,7 +888,7 @@ function parser_nonlinear_expression(cmodel, nvar, F; hessian::Bool = true)
   Fhess_cols = hessian && Feval ≠ nothing ? getindex.(Fhess, 2) : Int[]
   nl_Fnnzh = length(Fhess)
 
-  nlequ = NonLinearStructure(nnlnequ, Fjac_rows, Fjac_cols, nl_Fnnzj, Fhess_rows, Fhess_cols, nl_Fnnzh)
+  nlequ = NonLinearStructure(nnlnequ, Float64[], Float64[], Fjac_rows, Fjac_cols, nl_Fnnzj, Fhess_rows, Fhess_cols, nl_Fnnzh)
 
   return Feval, nlequ, nnlnequ
 end