A few fixes

Author: amontoison

src/moi_nlp_model.jl

@@ -138,7 +138,7 @@ function NLPModels.cons!(nlp::MathOptNLPModel, x::AbstractVector, c::AbstractVec
       end
     end
     if nlp.meta.nnln > nlp.quadcon.nquad
-      MOI.eval_constraint(nlp.eval, view(c, (nlp.meta.nlin + nlp.quadcon.nquad + 1):(nlp.meta.nlin + nlp.meta.nnln)), x)
+      MOI.eval_constraint(nlp.eval, view(c, (nlp.meta.nlin + nlp.quadcon.nquad + 1):(nlp.meta.ncon), x)
     end
   end
   return c
@@ -192,14 +192,14 @@ function NLPModels.jac_structure!(
       for i = 1:(nlp.quadcon.nquad)
         qcon = nlp.quadcon.constraints[i]
         ind_quad = (nlp.lincon.nnzj + index + 1):(nlp.lincon.nnzj + index + qcon.nnzg)
-        view(rows, ind_quad) .= i
+        view(rows, ind_quad) .= nlp.meta.nlin .+ i
         view(cols, ind_quad) .= qcon.g
         index += qcon.nnzg
       end
     end
     if nlp.meta.nnln > nlp.quadcon.nquad
-      ind_nnln = (nlp.lincon.nnzj + nlp.quadcon.nnzj + 1):(nlp.lincon.nnzj + nlp.quadcon.nnzj + nlp.nlcon.nnzj)
-      view(rows, ind_nnln) .= nlp.quadcon.nquad .+ nlp.nlcon.jac_rows
+      ind_nnln = (nlp.lincon.nnzj + nlp.quadcon.nnzj + 1):(nlp.meta.nnzj)
+      view(rows, ind_nnln) .= nlp.meta.nlin .+ nlp.quadcon.nquad .+ nlp.nlcon.jac_rows
       view(cols, ind_nnln) .= nlp.nlcon.jac_cols
     end
   end
@@ -275,7 +275,7 @@ function NLPModels.jac_coord!(nlp::MathOptNLPModel, x::AbstractVector, vals::Abs
       end
     end
     if nlp.meta.nnln > nlp.quadcon.nquad
-      ind_nnln = (nlp.lincon.nnzj + nlp.quadcon.nnzj + 1):(nlp.lincon.nnzj + nlp.quadcon.nnzj + nlp.nlcon.nnzj)
+      ind_nnln = (nlp.lincon.nnzj + nlp.quadcon.nnzj + 1):(nlp.meta.nnzj)
       MOI.eval_constraint_jacobian(nlp.eval, view(vals, ind_nnln), x)
     end
   end
@@ -306,16 +306,41 @@ function NLPModels.jprod_nln!(
   Jv::AbstractVector,
 )
   increment!(nlp, :neval_jprod_nln)
-  if nlp.meta.nnln > nlp.quadcon.nquad
-    ind_nnln = (nlp.quadcon.nquad + 1):(nlp.meta.nnln)
-    MOI.eval_constraint_jacobian_product(nlp.eval, view(Jv, ind_nnln), x, v)
-  end
-  (nlp.meta.nnln == nlp.quadcon.nquad) && (Jv .= 0.0)
   if nlp.quadcon.nquad > 0
     for i = 1:(nlp.quadcon.nquad)
       # Jv[i] = (Aᵢ * x + bᵢ)ᵀ * v
       qcon = nlp.quadcon.constraints[i]
-      Jv[i] += coo_sym_dot(qcon.A.rows, qcon.A.cols, qcon.A.vals, x, v) + dot(qcon.b, v)
+      Jv[i] = coo_sym_dot(qcon.A.rows, qcon.A.cols, qcon.A.vals, x, v) + dot(qcon.b, v)
+    end
+  end
+  if nlp.meta.nnln > nlp.quadcon.nquad
+    ind_nnln = (nlp.quadcon.nquad + 1):(nlp.meta.nnln)
+    MOI.eval_constraint_jacobian_product(nlp.eval, view(Jv, ind_nnln), x, v)
+  end
+  return Jv
+end
+
+function NLPModels.jprod!(
+  nlp::MathOptNLPModel,
+  x::AbstractVector,
+  v::AbstractVector,
+  Jv::AbstractVector,
+)
+  increment!(nlp, :neval_jprod)
+  if nlp.meta.nlin > 0
+    jprod_lin!(nlp, nlp.lincon.jacobian.rows, nlp.lincon.jacobian.cols, nlp.lincon.jacobian.vals, v, Jv)
+  end
+  if nlp.meta.nnln > 0
+    if nlp.quadcon.nquad > 0
+      for i = (nlp.meta.nlin + 1):(nlp.meta.nlin + nlp.quadcon.nquad)
+        # Jv[i] = (Aᵢ * x + bᵢ)ᵀ * v
+        qcon = nlp.quadcon.constraints[i]
+        Jv[i] = coo_sym_dot(qcon.A.rows, qcon.A.cols, qcon.A.vals, x, v) + dot(qcon.b, v)
+      end
+    end
+    if nlp.meta.nnln > nlp.quadcon.nquad
+      ind_nnln = (nlp.meta.nlin + nlp.quadcon.nquad + 1):(nlp.meta.ncon)
+      MOI.eval_constraint_jacobian_product(nlp.eval, view(Jv, ind_nnln), x, v)
     end
   end
   return Jv