more tests

Author: joaquimg

src/range.jl

@@ -41,20 +41,20 @@ function _range_infeasibility!(
             return range_consistent
         end
         func = MOI.get(optimizer.original_model, MOI.ConstraintFunction(), con)
-        # failed = false
+        failed = false
         list_of_variables = MOI.VariableIndex[]
         interval = _eval_variables(func) do var_idx
             push!(list_of_variables, var_idx)
             # this only fails if we allow continuing after bounds issues
-            # if !haskey(variables, var_idx)
-            #     failed = true
-            #     return Interval(-Inf, Inf)
-            # end
+            if !haskey(variables, var_idx)
+                failed = true
+                return Interval(-Inf, Inf)
+            end
             return variables[var_idx]
         end
-        # if failed
-        #     continue
-        # end
+        if failed
+            continue
+        end
         set = MOI.get(optimizer.original_model, MOI.ConstraintSet(), con)
         if _invalid_range(set, interval)
             cons = Set{MOI.ConstraintIndex}()

src/solver.jl

@@ -135,7 +135,7 @@ function _elastic_filter(optimizer::Optimizer)
     obj_sense = MOI.get(model, MOI.ObjectiveSense())
 
     # deletion filter
-    cadidates = MOI.ConstraintIndex[]
+    candidates = MOI.ConstraintIndex[]
     for (con, var) in de_elastisized
         if !_in_time(optimizer)
             return nothing
@@ -153,7 +153,7 @@ function _elastic_filter(optimizer::Optimizer)
             MOI.LOCALLY_SOLVED,
             MOI.ALMOST_LOCALLY_SOLVED,
         )
-            push!(cadidates, con)
+            push!(candidates, con)
             _fix_slack(model, var, T)
         elseif status in ( # possibily primal unbounded statuses
             MOI.INFEASIBLE_OR_UNBOUNDED,
@@ -166,7 +166,7 @@ function _elastic_filter(optimizer::Optimizer)
             # the unbounded case:
             if primal_status in (MOI.FEASIBLE_POINT, MOI.NEARLY_FEASIBLE_POINT)
                 # this constraint is not in IIS
-                push!(cadidates, con)
+                push!(candidates, con)
                 _fix_slack(model, var, T)
                 MOI.set(model, MOI.ObjectiveSense(), obj_sense)
                 MOI.set(
@@ -183,11 +183,11 @@ function _elastic_filter(optimizer::Optimizer)
         end
     end
 
-    if isempty(cadidates)
+    if isempty(candidates)
         return nothing
     end
 
-    pre_iis = Set(cadidates)
+    pre_iis = Set(candidates)
     iis = MOI.ConstraintIndex[]
     for (F, S) in
         MOI.get(optimizer.original_model, MOI.ListOfConstraintTypesPresent())

test/iis.jl

@@ -191,6 +191,61 @@ function test_range()
     return
 end
 
+function test_range_and_bound()
+    model = Model()
+    @variable(model, 10 <= x <= 11)
+    @variable(model, 1 <= y <= 11)
+    @variable(model, 1 <= z <= 0)
+    @constraint(model, c, x + y <= 1)
+    @objective(model, Max, x + y)
+    solver = MOCS.Optimizer()
+    MOI.set(solver, MOCS.InfeasibleModel(), JuMP.backend(model))
+    MOI.compute_conflict!(solver)
+    data = solver.results
+    @test length(data) == 1
+    @test _isequal_unordered(
+        data[].constraints,
+        [
+            JuMP.index(LowerBoundRef(z)),
+            JuMP.index(UpperBoundRef(z)),
+        ],
+    )
+    @test MOI.get(solver, MOCS.StopIfInfeasibleBounds()) == true
+    MOI.set(solver, MOCS.StopIfInfeasibleBounds(), false)
+    @test MOI.get(solver, MOCS.StopIfInfeasibleBounds()) == false
+    MOI.compute_conflict!(solver)
+    data = solver.results
+    @test length(data) == 2
+    @test _isequal_unordered(
+        data[1].constraints,
+        [
+            JuMP.index(LowerBoundRef(z)),
+            JuMP.index(UpperBoundRef(z)),
+        ],
+    )
+    @test _isequal_unordered(
+        data[2].constraints,
+        [
+            JuMP.index(c),
+            JuMP.index(UpperBoundRef(x)),
+            JuMP.index(LowerBoundRef(x)),
+            JuMP.index(UpperBoundRef(y)),
+            JuMP.index(LowerBoundRef(y)),
+        ],
+    )
+    @test data[2].irreducible
+    @test data[2].metadata ==
+          MOCS.RangeData(11.0, 22.0, MOI.LessThan{Float64}(1.0))
+    @test MOI.get(solver, MOCS.StopIfInfeasibleRanges()) == true
+    MOI.set(solver, MOCS.StopIfInfeasibleRanges(), false)
+    @test MOI.get(solver, MOCS.StopIfInfeasibleRanges()) == false
+    MOI.set(solver, MOCS.InnerOptimizer(), HiGHS.Optimizer)
+    MOI.compute_conflict!(solver)
+    data = solver.results
+    @test length(data) == 2
+    return
+end
+
 function test_range_neg()
     model = Model()
     @variable(model, 10 <= x <= 11)