Skip to content

Commit

Permalink
Updates to latest MOI
Browse files Browse the repository at this point in the history
  • Loading branch information
@odow
odow committed Sep 2, 2021
1 parent fbe6344 commit 87403fd
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 93 deletions.
5 changes: 0 additions & 5 deletions src/Clp.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,4 @@ for sym in names(@__MODULE__, all = true)
end
end

if VERSION > v"1.4.2"
include("precompile.jl")
_precompile_()
end

end
91 changes: 32 additions & 59 deletions src/MOI_wrapper/MOI_wrapper.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ MOI.Utilities.@product_of_sets(

const OptimizerCache = MOI.Utilities.GenericModel{
Float64,
MOI.Utilities.ObjectiveFunctionContainer{Float64},
MOI.Utilities.SingleVariableConstraints{Float64},
MOI.Utilities.ObjectiveContainer{Float64},
MOI.Utilities.VariablesContainer{Float64},
MOI.Utilities.MatrixOfConstraints{
Float64,
MOI.Utilities.MutableSparseMatrixCSC{
Expand All @@ -27,7 +27,6 @@ const OptimizerCache = MOI.Utilities.GenericModel{
},
}

# Supported scalar sets
const SCALAR_SETS = Union{
MOI.GreaterThan{Float64},
MOI.LessThan{Float64},
Expand Down Expand Up @@ -55,9 +54,11 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
## Example
using JuMP, Clp
model = JuMP.Model(Clp.Optimizer)
set_optimizer_attribute(model, "LogLevel", 0)
```julia
using JuMP, Clp
model = JuMP.Model(Clp.Optimizer)
set_optimizer_attribute(model, "LogLevel", 0)
```
"""
function Optimizer(; kwargs...)
model =
Expand Down Expand Up @@ -200,21 +201,19 @@ function MOI.get(model::Optimizer, param::MOI.RawOptimizerAttribute)
return ClpSolve_getSolveType(model.solver_options)
elseif name == "InfeasibleReturn"
return ClpSolve_infeasibleReturn(model.solver_options)
else
throw(MOI.UnsupportedAttribute(param))
end
return throw(MOI.UnsupportedAttribute(param))
end

MOI.supports(::Optimizer, ::MOI.Silent) = true

function MOI.set(model::Optimizer, ::MOI.Silent, value::Bool)
push!(model.options_set, "LogLevel")
Clp_setLogLevel(model, value ? 0 : 1)
return
end

function MOI.get(model::Optimizer, ::MOI.Silent)
return Clp_logLevel(model) == 0
end
MOI.get(model::Optimizer, ::MOI.Silent) = Clp_logLevel(model) == 0

MOI.supports(::Optimizer, ::MOI.TimeLimitSec) = true

Expand All @@ -240,15 +239,7 @@ MOI.supports(::Optimizer, ::MOI.NumberOfThreads) = false

function MOI.supports_constraint(
::Optimizer,
::Type{MOI.ScalarAffineFunction{Float64}},
::Type{<:SCALAR_SETS},
)
return true
end

function MOI.supports_constraint(
::Optimizer,
::Type{MOI.SingleVariable},
::Type{<:Union{MOI.VariableIndex,MOI.ScalarAffineFunction{Float64}}},
::Type{<:SCALAR_SETS},
)
return true
Expand Down Expand Up @@ -283,7 +274,7 @@ end
function _index_map(
src::OptimizerCache,
index_map,
F::Type{MOI.SingleVariable},
F::Type{MOI.VariableIndex},
::Type{S},
) where {S}
for ci in MOI.get(src, MOI.ListOfConstraintIndices{F,S}())
Expand All @@ -300,7 +291,7 @@ Create an `IndexMap` mapping the variables and constraints in `OptimizerCache`
to their corresponding 1-based columns and rows.
"""
function _index_map(src::OptimizerCache)
index_map = MOI.Utilities.IndexMap()
index_map = MOI.IndexMap()
for (i, x) in enumerate(MOI.get(src, MOI.ListOfVariableIndices()))
index_map[x] = MOI.VariableIndex(i)
end
Expand All @@ -310,11 +301,7 @@ function _index_map(src::OptimizerCache)
return index_map
end

function MOI.copy_to(
dest::Optimizer,
src::OptimizerCache;
copy_names::Bool = false,
)
function MOI.copy_to(dest::Optimizer, src::OptimizerCache)
@assert MOI.is_empty(dest)
A = src.constraints.coefficients
row_bounds = src.constraints.constants
Expand Down Expand Up @@ -352,21 +339,19 @@ end

function MOI.copy_to(
dest::Optimizer,
src::MOI.Utilities.UniversalFallback{OptimizerCache};
copy_names::Bool = false,
src::MOI.Utilities.UniversalFallback{OptimizerCache},
)
return MOI.copy_to(dest, src.model)
end

function MOI.copy_to(
dest::Optimizer,
src::MOI.ModelLike;
copy_names::Bool = false,
src::MOI.ModelLike,
)
cache = OptimizerCache()
src_cache = MOI.copy_to(cache, src)
cache_dest = MOI.copy_to(dest, cache)
index_map = MOI.Utilities.IndexMap()
index_map = MOI.IndexMap()
for (src_x, cache_x) in src_cache.var_map
index_map[src_x] = cache_dest[cache_x]
end
Expand All @@ -388,13 +373,9 @@ function MOI.optimize!(model::Optimizer)
return
end

function MOI.get(model::Optimizer, ::MOI.SolveTimeSec)
return model.solve_time
end
MOI.get(model::Optimizer, ::MOI.SolveTimeSec) = model.solve_time

function MOI.get(model::Optimizer, ::MOI.NumberOfVariables)
return Clp_getNumCols(model)
end
MOI.get(model::Optimizer, ::MOI.NumberOfVariables) = Clp_getNumCols(model)

function MOI.get(model::Optimizer, attr::MOI.ObjectiveValue)
MOI.check_result_index_bounds(model, attr)
Expand All @@ -415,9 +396,8 @@ function MOI.get(model::Optimizer, ::MOI.TerminationStatus)
elseif st == 3
# No more granular information that "some limit is reached"
return MOI.OTHER_LIMIT
else
return MOI.OTHER_ERROR
end
return MOI.OTHER_ERROR
end

function MOI.get(model::Optimizer, ::MOI.RawStatusString)
Expand All @@ -433,10 +413,9 @@ function MOI.get(model::Optimizer, ::MOI.RawStatusString)
return "2 - dual infeasible"
elseif st == 3
return "3 - stopped on iterations etc"
elseif st == 4
return "4 - stopped due to errors"
else
error("Expected integer in [0, 4] but got $st")
@assert st == 4
return "4 - stopped due to errors"
end
end

Expand All @@ -460,9 +439,8 @@ function MOI.get(model::Optimizer, attr::MOI.PrimalStatus)
return MOI.INFEASIBILITY_CERTIFICATE
elseif Clp_primalFeasible(model) != 0
return MOI.FEASIBLE_POINT
else
return MOI.UNKNOWN_RESULT_STATUS
end
return MOI.UNKNOWN_RESULT_STATUS
end

function MOI.get(model::Optimizer, attr::MOI.DualStatus)
Expand All @@ -472,9 +450,8 @@ function MOI.get(model::Optimizer, attr::MOI.DualStatus)
return MOI.INFEASIBILITY_CERTIFICATE
elseif Clp_dualFeasible(model) != 0
return MOI.FEASIBLE_POINT
else
return MOI.UNKNOWN_RESULT_STATUS
end
return MOI.UNKNOWN_RESULT_STATUS
end

# ===================
Expand Down Expand Up @@ -519,9 +496,8 @@ function MOI.get(
Clp_getNumCols(model),
x.value,
)
else
error("Primal solution not available")
end
return error("Primal solution not available")
end

function MOI.get(
Expand All @@ -548,9 +524,8 @@ function MOI.get(
Clp_getNumCols(model),
col_indices,
)
else
error("Primal solution not available")
end
return error("Primal solution not available")
end

# TODO: What happens if model is unbounded / infeasible?
Expand All @@ -572,7 +547,7 @@ end
function MOI.get(
model::Optimizer,
attr::MOI.ConstraintPrimal,
c::MOI.ConstraintIndex{MOI.SingleVariable,<:SCALAR_SETS},
c::MOI.ConstraintIndex{MOI.VariableIndex,<:SCALAR_SETS},
)
MOI.check_result_index_bounds(model, attr)
return MOI.get(model, MOI.VariablePrimal(), MOI.VariableIndex(c.value))
Expand Down Expand Up @@ -631,15 +606,14 @@ function MOI.get(
c.value;
own = true,
)
else
error("Dual solution not available")
end
return error("Dual solution not available")
end

function MOI.get(
model::Optimizer,
attr::MOI.ConstraintDual,
c::MOI.ConstraintIndex{MOI.SingleVariable,MOI.LessThan{Float64}},
c::MOI.ConstraintIndex{MOI.VariableIndex,MOI.LessThan{Float64}},
)
MOI.check_result_index_bounds(model, attr)
if MOI.get(model, MOI.DualStatus()) == MOI.INFEASIBILITY_CERTIFICATE
Expand All @@ -657,7 +631,7 @@ end
function MOI.get(
model::Optimizer,
attr::MOI.ConstraintDual,
c::MOI.ConstraintIndex{MOI.SingleVariable,MOI.GreaterThan{Float64}},
c::MOI.ConstraintIndex{MOI.VariableIndex,MOI.GreaterThan{Float64}},
)
MOI.check_result_index_bounds(model, attr)
if MOI.get(model, MOI.DualStatus()) == MOI.INFEASIBILITY_CERTIFICATE
Expand All @@ -676,7 +650,7 @@ function MOI.get(
model::Optimizer,
attr::MOI.ConstraintDual,
c::MOI.ConstraintIndex{
MOI.SingleVariable,
MOI.VariableIndex,
<:Union{MOI.Interval{Float64},MOI.EqualTo{Float64}},
},
)
Expand Down Expand Up @@ -731,9 +705,8 @@ function MOI.get(
status = _CLP_BASIS_STATUS[code]
if status == MOI.NONBASIC_AT_UPPER || status == MOI.NONBASIC_AT_LOWER
return _nonbasic_status(status, S)
else
return status
end
return status
end

function MOI.get(
Expand Down
27 changes: 0 additions & 27 deletions src/precompile.jl
View file

This file was deleted.

8 changes: 6 additions & 2 deletions test/MOI_wrapper.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ function test_SolverName()
end

function test_supports_default_copy_to()
@test !MOI.supports_incremental_interface(Clp.Optimizer(), false)
@test !MOI.supports_incremental_interface(Clp.Optimizer(), true)
@test !MOI.supports_incremental_interface(Clp.Optimizer())
return
end

Expand All @@ -44,6 +43,7 @@ function test_runtests()
exclude = [
# TODO(odow): bug in Clp.jl
"test_model_copy_to_UnsupportedAttribute",
"test_model_ModelFilter_AbstractConstraintAttribute",
# Unable to prove infeasibility
"test_conic_NormInfinityCone_INFEASIBLE",
"test_conic_NormOneCone_INFEASIBLE",
Expand Down Expand Up @@ -87,6 +87,7 @@ function test_RawOptimizerAttribute()
@test MOI.get(model, MOI.RawOptimizerAttribute("PresolveType")) == 1
MOI.set(model, MOI.RawOptimizerAttribute("PresolveType"), 0)
@test MOI.get(model, MOI.RawOptimizerAttribute("PresolveType")) == 0
return
end

function test_All_parameters()
Expand All @@ -101,6 +102,7 @@ function test_All_parameters()
MOI.set(model, MOI.RawOptimizerAttribute(key), value)
@test MOI.get(model, MOI.RawOptimizerAttribute(key)) == value
end
return
end

function test_copy_to_bug()
Expand All @@ -116,6 +118,7 @@ function test_copy_to_bug()
clp = Clp.Optimizer()
index_map = MOI.copy_to(clp, model)
@test index_map[con[1]] != index_map[con[2]]
return
end

function test_options_after_empty!()
Expand All @@ -125,6 +128,7 @@ function test_options_after_empty!()
@test MOI.get(model, MOI.Silent()) == true
MOI.empty!(model)
@test MOI.get(model, MOI.Silent()) == true
return
end

end # module TestMOIWrapper
Expand Down

0 comments on commit 87403fd

Please sign in to comment.