Update to MathOptIIS@0.2 (#333)

Author: odow

Project.toml

@@ -14,7 +14,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 [compat]
 HiGHS_jll = "=1.13.1"
 LinearAlgebra = "1"
-MathOptIIS = "0.1.0"
+MathOptIIS = "0.2"
 MathOptInterface = "1.34"
 OpenBLAS32_jll = "0.3.24"
 ParallelTestRunner = "2.4.2"

src/MOI_wrapper.jl

@@ -3374,6 +3374,41 @@ function MOI.write_to_file(model::Optimizer, filename::String)
     return
 end
 
+function MOI.compute_conflict!(model::Optimizer)
+    solver = MathOptIIS.Optimizer()
+    MOI.set(solver, MathOptIIS.InfeasibleModel(), model)
+    MOI.set(solver, MathOptIIS.InnerOptimizer(), Optimizer)
+    MOI.set(solver, MOI.Silent(), MOI.get(model, MOI.Silent()))
+    if (time_limit = MOI.get(model, MOI.TimeLimitSec())) !== nothing
+        MOI.set(solver, MOI.TimeLimitSec(), time_limit)
+    end
+    MOI.compute_conflict!(solver)
+    model.conflict_solver = solver
+    return
+end
+
+function MOI.get(optimizer::Optimizer, attr::MOI.ConflictStatus)
+    if optimizer.conflict_solver === nothing
+        return MOI.COMPUTE_CONFLICT_NOT_CALLED
+    end
+    return MOI.get(optimizer.conflict_solver, attr)
+end
+
+function MOI.get(optimizer::Optimizer, attr::MOI.ConflictCount)
+    if optimizer.conflict_solver === nothing
+        return 0
+    end
+    return MOI.get(optimizer.conflict_solver, attr)
+end
+
+function MOI.get(
+    optimizer::Optimizer,
+    attr::MOI.ConstraintConflictStatus,
+    con::MOI.ConstraintIndex,
+)
+    return MOI.get(optimizer.conflict_solver, attr, con)
+end
+
 # These enums are deprecated. Use the `kHighsXXX` constants defined in
 # libhighs.jl instead.
 
@@ -3402,28 +3437,3 @@ end
 @enum(HighsObjSense, kMinimize = 1, kMaximize = -1)
 @enum(HighsVartype, kContinuous = 0, kInteger = 1, kImplicitInteger = 2)
 @enum(HighsStatus, HighsStatuskError = -1, HighsStatuskOk, HighsStatuskWarning)
-
-function MOI.compute_conflict!(model::Optimizer)
-    solver = MathOptIIS.Optimizer()
-    MOI.set(solver, MathOptIIS.InfeasibleModel(), model)
-    MOI.set(solver, MathOptIIS.InnerOptimizer(), Optimizer)
-    MOI.set(solver, MOI.Silent(), MOI.get(model, MOI.Silent()))
-    MOI.compute_conflict!(solver)
-    model.conflict_solver = solver
-    return
-end
-
-function MOI.get(optimizer::Optimizer, attr::MOI.ConflictStatus)
-    if optimizer.conflict_solver === nothing
-        return MOI.COMPUTE_CONFLICT_NOT_CALLED
-    end
-    return MOI.get(optimizer.conflict_solver, attr)
-end
-
-function MOI.get(
-    optimizer::Optimizer,
-    attr::MOI.ConstraintConflictStatus,
-    con::MOI.ConstraintIndex,
-)
-    return MOI.get(optimizer.conflict_solver, attr, con)
-end

test/test_moi_wrapper.jl

@@ -1278,6 +1278,74 @@ function test_multi_objective()
     return
 end
 
+function _copy_conflict(model::MOI.ModelLike)
+    filter_fn(::Any) = true
+    function filter_fn(cref::MOI.ConstraintIndex)
+        for i in 1:MOI.get(model, MOI.ConflictCount())
+            status = MOI.get(model, MOI.ConstraintConflictStatus(i), cref)
+            if status != MOI.NOT_IN_CONFLICT
+                return true
+            end
+        end
+        return false
+    end
+    new_model = MOI.Utilities.Model{Float64}()
+    filtered_src = MOI.Utilities.ModelFilter(filter_fn, model)
+    MOI.copy_to(new_model, filtered_src)
+    MOI.set(new_model, MOI.ObjectiveSense(), MOI.FEASIBILITY_SENSE)
+    return new_model
+end
+
+function _print_model(model)
+    return replace(sprint(print, model), "-0.0" => "0.0")
+end
+
+function _test_compute_conflict(input, output; silent::Bool = true, kwargs...)
+    model = MOI.instantiate(HiGHS.Optimizer; kwargs...)
+    MOI.set(model, MOI.Silent(), true)
+    MOI.set(model, MOI.TimeLimitSec(), 60.0)
+    MOI.Utilities.loadfromstring!(model, input)
+    MOI.optimize!(model)
+    @test MOI.get(model, MOI.ConflictCount()) == 0
+    MOI.compute_conflict!(model)
+    @test MOI.get(model, MOI.ConflictCount()) > 0
+    @test MOI.get(model, MOI.ConflictStatus()) == MOI.CONFLICT_FOUND
+    iis = _copy_conflict(model)
+    target = MOI.Utilities.Model{Float64}()
+    MOI.Utilities.loadfromstring!(target, output)
+    A, B = _print_model(iis), _print_model(target)
+    if A != B
+        @info "IIS"
+        print(A)
+        @info "Target"
+        println(B)
+    end
+    @test A == B
+    return
+end
+
+function test_relax_integrality_integer()
+    _test_compute_conflict(
+        """
+        variables: x, y
+        maxobjective: 1.0 * x + y
+        2.0 * y <= 40.0
+        1.0 * x + y >= 35.0
+        x >= 0.0
+        x <= 10.0
+        x in Integer()
+        y >= 0.0
+        """,
+        """
+        variables: x, y
+        2.0 * y <= 40.0
+        1.0 * x + y >= 35.0
+        x <= 10.0
+        """,
+    )
+    return
+end
+
 end  # module
 
 TestMOIHighs.runtests()