Skip to content

Add <:SUPPORTED_VARIABLE_SCALAR_SETS upper bound #2007

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 1 commit into from
Sep 22, 2022
Merged

Add <:SUPPORTED_VARIABLE_SCALAR_SETS upper bound #2007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/Utilities/variables_container.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ end
function MOI.delete(
b::VariablesContainer{T},
ci::MOI.ConstraintIndex{MOI.VariableIndex,S},
) where {T,S}
) where {T,S<:SUPPORTED_VARIABLE_SCALAR_SETS{T}}
MOI.throw_if_not_valid(b, ci)
flag = _single_variable_flag(S)
b.set_mask[ci.value] &= ~flag
Expand All @@ -287,9 +287,9 @@ function MOI.delete(b::VariablesContainer, x::MOI.VariableIndex)
end

function MOI.is_valid(
b::VariablesContainer,
b::VariablesContainer{T},
ci::MOI.ConstraintIndex{MOI.VariableIndex,S},
) where {S}
) where {T,S<:SUPPORTED_VARIABLE_SCALAR_SETS{T}}
if !(1 <= ci.value <= length(b.set_mask))
return false
end
Expand All @@ -315,10 +315,10 @@ function MOI.set(
end

function MOI.get(
model::VariablesContainer,
model::VariablesContainer{T},
::MOI.ConstraintSet,
ci::MOI.ConstraintIndex{MOI.VariableIndex,S},
) where {S}
) where {T,S<:SUPPORTED_VARIABLE_SCALAR_SETS{T}}
MOI.throw_if_not_valid(model, ci)
return set_from_constants(model, S, ci.value)
end
Expand All @@ -341,9 +341,9 @@ function MOI.set(
end

function MOI.get(
b::VariablesContainer,
b::VariablesContainer{T},
::MOI.NumberOfConstraints{MOI.VariableIndex,S},
)::Int64 where {S}
)::Int64 where {T,S<:SUPPORTED_VARIABLE_SCALAR_SETS{T}}
flag = _single_variable_flag(S)
return count(mask -> !iszero(flag & mask), b.set_mask)
end
Expand Down Expand Up @@ -377,9 +377,9 @@ function MOI.get(
end

function MOI.get(
b::VariablesContainer,
b::VariablesContainer{T},
::MOI.ListOfConstraintIndices{MOI.VariableIndex,S},
) where {S}
) where {T,S<:SUPPORTED_VARIABLE_SCALAR_SETS{T}}
list = MOI.ConstraintIndex{MOI.VariableIndex,S}[]
flag = _single_variable_flag(S)
for (index, mask) in enumerate(b.set_mask)
Expand Down