Update to MathOptIIS@0.2 (#68)

Author: odow

Project.toml

@@ -16,8 +16,8 @@ JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 MathOptAnalyzerJuMPExt = "JuMP"
 
 [compat]
-Dualization = "0.6.0"
-JuMP = "1.24.0"
-MathOptIIS = "0.1.1"
-MathOptInterface = "1.37.0"
+Dualization = "0.7"
+JuMP = "1.24"
+MathOptIIS = "0.2"
+MathOptInterface = "1.37"
 julia = "1.10"

src/Infeasibility/Infeasibility.jl

@@ -6,7 +6,7 @@
 module Infeasibility
 
 import MathOptAnalyzer
-import MathOptIIS as MOIIS
+import MathOptIIS
 import MathOptInterface as MOI
 
 include("structs.jl")

src/Infeasibility/analyze.jl

@@ -3,9 +3,14 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
-function _add_result(out::Data, model, iis, meta::MOIIS.BoundsData)
+function _add_result(
+    out::Data,
+    model,
+    iis,
+    meta::MathOptIIS.Metadata{T,Nothing},
+) where {T}
     @assert length(iis.constraints) == 2
-    err = InfeasibleBounds{Float64}(
+    err = InfeasibleBounds{T}(
         MOI.get(model, MOI.ConstraintFunction(), iis.constraints[1]),
         meta.lower_bound,
         meta.upper_bound,
@@ -14,9 +19,14 @@ function _add_result(out::Data, model, iis, meta::MOIIS.BoundsData)
     return
 end
 
-function _add_result(out::Data, model, iis, meta::MOIIS.IntegralityData)
+function _add_result(
+    out::Data,
+    model,
+    iis,
+    meta::MathOptIIS.Metadata{T,S},
+) where {T,S<:Union{MOI.Integer,MOI.ZeroOne}}
     @assert length(iis.constraints) >= 2
-    err = InfeasibleIntegrality{Float64}(
+    err = InfeasibleIntegrality{T}(
         MOI.get(model, MOI.ConstraintFunction(), iis.constraints[1]),
         meta.lower_bound,
         meta.upper_bound,
@@ -26,13 +36,18 @@ function _add_result(out::Data, model, iis, meta::MOIIS.IntegralityData)
     return
 end
 
-function _add_result(out::Data, model, iis, meta::MOIIS.RangeData)
+function _add_result(
+    out::Data,
+    model,
+    iis,
+    meta::MathOptIIS.Metadata{T,S},
+) where {T,S<:MOI.AbstractSet}
     @assert length(iis.constraints) >= 1
     for con in iis.constraints
         if con isa MOI.ConstraintIndex{MOI.VariableIndex}
             continue
         end
-        err = InfeasibleConstraintRange{Float64}(
+        err = InfeasibleConstraintRange{T}(
             con,
             meta.lower_bound,
             meta.upper_bound,
@@ -49,35 +64,15 @@ function _add_result(out::Data, model, iis, meta)
     return
 end
 
-function _instantiate_with_modify(optimizer, ::Type{T}) where {T}
-    model = MOI.instantiate(optimizer)
-    if !MOI.supports_incremental_interface(model)
-        # Don't use `default_cache` for the cache because, for example, SCS's
-        # default cache doesn't support modifying coefficients of the constraint
-        # matrix. JuMP uses the default cache with SCS because it has an outer
-        # layer of caching; we don't have that here, so we can't use the
-        # default.
-        #
-        # We could revert to using the default cache if we fix this in MOI.
-        cache = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{T}())
-        model = MOI.Utilities.CachingOptimizer(cache, model)
-    end
-    return MOI.Bridges.full_bridge_optimizer(model, T)
-end
-
 function MathOptAnalyzer.analyze(
     ::Analyzer,
     model::MOI.ModelLike;
     optimizer = nothing,
 )
-    solver = MOIIS.Optimizer()
-    MOI.set(solver, MOIIS.InfeasibleModel(), model)
+    solver = MathOptIIS.Optimizer()
+    MOI.set(solver, MathOptIIS.InfeasibleModel(), model)
     if optimizer !== nothing
-        MOI.set(
-            solver,
-            MOIIS.InnerOptimizer(),
-            () -> _instantiate_with_modify(optimizer, Float64),
-        )
+        MOI.set(solver, MathOptIIS.InnerOptimizer(), optimizer)
     end
     MOI.compute_conflict!(solver)
     out = Data()

test/Project.toml

@@ -10,4 +10,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 HiGHS = "1"
 JuMP = "1"
 MathOptInterface = "1"
-SCS = "1"
+SCS = "2"

test/test_Infeasibility.jl

@@ -32,7 +32,7 @@ function test_bounds()
     data =
         MathOptAnalyzer.analyze(MathOptAnalyzer.Infeasibility.Analyzer(), model)
     list = MathOptAnalyzer.list_of_issue_types(data)
-    @test length(list) == 1
+    @test 1 <= length(list) <= 2
     ret = MathOptAnalyzer.list_of_issues(data, list[1])
     @test length(ret) == 1
     @test ret[] == MathOptAnalyzer.Infeasibility.InfeasibleBounds{Float64}(
@@ -81,7 +81,7 @@ function test_integrality()
     data =
         MathOptAnalyzer.analyze(MathOptAnalyzer.Infeasibility.Analyzer(), model)
     list = MathOptAnalyzer.list_of_issue_types(data)
-    @test length(list) == 1
+    @test 1 <= length(list) <= 2
     ret = MathOptAnalyzer.list_of_issues(data, list[1])
     @test length(ret) == 1
     @test ret[] == MathOptAnalyzer.Infeasibility.InfeasibleIntegrality{Float64}(