@lencheck macro

src/moi_nlp_model.jl

@@ -107,12 +107,20 @@ end
 
 function NLPModels.cons_lin!(nlp::MathOptNLPModel, x::AbstractVector, c::AbstractVector)
   increment!(nlp, :neval_cons_lin)
+  NLPModels.@lencheck nlp.meta.nvar x
+  if length(c) < nlp.meta.nlin
+    throw(ArgumentError("length(c) = $(length(c)) but expected at least $(nlp.meta.nlin)"))
+  end
   coo_prod!(nlp.lincon.jacobian.rows, nlp.lincon.jacobian.cols, nlp.lincon.jacobian.vals, x, c)
   return c
 end
 
 function NLPModels.cons_nln!(nlp::MathOptNLPModel, x::AbstractVector, c::AbstractVector)
   increment!(nlp, :neval_cons_nln)
+  NLPModels.@lencheck nlp.meta.nvar x
+  if length(c) < nlp.meta.nnln
+    throw(ArgumentError("length(c) = $(length(c)) but expected at least $(nlp.meta.nnln)"))
+  end
   if nlp.quadcon.nquad > 0
     for i = 1:(nlp.quadcon.nquad)
       qcon = nlp.quadcon.constraints[i]
@@ -127,6 +135,10 @@ end
 
 function NLPModels.cons!(nlp::MathOptNLPModel, x::AbstractVector, c::AbstractVector)
   increment!(nlp, :neval_cons)
+  NLPModels.@lencheck nlp.meta.nvar x
+  if length(c) < nlp.meta.ncon
+    throw(ArgumentError("length(c) = $(length(c)) but expected at least $(nlp.meta.ncon)"))
+  end
   if nlp.meta.nlin > 0
     coo_prod!(nlp.lincon.jacobian.rows, nlp.lincon.jacobian.cols, nlp.lincon.jacobian.vals, x, c)
   end

src/moi_nls_model.jl

@@ -86,6 +86,8 @@ end
 
 function NLPModels.residual!(nls::MathOptNLSModel, x::AbstractVector, Fx::AbstractVector)
   increment!(nls, :neval_residual)
+  NLPModels.@lencheck nls.meta.nvar x
+  NLPModels.@lencheck nls.nls_meta.nequ Fx
   if nls.nls_meta.nlin > 0
     coo_prod!(
       nls.linequ.jacobian.rows,
@@ -253,12 +255,28 @@ end
 
 function NLPModels.cons_lin!(nls::MathOptNLSModel, x::AbstractVector, c::AbstractVector)
   increment!(nls, :neval_cons_lin)
-  coo_prod!(nls.lincon.jacobian.rows, nls.lincon.jacobian.cols, nls.lincon.jacobian.vals, x, c)
+  NLPModels.@lencheck nls.meta.nvar x
+  if (nls.nls_meta.nlin > 0) && (length(c) >= nls.nls_meta.nlin)
+    coo_prod!(nls.linequ.jacobian.rows, nls.linequ.jacobian.cols, nls.linequ.jacobian.vals, x, c)
+    if !isempty(nls.linequ.constants)
+      view(c, 1:length(nls.linequ.constants)) .+= nls.linequ.constants
+    end
+    return c
+  elseif length(c) >= nls.meta.nlin
+    coo_prod!(nls.lincon.jacobian.rows, nls.lincon.jacobian.cols, nls.lincon.jacobian.vals, x, c)
+    return c
+  else
+    throw(ArgumentError("length(c) = $(length(c)) but expected at least $(min(nls.nls_meta.nlin, nls.meta.nlin))"))
+  end
   return c
 end
 
 function NLPModels.cons_nln!(nls::MathOptNLSModel, x::AbstractVector, c::AbstractVector)
   increment!(nls, :neval_cons_nln)
+  NLPModels.@lencheck nls.meta.nvar x
+  if length(c) < nls.meta.nnln
+    throw(ArgumentError("length(c) = $(length(c)) but expected at least $(nls.meta.nnln)"))
+  end
   if nls.quadcon.nquad > 0
     for i = 1:(nls.quadcon.nquad)
       qcon = nls.quadcon.constraints[i]
@@ -273,6 +291,10 @@ end
 
 function NLPModels.cons!(nls::MathOptNLSModel, x::AbstractVector, c::AbstractVector)
   increment!(nls, :neval_cons)
+  NLPModels.@lencheck nls.meta.nvar x
+  if length(c) < nls.meta.ncon
+    throw(ArgumentError("length(c) = $(length(c)) but expected at least $(nls.meta.ncon)"))
+  end
   if nls.meta.nlin > 0
     coo_prod!(nls.lincon.jacobian.rows, nls.lincon.jacobian.cols, nls.lincon.jacobian.vals, x, c)
   end

test/lencheck.jl

@@ -0,0 +1,9 @@
+using Test
+using NLPModelsJuMP
+
+@testset "lencheck macro" begin
+  x = [1, 2, 3]
+  NLPModels.@lencheck 3 x
+  y = [1, 2]
+  @test_throws ArgumentError NLPModels.@lencheck 3 y
+end