Skip to content

Fix MOI.Integer conflicting with itself #183

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
odow merged 2 commits into from
Mar 20, 2025
Merged

Fix MOI.Integer conflicting with itself #183

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
236c1d5
Fix MOI.Integer conflicting with itself
odow Mar 20, 2025
705bf29
Merge branch 'master' into od/circuit
odow Mar 20, 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
12 changes: 7 additions & 5 deletions src/constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,11 +526,12 @@ function appendconedomain(
return Mosek.appendsvecpsdconedomain(t, n)
end

# Two `SingleVariable`-in-`S` cannot be set to the same variable if
# the two constraints
# Two `VariableIndex`-in-`S` cannot be set to the same variable if the two
# constraints:
#
# * both set a lower bound, or
# * both set an upper bound, or
# * both set it to integer.
# * both set an upper bound
#
# The `incompatible_mask` are computed according to these rules.
flag(::Type{MOI.EqualTo{Float64}}) = 0x1
incompatible_mask(::Type{MOI.EqualTo{Float64}}) = 0x2f
Expand All @@ -541,7 +542,8 @@ incompatible_mask(::Type{MOI.LessThan{Float64}}) = 0x2d
flag(::Type{MOI.Interval{Float64}}) = 0x8
incompatible_mask(::Type{MOI.Interval{Float64}}) = 0x2f
flag(::Type{MOI.Integer}) = 0x10
incompatible_mask(::Type{MOI.Integer}) = 0x30
# MOI.Integer does not conflict with any othher supported variable set
incompatible_mask(::Type{MOI.Integer}) = 0x00
#flag(::Type{<:VectorCone}) = 0x40 # FIXME unused
incompatible_mask(::Type{<:VectorCone}) = 0x40

Expand Down
5 changes: 0 additions & 5 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,6 @@ function test_moi_test_runtests_Bridge_Mosek()
model,
config;
exclude = [
# Cannot put multiple bound sets of the same type on a variable
"test_basic_VectorAffineFunction_Circuit",
"test_basic_VectorOfVariables_Circuit",
"test_basic_VectorQuadraticFunction_Circuit",
"test_cpsat_Circuit",
# Evaluated: MathOptInterface.OTHER_ERROR in (MathOptInterface.OPTIMAL, MathOptInterface.INVALID_MODEL)
"test_conic_empty_matrix",
# Needs a cache to query the ConstraintFunction, and MOI doesn't
Expand Down
Loading