Fix MOA with local solvers not supporting delete

src/MultiObjectiveAlgorithms.jl

@@ -94,6 +94,16 @@ abstract type AbstractAlgorithm end
 
 MOI.Utilities.map_indices(::Function, x::AbstractAlgorithm) = x
 
+function _instantiate_with_cache(optimizer_factory)
+    model = MOI.instantiate(optimizer_factory)
+    if !MOI.supports_incremental_interface(model)
+        # A cache will already have been added
+        return model
+    end
+    cache = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
+    return MOI.Utilities.CachingOptimizer(cache, model)
+end
+
 mutable struct Optimizer <: MOI.AbstractOptimizer
     inner::MOI.AbstractOptimizer
     algorithm::Union{Nothing,AbstractAlgorithm}
@@ -103,7 +113,7 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
 
     function Optimizer(optimizer_factory)
         return new(
-            MOI.instantiate(optimizer_factory),
+            _instantiate_with_cache(optimizer_factory),
             nothing,
             nothing,
             SolutionPoint[],
@@ -489,7 +499,8 @@ function MOI.get(model::Optimizer, attr::MOI.ObjectiveBound)
     for (i, f) in enumerate(objectives)
         MOI.set(model.inner, MOI.ObjectiveFunction{typeof(f)}(), f)
         MOI.optimize!(model.inner)
-        if MOI.get(model.inner, MOI.TerminationStatus()) == MOI.OPTIMAL
+        status = MOI.get(model.inner, MOI.TerminationStatus())
+        if _is_scalar_status_optimal(status)
             ideal_point[i] = MOI.get(model.inner, MOI.ObjectiveValue())
         end
     end
@@ -523,6 +534,11 @@ function _is_scalar_status_optimal(status::MOI.TerminationStatusCode)
     return status == MOI.OPTIMAL || status == MOI.LOCALLY_SOLVED
 end
 
+function _is_scalar_status_optimal(model::Optimizer)
+    status = MOI.get(model.inner, MOI.TerminationStatus())
+    return _is_scalar_status_optimal(status)
+end
+
 for file in readdir(joinpath(@__DIR__, "algorithms"))
     include(joinpath(@__DIR__, "algorithms", file))
 end

src/algorithms/Dichotomy.jl

@@ -64,7 +64,6 @@ function _solve_weighted_sum(
     MOI.set(model.inner, MOI.ObjectiveFunction{typeof(f)}(), f)
     MOI.optimize!(model.inner)
     status = MOI.get(model.inner, MOI.TerminationStatus())
-    status = MOI.get(model.inner, MOI.TerminationStatus())
     if !_is_scalar_status_optimal(status)
         return status, nothing
     end

src/algorithms/DominguezRios.jl

@@ -201,7 +201,7 @@ function optimize_multiobjective!(algorithm::DominguezRios, model::Optimizer)
         new_f = t_max + ϵ * sum(w[i] * (scalars[i] - yI[i]) for i in 1:n)
         MOI.set(model.inner, MOI.ObjectiveFunction{typeof(new_f)}(), new_f)
         MOI.optimize!(model.inner)
-        if MOI.get(model.inner, MOI.TerminationStatus()) == MOI.OPTIMAL
+        if _is_scalar_status_optimal(model)
             X, Y = _compute_point(model, variables, model.f)
             obj = MOI.get(model.inner, MOI.ObjectiveValue())
             if (obj < 1) && all(yI .< B.u)

src/algorithms/EpsilonConstraint.jl

@@ -107,7 +107,7 @@ function optimize_multiobjective!(
     while true
         MOI.set(model, MOI.ConstraintSet(), ci, SetType(bound))
         MOI.optimize!(model.inner)
-        if MOI.get(model.inner, MOI.TerminationStatus()) != MOI.OPTIMAL
+        if !_is_scalar_status_optimal(model)
             break
         end
         X, Y = _compute_point(model, variables, model.f)

src/algorithms/KirlikSayin.jl

@@ -153,7 +153,7 @@ function optimize_multiobjective!(algorithm::KirlikSayin, model::Optimizer)
             end
         end
         MOI.optimize!(model.inner)
-        if MOI.get(model.inner, MOI.TerminationStatus()) != MOI.OPTIMAL
+        if !_is_scalar_status_optimal(model)
             _remove_rectangle(L, _Rectangle(_project(yI, k), uᵢ))
             MOI.delete.(model, ε_constraints)
             continue
@@ -169,7 +169,7 @@ function optimize_multiobjective!(algorithm::KirlikSayin, model::Optimizer)
         MOI.optimize!(model.inner)
         MOI.delete.(model, ε_constraints)
         MOI.delete(model, zₖ_constraint)
-        if MOI.get(model.inner, MOI.TerminationStatus()) != MOI.OPTIMAL
+        if !_is_scalar_status_optimal(model)
             _remove_rectangle(L, _Rectangle(_project(yI, k), uᵢ))
             continue
         end

test/algorithms/EpsilonConstraint.jl

@@ -8,6 +8,7 @@ module TestEpsilonConstraint
 using Test
 
 import HiGHS
+import Ipopt
 import MultiObjectiveAlgorithms as MOA
 
 const MOI = MOA.MOI
@@ -289,6 +290,34 @@ function test_deprecated()
     return
 end
 
+function test_quadratic()
+    μ = [0.05470748600000001, 0.18257110599999998]
+    Q = [0.00076204 0.00051972; 0.00051972 0.00546173]
+    N = 2
+    model = MOA.Optimizer(Ipopt.Optimizer)
+    MOI.set(model, MOA.Algorithm(), MOA.EpsilonConstraint())
+    MOI.set(model, MOA.SolutionLimit(), 10)
+    MOI.set(model, MOI.Silent(), true)
+    w = MOI.add_variables(model, N)
+    MOI.add_constraint.(model, w, MOI.GreaterThan(0.0))
+    MOI.add_constraint.(model, w, MOI.LessThan(1.0))
+    MOI.add_constraint(model, sum(1.0 * w[i] for i in 1:N), MOI.EqualTo(1.0))
+    var = sum(Q[i, j] * w[i] * w[j] for i in 1:N, j in 1:N)
+    mean = sum(-μ[i] * w[i] for i in 1:N)
+    f = MOI.Utilities.operate(vcat, Float64, var, mean)
+    MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE)
+    MOI.set(model, MOI.ObjectiveFunction{typeof(f)}(), f)
+    MOI.optimize!(model)
+    @test MOI.get(model, MOI.ResultCount()) == 10
+    for i in 1:MOI.get(model, MOI.ResultCount())
+        w_sol = MOI.get(model, MOI.VariablePrimal(i), w)
+        y = MOI.get(model, MOI.ObjectiveValue(i))
+        @test y ≈ [w_sol' * Q * w_sol, -μ' * w_sol]
+    end
+    @test MOI.get(model, MOI.TerminationStatus()) == MOI.OPTIMAL
+    return
+end
+
 end
 
 TestEpsilonConstraint.run_tests()

test/test_model.jl

@@ -36,6 +36,7 @@ function test_moi_runtests()
         exclude = String[
             # Skipped beause of UniversalFallback in _mock_optimizer
             "test_attribute_Silent",
+            "test_attribute_after_empty",
             "test_model_copy_to_UnsupportedAttribute",
             "test_model_copy_to_UnsupportedConstraint",
             "test_model_supports_constraint_ScalarAffineFunction_EqualTo",