Skip to content

Commit 591304b

Browse files
committed
Update qpmodel.jl
1 parent 460ec8c commit 591304b

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/qpmodel.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ end
361361

362362
linobj(qp::AbstractQuadraticModel, args...) = qp.data.c
363363

364-
function NLPModels.objgrad!(qp::QuadraticModel, x::AbstractVector, g::AbstractVector)
364+
function NLPModels.objgrad!(qp::AbstractQuadraticModel, x::AbstractVector, g::AbstractVector)
365365
NLPModels.increment!(qp, :neval_obj)
366366
NLPModels.increment!(qp, :neval_grad)
367367
if qp.meta.islp
@@ -375,7 +375,7 @@ function NLPModels.objgrad!(qp::QuadraticModel, x::AbstractVector, g::AbstractVe
375375
return f, g
376376
end
377377

378-
function NLPModels.obj(qp::QuadraticModel, x::AbstractVector)
378+
function NLPModels.obj(qp::AbstractQuadraticModel, x::AbstractVector)
379379
NLPModels.increment!(qp, :neval_obj)
380380
if qp.meta.islp
381381
f = qp.data.c0 + dot(qp.data.c, x)
@@ -386,7 +386,7 @@ function NLPModels.obj(qp::QuadraticModel, x::AbstractVector)
386386
return f
387387
end
388388

389-
function NLPModels.grad!(qp::QuadraticModel, x::AbstractVector, g::AbstractVector)
389+
function NLPModels.grad!(qp::AbstractQuadraticModel, x::AbstractVector, g::AbstractVector)
390390
NLPModels.increment!(qp, :neval_grad)
391391
if qp.meta.islp
392392
g .= qp.data.c
@@ -409,7 +409,7 @@ function fill_structure!(S::SparseMatrixCSC, rows, cols)
409409
end
410410

411411
function NLPModels.hess_structure!(
412-
qp::QuadraticModel{T, S, M1},
412+
qp::AbstractQuadraticModel{T, S, M1},
413413
rows::AbstractVector{<:Integer},
414414
cols::AbstractVector{<:Integer},
415415
) where {T, S, M1 <: SparseMatrixCOO}
@@ -421,7 +421,7 @@ function NLPModels.hess_structure!(
421421
end
422422

423423
function NLPModels.hess_structure!(
424-
qp::QuadraticModel{T, S, M1},
424+
qp::AbstractQuadraticModel{T, S, M1},
425425
rows::AbstractVector{<:Integer},
426426
cols::AbstractVector{<:Integer},
427427
) where {T, S, M1 <: SparseMatrixCSC}
@@ -432,7 +432,7 @@ function NLPModels.hess_structure!(
432432
end
433433

434434
function NLPModels.hess_structure!(
435-
qp::QuadraticModel{T, S, M1},
435+
qp::AbstractQuadraticModel{T, S, M1},
436436
rows::AbstractVector{<:Integer},
437437
cols::AbstractVector{<:Integer},
438438
) where {T, S, M1 <: Matrix}
@@ -458,7 +458,7 @@ function fill_coord!(S::SparseMatrixCSC, vals, obj_weight)
458458
end
459459

460460
function NLPModels.hess_coord!(
461-
qp::QuadraticModel{T, S, M1},
461+
qp::AbstractQuadraticModel{T, S, M1},
462462
x::AbstractVector{T},
463463
vals::AbstractVector{T};
464464
obj_weight::Real = one(eltype(x)),
@@ -471,7 +471,7 @@ function NLPModels.hess_coord!(
471471
end
472472

473473
function NLPModels.hess_coord!(
474-
qp::QuadraticModel{T, S, M1},
474+
qp::AbstractQuadraticModel{T, S, M1},
475475
x::AbstractVector{T},
476476
vals::AbstractVector{T};
477477
obj_weight::Real = one(eltype(x)),
@@ -484,7 +484,7 @@ function NLPModels.hess_coord!(
484484
end
485485

486486
function NLPModels.hess_coord!(
487-
qp::QuadraticModel{T, S, M1},
487+
qp::AbstractQuadraticModel{T, S, M1},
488488
x::AbstractVector{T},
489489
vals::AbstractVector{T};
490490
obj_weight::Real = one(eltype(x)),
@@ -511,7 +511,7 @@ NLPModels.hess_coord!(
511511
) = hess_coord!(qp, x, vals, obj_weight = obj_weight)
512512

513513
function NLPModels.jac_lin_structure!(
514-
qp::QuadraticModel{T, S, M1, M2},
514+
qp::AbstractQuadraticModell{T, S, M1, M2},
515515
rows::AbstractVector{<:Integer},
516516
cols::AbstractVector{<:Integer},
517517
) where {T, S, M1, M2 <: SparseMatrixCOO}
@@ -608,7 +608,7 @@ function NLPModels.cons_lin!(qp::AbstractQuadraticModel, x::AbstractVector, c::A
608608
end
609609

610610
function NLPModels.hprod!(
611-
qp::QuadraticModel,
611+
qp::AbstractQuadraticModel,
612612
x::AbstractVector,
613613
v::AbstractVector,
614614
Hv::AbstractVector;

0 commit comments

Comments
 (0)