diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl index fbfb78f..1b643be 100644 --- a/src/MOI_wrapper.jl +++ b/src/MOI_wrapper.jl @@ -105,8 +105,7 @@ end function MOI.supports( optimizer::Optimizer, ::Union{MOI.ObjectiveSense, - MOI.ObjectiveFunction{<:Union{MOI.SingleVariable, - MOI.ScalarAffineFunction{Cdouble}}}}) + MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Cdouble}}}) return true end @@ -135,7 +134,7 @@ function MOIU.allocate(optimizer::Optimizer, ::MOI.ObjectiveSense, sense::MOI.Op # To be sure that it is done before load(optimizer, ::ObjectiveFunction, ...), we do it in allocate optimizer.objsign = sense == MOI.MIN_SENSE ? -1 : 1 end -function MOIU.allocate(::Optimizer, ::MOI.ObjectiveFunction, ::Union{MOI.SingleVariable, MOI.ScalarAffineFunction}) end +function MOIU.allocate(::Optimizer, ::MOI.ObjectiveFunction, ::MOI.ScalarAffineFunction) end function MOIU.load(::Optimizer, ::MOI.ObjectiveSense, ::MOI.OptimizationSense) end # Loads objective coefficient α * vi @@ -157,9 +156,6 @@ function MOIU.load(optimizer::Optimizer, ::MOI.ObjectiveFunction, f::MOI.ScalarA end end end -function MOIU.load(optimizer::Optimizer, ::MOI.ObjectiveFunction, f::MOI.SingleVariable) - load_objective_term!(optimizer, one(Cdouble), f.variable) -end function new_block(optimizer::Optimizer, set::MOI.Nonnegatives) push!(optimizer.blockdims, -MOI.dimension(set))