From 0a6211cd29634c4b07da70bc4ceeb07bd8331e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Sun, 25 Aug 2019 14:10:18 +0200 Subject: [PATCH] Remove MOIBC --- src/JuMP.jl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/JuMP.jl b/src/JuMP.jl index 1ab3fb9d825..1fcdca90fb3 100644 --- a/src/JuMP.jl +++ b/src/JuMP.jl @@ -16,7 +16,6 @@ using SparseArrays import MathOptInterface const MOI = MathOptInterface const MOIU = MOI.Utilities -const MOIBC = MOI.Bridges.Constraint import Calculus import DataStructures.OrderedDict @@ -319,36 +318,36 @@ function bridge_constraints(model::Model) end function _moi_add_bridge(model::Nothing, - BridgeType::Type{<:MOIBC.AbstractBridge}) + BridgeType::Type{<:MOIB.AbstractBridge}) # No optimizer is attached, the bridge will be added when one is attached return end function _moi_add_bridge(model::MOI.ModelLike, - BridgeType::Type{<:MOIBC.AbstractBridge}) + BridgeType::Type{<:MOIB.AbstractBridge}) error("Cannot add bridge if `bridge_constraints` was set to `false` in the", " `Model` constructor.") end function _moi_add_bridge(bridge_opt::MOI.Bridges.LazyBridgeOptimizer, - BridgeType::Type{<:MOIBC.AbstractBridge}) + BridgeType::Type{<:MOIB.AbstractBridge}) MOI.Bridges.add_bridge(bridge_opt, BridgeType{Float64}) return end function _moi_add_bridge(caching_opt::MOIU.CachingOptimizer, - BridgeType::Type{<:MOIBC.AbstractBridge}) + BridgeType::Type{<:MOIB.AbstractBridge}) _moi_add_bridge(caching_opt.optimizer, BridgeType) return end """ add_bridge(model::Model, - BridgeType::Type{<:MOIBC.AbstractBridge}) + BridgeType::Type{<:MOIB.AbstractBridge}) Add `BridgeType` to the list of bridges that can be used to transform unsupported constraints into an equivalent formulation using only constraints supported by the optimizer. """ function add_bridge(model::Model, - BridgeType::Type{<:MOIBC.AbstractBridge}) + BridgeType::Type{<:MOIB.AbstractBridge}) push!(model.bridge_types, BridgeType) # The type of `backend(model)` is not type-stable, so we use a function # barrier (`_moi_add_bridge`) to improve performance.