Update MOI to v0.7 (#82)

* Update MOI to v0.7

* Fix handling of copy

* Update LinQuadOptInterface.jl

Author: odow

REQUIRE

@@ -1,3 +1,3 @@
 julia 0.6
-MathOptInterface 0.6.3 0.7
+MathOptInterface 0.7 0.8
 Compat 0.59

src/LinQuadOptInterface.jl

@@ -205,6 +205,31 @@ function Base.show(io::IO, model::LinQuadOptimizer)
     return
 end
 
+MOIU.supports_default_copy_to(model::LinQuadOptimizer, copy_names::Bool) = true
+
+function MOI.copy_to(dest::LinQuadOptimizer, src::MOI.ModelLike; kwargs...)
+    return MOIU.automatic_copy_to(dest, src; kwargs...)
+end
+
+function MOI.get(::LinQuadOptimizer, ::MOI.ListOfVariableAttributesSet)
+    return MOI.AbstractVariableAttribute[]
+end
+
+function MOI.get(model::LinQuadOptimizer, ::MOI.ListOfModelAttributesSet)
+    attributes = [
+        MOI.ObjectiveSense(),
+        MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}()
+    ]
+    if MOI.get(model, MOI.Name()) != ""
+        push!(attributes, MOI.Name())
+    end
+    return attributes
+end
+
+function MOI.get(::LinQuadOptimizer, ::MOI.ListOfConstraintAttributesSet)
+    return MOI.AbstractConstraintAttribute[]
+end
+
 @enum(VariableType, Continuous, Binary, Integer, Semiinteger, Semicontinuous)
 
 macro LinQuadOptimizerBase(inner_model_type=Any)
@@ -277,9 +302,9 @@ function MOI.is_empty(m::LinQuadOptimizer)
     ret = ret && isempty(m.constraint_names)
     ret = ret && isempty(m.constraint_names_rev)
     ret = ret && m.objective_constant == 0.0
-    ret = ret && m.termination_status == MOI.OtherError
-    ret = ret && m.primal_status == MOI.UnknownResultStatus
-    ret = ret && m.dual_status == MOI.UnknownResultStatus
+    ret = ret && m.termination_status == MOI.OptimizeNotCalled
+    ret = ret && m.primal_status == MOI.NoSolution
+    ret = ret && m.dual_status == MOI.NoSolution
     ret = ret && m.primal_result_count == 0
     ret = ret && m.dual_result_count == 0
     ret = ret && m.solvetime == 0.0
@@ -319,9 +344,9 @@ function MOI.empty!(m::M, env = nothing) where M<:LinQuadOptimizer
 
     m.objective_constant = 0.0
 
-    m.termination_status = MathOptInterface.OtherError
-    m.primal_status = MathOptInterface.UnknownResultStatus
-    m.dual_status = MathOptInterface.UnknownResultStatus
+    m.termination_status = MathOptInterface.OptimizeNotCalled
+    m.primal_status = MathOptInterface.NoSolution
+    m.dual_status = MathOptInterface.NoSolution
     m.primal_result_count = 0
     m.dual_result_count = 0
 
@@ -360,7 +385,6 @@ include("variables.jl")
 include("constraints.jl")
 include("objective.jl")
 include("solve.jl")
-include("copy.jl")
 
 include("solver_interface.jl")
 

src/copy.jl

@@ -63,9 +63,9 @@ mutable struct MockLinQuadModel # <: LinQuadOptInterface.LinQuadOptimizer
 
         m.sos = LinQuadSOS[]
 
-        m.termination_status = MOI.Success
-        m.primal_status = MOI.FeasiblePoint
-        m.dual_status = MOI.FeasiblePoint
+        m.termination_status = MOI.OptimizeNotCalled
+        m.primal_status = MOI.NoSolution
+        m.dual_status = MOI.NoSolution
 
         m.variable_primal_solution = zeros(0)
         m.variable_dual_solution = zeros(0)
@@ -288,7 +288,7 @@ function set_solution!(instance::MockLinQuadOptimizer;
     constraint_dual = Float64[],
     quadratic_primal = Float64[],
     quadratic_dual = Float64[],
-    termination_status = MOI.Success,
+    termination_status = MOI.Optimal,
     primal_status = MOI.FeasiblePoint,
     dual_status = MOI.FeasiblePoint
     )

src/mockoptimizer.jl

@@ -15,8 +15,8 @@ function MOI.optimize!(model::LinQuadOptimizer)
     fill!(model.variable_dual_solution, NaN)
     fill!(model.constraint_primal_solution, NaN)
     fill!(model.constraint_dual_solution, NaN)
-    model.primal_status = MOI.UnknownResultStatus
-    model.dual_status   = MOI.UnknownResultStatus
+    model.primal_status = MOI.NoSolution
+    model.dual_status   = MOI.NoSolution
     model.primal_result_count = 0
     model.dual_result_count = 0
 

src/solve.jl

@@ -23,7 +23,7 @@ end
 function set_lin3test_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
+        termination_status = MOI.Infeasible,
         primal_status = MOI.NoSolution,
         dual_status = MOI.InfeasibilityCertificate,
         variable_primal = [NaN],
@@ -32,4 +32,4 @@ function set_lin3test_solutions!(solver)
         constraint_dual = [1.0, -1.0]
     )
     return
-end
+end

test/contconic.jl

@@ -198,11 +198,9 @@ end
 function set_linear8atest_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
-        primal_status = MOI.UnknownResultStatus,
+        termination_status = MOI.Infeasible,
+        primal_status = MOI.NoSolution,
         dual_status = MOI.InfeasibilityCertificate,
-        variable_primal = [NaN, NaN],
-        constraint_primal = [NaN],
         variable_dual = [NaN, NaN],
         constraint_dual = [-0.5]
     )
@@ -212,27 +210,23 @@ end
 function set_linear8btest_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
+        termination_status = MOI.DualInfeasible,
         primal_status = MOI.InfeasibilityCertificate,
-        dual_status = MOI.UnknownResultStatus,
+        dual_status = MOI.NoSolution,
         variable_primal = [2.0, 1.0],
-        constraint_primal = [NaN],
-        variable_dual = [NaN, NaN],
-        constraint_dual = [NaN]
+        constraint_primal = [NaN]
     )
     return
 end
 
 function set_linear8ctest_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
+        termination_status = MOI.DualInfeasible,
         primal_status = MOI.InfeasibilityCertificate,
-        dual_status = MOI.UnknownResultStatus,
+        dual_status = MOI.NoSolution,
         variable_primal = [1.0, 1.0],
-        constraint_primal = [NaN],
-        variable_dual = [NaN, NaN],
-        constraint_dual = [NaN]
+        constraint_primal = [NaN]
     )
     return
 end
@@ -301,11 +295,9 @@ end
 function set_linear12test_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
-        primal_status = MOI.UnknownResultStatus,
+        termination_status = MOI.Infeasible,
+        primal_status = MOI.NoSolution,
         dual_status = MOI.InfeasibilityCertificate,
-        variable_primal = [NaN, NaN],
-        constraint_primal = [NaN, NaN],
         variable_dual = [2/3, 0.0],
         constraint_dual = [-1/3, -1.0]
     )

test/contlinear.jl

@@ -95,4 +95,4 @@ function set_socp1test_solutions!(solver)
         quadratic_dual = [-1.41421]
     )
     return
-end
+end

test/contquadratic.jl

@@ -1,59 +1,43 @@
 function set_knapsacktest_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
+        termination_status = MOI.Optimal,
         primal_status = MOI.FeasiblePoint,
-        dual_status = MOI.UnknownResultStatus,
+        dual_status = MOI.NoSolution,
         variable_primal = [1.0, 0.0, 0.0, 1.0, 1.0],
-        constraint_primal = [9.0],
-        quadratic_primal = Float64[],
-        variable_dual = [NaN, NaN, NaN, NaN, NaN],
-        constraint_dual = [NaN],
-        quadratic_dual = Float64[]
+        constraint_primal = [9.0]
     )
     return
 end
 
 function set_int1test_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
+        termination_status = MOI.Optimal,
         primal_status = MOI.FeasiblePoint,
-        dual_status = MOI.UnknownResultStatus,
+        dual_status = MOI.NoSolution,
         variable_primal = [4.0, 5.0, 1.0],
-        constraint_primal = [10.0, 15.0],
-        quadratic_primal = Float64[],
-        variable_dual = [NaN, NaN, NaN],
-        constraint_dual = [NaN, NaN],
-        quadratic_dual = Float64[]
+        constraint_primal = [10.0, 15.0]
     )
     return
 end
 
 function set_int3test_solutions!(solver)
     # SOLVE 1
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
+        termination_status = MOI.Optimal,
         primal_status = MOI.FeasiblePoint,
-        dual_status = MOI.UnknownResultStatus,
+        dual_status = MOI.NoSolution,
         variable_primal = [1.0, -0.0, -0.0, -0.0, -0.0, 1.0, -0.0, -0.0, -0.0, -0.0, -0.0],
-        constraint_primal = [0.9875],
-        quadratic_primal = Float64[],
-        variable_dual = [NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN],
-        constraint_dual = [NaN],
-        quadratic_dual = Float64[]
+        constraint_primal = [0.9875]
     )
     # SOLVE 2
     LQOI.set_solution!(solver,
-        termination_status = MOI.Success,
+        termination_status = MOI.Optimal,
         primal_status = MOI.FeasiblePoint,
-        dual_status = MOI.UnknownResultStatus,
+        dual_status = MOI.NoSolution,
         variable_primal = [1.0, -0.0, -0.0, -0.0, -0.0, 1.0, -0.0, -0.0, -0.0, -0.0, -0.0],
-        constraint_primal = [0.9875],
-        quadratic_primal = Float64[],
-        variable_dual = [NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN, NaN],
-        constraint_dual = [NaN],
-        quadratic_dual = Float64[]
+        constraint_primal = [0.9875]
     )
     return
-end
+end

test/intlinear.jl

@@ -135,6 +135,12 @@ end
 
     @testset "ModelLike tests" begin
         config = MOIT.TestConfig(solve=false)
+        @testset "default_objective_test" begin
+            MOIT.default_objective_test(LQOI.MockLinQuadOptimizer())
+        end
+        @testset "default_status_test" begin
+            MOIT.default_status_test(LQOI.MockLinQuadOptimizer())
+        end
         @testset "nametest" begin
             MOIT.nametest(LQOI.MockLinQuadOptimizer())
         end