Skip to content

fix ambiguity #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 28, 2019
Merged

fix ambiguity #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8aacba9
fix ambiguity
matbesancon May 23, 2019
5720668
use concrete bridge type
matbesancon May 24, 2019
1b55be7
concrete bridge tests
matbesancon May 28, 2019
9c00b02
fix subtyping
matbesancon May 28, 2019
a9853a4
bridge constraint concrete type
matbesancon May 28, 2019
c6eea12
fix test
matbesancon May 28, 2019
9c03f61
remove BT
matbesancon May 28, 2019
1bf0674
subtype directly in-place
matbesancon May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/Bridges/indicatorbridge.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct IndicatorActiveOnFalseBridge{T, F <: MOI.AbstractVectorFunction, S <: MOI
indicator_cons_index::MOI.ConstraintIndex{F, MOI.IndicatorSet{MOI.ACTIVATE_ON_ONE, S}}
end

function bridge_constraint(::Type{<:IndicatorActiveOnFalseBridge}, model::MOI.ModelLike, f::MOI.VectorAffineFunction{T}, s::IS) where {S <: MOI.AbstractScalarSet, T <: Real, F, IS <: MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO, S}}
function bridge_constraint(::Type{IndicatorActiveOnFalseBridge{T,F,S}}, model::MOI.ModelLike, f::MOI.VectorAffineFunction{T}, s::IS) where {S <: MOI.AbstractScalarSet, T <: Real, F, IS <: MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO, S}}
z1 = f.terms[1].scalar_term.variable_index
z2 = MOI.add_variable(model)
zo_cons = MOI.add_constraint(model, MOI.SingleVariable(z2), MOI.ZeroOne())
Expand All @@ -36,13 +36,12 @@ function bridge_constraint(::Type{<:IndicatorActiveOnFalseBridge}, model::MOI.Mo
f.constants
)
ci = MOI.add_constraint(model, f2, MOI.IndicatorSet{MOI.ACTIVATE_ON_ONE}(s.set))

return IndicatorActiveOnFalseBridge{T, MOI.VectorAffineFunction{T}, S}(z2, zo_cons, dcons, ci)
return IndicatorActiveOnFalseBridge{T,F,S}(z2, zo_cons, dcons, ci)
end

function MOI.supports_constraint(::Type{<:IndicatorActiveOnFalseBridge},
function MOI.supports_constraint(::Type{<:IndicatorActiveOnFalseBridge{T}},
::Type{<:MOI.VectorAffineFunction},
::Type{<:MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO}})
::Type{<:MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO}}) where {T}
return true
end

Expand All @@ -52,6 +51,12 @@ end

function concrete_bridge_type(::Type{<:IndicatorActiveOnFalseBridge{T}},
::Type{F},
::Type{MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO, S}}) where {T, F, S}
::Type{MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO, S}}) where {T, F<:MOI.VectorAffineFunction, S<:MOI.AbstractScalarSet}
return IndicatorActiveOnFalseBridge{T, F, S}
end

function concrete_bridge_type(::Type{<:IndicatorActiveOnFalseBridge},
::Type{F},
::Type{MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO, S}}) where {F<:MOI.VectorAffineFunction, S<:MOI.AbstractScalarSet}
return IndicatorActiveOnFalseBridge{Float64, F, S}
end
8 changes: 7 additions & 1 deletion test/Bridges/indicator_bridge.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ include("../model.jl")
)
iset1 = MOI.IndicatorSet{MOI.ACTIVATE_ON_ZERO}(MOI.LessThan(8.0))

bridge = MOIB.bridge_constraint(MOIB.IndicatorActiveOnFalseBridge, model, f1, iset1)

BT = MOIB.concrete_bridge_type(MOIB.IndicatorActiveOnFalseBridge{Float64}, typeof(f1), typeof(iset1))
BT2 = MOIB.concrete_bridge_type(MOIB.IndicatorActiveOnFalseBridge, typeof(f1), typeof(iset1))
bridge = MOIB.bridge_constraint(BT, model, f1, iset1)

@test BT == BT2
@test bridge isa BT

z1comp = bridge.variable_index
@test MOI.get(model, MOI.ConstraintFunction(), bridge.zero_one_cons) == MOI.SingleVariable(z1comp)
Expand Down