Skip to content

Implement MOI.Utilities.scalar_type for (Matrix|Sparse)VectorAffineFunction #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Implement MOI.Utilities.scalar_type for (Matrix|Sparse)VectorAffineFunction #264

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c53d3ab
Implement MOI.Utilities.scalar_type for (Matrix|Sparse)VectorAffineFu…
odow Jan 6, 2025
4b5759e
Update src/utils.jl
odow Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ struct MatrixVectorAffineFunction{AT,VT} <: MOI.AbstractVectorFunction
terms::AT
constants::VT
end

MOI.constant(func::MatrixVectorAffineFunction) = func.constants
function Base.convert(
::Type{MOI.VectorAffineFunction{T}},
Expand Down Expand Up @@ -269,14 +270,23 @@ function MOIU.isapprox_zero(
return MOIU.isapprox_zero(standard_form(func), tol)
end

_scalar(::Type{<:MatrixVectorAffineFunction}) = VectorScalarAffineFunction
_scalar(::Type{<:SparseVectorAffineFunction}) = SparseScalarAffineFunction
function MOI.Utilities.scalar_type(::Type{<:MatrixVectorAffineFunction})
return VectorScalarAffineFunction
end

function MOI.Utilities.scalar_type(::Type{<:SparseVectorAffineFunction})
return SparseScalarAffineFunction
end


function Base.getindex(
it::MOI.Utilities.ScalarFunctionIterator{F},
output_index::Integer,
) where {F<:Union{MatrixVectorAffineFunction,SparseVectorAffineFunction}}
return _scalar(F)(it.f.terms[output_index, :], it.f.constants[output_index])
return MOI.Utilities.scalar_type(F)(
it.f.terms[output_index, :],
it.f.constants[output_index],
)
end

function _index_map_to_oneto!(index_map, v::MOI.VariableIndex)
Expand Down
Loading