Skip to content
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

Fix inference issue in MOIU.Model #1256

Merged
merged 2 commits into from
Mar 2, 2021
Merged

Fix inference issue in MOIU.Model #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65111b4
Fix inference issue in MOIU.Model
odow Mar 2, 2021
89cb0a0
Fix test
odow Mar 2, 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
44 changes: 31 additions & 13 deletions src/Utilities/model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ single_variable_flag(::Type{<:MOI.Semiinteger}) = 0x80
# If a set is added here, a line should be added in
# `MOI.delete(::AbstractModel, ::MOI.VariableIndex)`

function flag_to_set_type(flag::UInt8, T::Type)
function flag_to_set_type(flag::UInt8, ::Type{T}) where {T}
if flag == 0x1
return MOI.EqualTo{T}
elseif flag == 0x2
Expand All @@ -565,28 +565,46 @@ function flag_to_set_type(flag::UInt8, T::Type)
return MOI.ZeroOne
elseif flag == 0x40
return MOI.Semicontinuous{T}
elseif flag == 0x80
return MOI.Semiinteger{T}
else
# $flag would print it in decimal
error("Invalid flag `$(sprint(show, flag))`.")
@assert flag == 0x80
return MOI.Semiinteger{T}
end
end

# Julia doesn't infer `S1` correctly, so we use a function barrier to improve
# inference.
function _throw_if_lower_bound_set(variable, S2, mask, T)
S1 = flag_to_set_type(mask, T)
throw(MOI.LowerBoundAlreadySet{S1,S2}(variable))
return
end

function throw_if_lower_bound_set(variable, S2, mask, T)
flag = single_variable_flag(S2)
if !iszero(flag & LOWER_BOUND_MASK) && !iszero(mask & LOWER_BOUND_MASK)
S1 = flag_to_set_type(mask & LOWER_BOUND_MASK, T)
throw(MOI.LowerBoundAlreadySet{S1,S2}(variable))
lower_mask = mask & LOWER_BOUND_MASK
if iszero(lower_mask)
return # No lower bound set.
elseif iszero(single_variable_flag(S2) & LOWER_BOUND_MASK)
return # S2 isn't related to the lower bound.
end
return _throw_if_lower_bound_set(variable, S2, lower_mask, T)
end

# Julia doesn't infer `S1` correctly, so we use a function barrier to improve
# inference.
function _throw_if_upper_bound_set(variable, S2, mask, T)
S1 = flag_to_set_type(mask, T)
throw(MOI.UpperBoundAlreadySet{S1,S2}(variable))
return
end

function throw_if_upper_bound_set(variable, S2, mask, T)
flag = single_variable_flag(S2)
if !iszero(flag & UPPER_BOUND_MASK) && !iszero(mask & UPPER_BOUND_MASK)
S1 = flag_to_set_type(mask & UPPER_BOUND_MASK, T)
throw(MOI.UpperBoundAlreadySet{S1,S2}(variable))
upper_mask = mask & UPPER_BOUND_MASK
if iszero(upper_mask)
return # No upper bound set.
elseif iszero(single_variable_flag(S2) & UPPER_BOUND_MASK)
return # S2 isn't related to the upper bound.
end
return _throw_if_upper_bound_set(variable, S2, upper_mask, T)
end

# Sets setting lower bound:
Expand Down
3 changes: 1 addition & 2 deletions test/Utilities/model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@ end

@testset "Setting lower/upper bound twice" begin
@testset "flag_to_set_type" begin
err = ErrorException("Invalid flag `0x11`.")
T = Int
@test_throws err MOIU.flag_to_set_type(0x11, T)
@test_throws AssertionError MOIU.flag_to_set_type(0x11, T)
@test MOIU.flag_to_set_type(0x10, T) == MOI.Integer
@test MOIU.flag_to_set_type(0x20, T) == MOI.ZeroOne
end
Expand Down