Skip to content

Update the tests of UniversalFallback to new MOI.Test #1441

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 4 commits into from
Jul 5, 2021
Merged

Update the tests of UniversalFallback to new MOI.Test #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a9f005
Update the tests of UniversalFallback to new MOI.Test
odow Jul 5, 2021
c701f7c
Fix formatting
odow Jul 5, 2021
8d87519
Add more tests
odow Jul 5, 2021
7dc2980
Fix formatting
odow Jul 5, 2021
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
26 changes: 17 additions & 9 deletions src/Utilities/universalfallback.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ function _get(
end

function _get(
uf,
uf::UniversalFallback,
attr::MOI.CanonicalConstraintFunction,
ci::MOI.ConstraintIndex,
)
Expand Down Expand Up @@ -445,8 +445,19 @@ function MOI.get(
listattr::MOI.ListOfConstraintAttributesSet{F,S},
) where {F,S}
list = MOI.get(uf.model, listattr)
for attr in keys(uf.conattr)
push!(list, attr)
for (attr, dict) in uf.conattr
if any(k -> k isa MOI.ConstraintIndex{F,S}, keys(dict))
push!(list, attr)
end
end
# ConstraintName isn't stored in conattr, but in the .con_to_name dictionary
# instead. Only add it to `list` if it isn't already, and if a constraint
# of the right type has a name set. This avoids, for example, returning
# ConstraintName for SingleVariable constraints.
if !(MOI.ConstraintName() in list)
if any(k -> k isa MOI.ConstraintIndex{F,S}, keys(uf.con_to_name))
push!(list, MOI.ConstraintName())
end
end
return list
end
Expand Down Expand Up @@ -648,7 +659,7 @@ function _set(uf::UniversalFallback, attr::MOI.AbstractModelAttribute, value)
end

function _set(
uf,
uf::UniversalFallback,
attr::MOI.AbstractVariableAttribute,
vi::MOI.VariableIndex,
value,
Expand All @@ -661,7 +672,7 @@ function _set(
end

function _set(
uf,
uf::UniversalFallback,
attr::MOI.AbstractConstraintAttribute,
ci::MOI.ConstraintIndex,
value,
Expand Down Expand Up @@ -755,11 +766,8 @@ end

function constraints(
uf::UniversalFallback,
ci::MOI.ConstraintIndex{F,S},
::MOI.ConstraintIndex{F,S},
) where {F,S}
if !MOI.supports_constraint(uf, F, S)
throw(MOI.InvalidIndex(ci))
end
return constraints(uf, F, S)
end

Expand Down
Loading