From 6bb963f38f3679b9d9b080a6f986ef65e6f86e16 Mon Sep 17 00:00:00 2001 From: odow Date: Fri, 3 Sep 2021 13:16:08 +1200 Subject: [PATCH 1/2] [Bridges] maintenance of zero_one.jl --- src/Bridges/Constraint/zero_one.jl | 37 +++++------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/src/Bridges/Constraint/zero_one.jl b/src/Bridges/Constraint/zero_one.jl index 6bd4b731f5..36e47f4dbe 100644 --- a/src/Bridges/Constraint/zero_one.jl +++ b/src/Bridges/Constraint/zero_one.jl @@ -22,14 +22,16 @@ function bridge_constraint( return ZeroOneBridge{T}(interval_index, integer_index) end -function MOIB.added_constraint_types(::Type{<:ZeroOneBridge{T}}) where {T} +function MOI.Bridges.added_constraint_types( + ::Type{<:ZeroOneBridge{T}} +) where {T} return Tuple{Type,Type}[ (MOI.VariableIndex, MOI.Interval{T}), (MOI.VariableIndex, MOI.Integer), ] end -function MOIB.added_constrained_variable_types(::Type{<:ZeroOneBridge}) +function MOI.Bridges.added_constrained_variable_types(::Type{<:ZeroOneBridge}) return Tuple{Type}[] end @@ -49,14 +51,7 @@ function MOI.supports_constraint( return true end -# Attributes, Bridge acting as a constraint -function MOI.get( - model::MOI.ModelLike, - attr::MOI.ConstraintSet, - bridge::ZeroOneBridge, -) - return MOI.ZeroOne() -end +MOI.get(::MOI.ModelLike, ::MOI.ConstraintSet, ::ZeroOneBridge) = MOI.ZeroOne() function MOI.get( model::MOI.ModelLike, @@ -74,32 +69,12 @@ end function MOI.get( model::MOI.ModelLike, - attr::Union{MOI.ConstraintPrimal,MOI.ConstraintPrimalStart}, + attr::Union{MOI.ConstraintPrimal}, bridge::ZeroOneBridge, ) return MOI.get(model, attr, bridge.interval_index) end -function MOI.supports( - ::MOI.ModelLike, - ::MOI.ConstraintPrimalStart, - ::Type{<:ZeroOneBridge}, -) - return true -end - -function MOI.set( - model::MOI.ModelLike, - attr::MOI.ConstraintPrimalStart, - bridge::ZeroOneBridge{T}, - value, -) where {T} - MOI.set(model, attr, bridge.integer_index, value) - MOI.set(model, attr, bridge.interval_index, value) - return -end - -# Attributes, Bridge acting as a model function MOI.get( ::ZeroOneBridge{T}, ::MOI.NumberOfConstraints{MOI.VariableIndex,MOI.Interval{T}}, From 599d8863f03a67c7b456ea2b457050af1cfe1455 Mon Sep 17 00:00:00 2001 From: odow Date: Fri, 3 Sep 2021 14:38:33 +1200 Subject: [PATCH 2/2] Fixes --- src/Bridges/Constraint/zero_one.jl | 2 +- test/Bridges/Constraint/zero_one.jl | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Bridges/Constraint/zero_one.jl b/src/Bridges/Constraint/zero_one.jl index 36e47f4dbe..e7b32b2f3d 100644 --- a/src/Bridges/Constraint/zero_one.jl +++ b/src/Bridges/Constraint/zero_one.jl @@ -23,7 +23,7 @@ function bridge_constraint( end function MOI.Bridges.added_constraint_types( - ::Type{<:ZeroOneBridge{T}} + ::Type{<:ZeroOneBridge{T}}, ) where {T} return Tuple{Type,Type}[ (MOI.VariableIndex, MOI.Interval{T}), diff --git a/test/Bridges/Constraint/zero_one.jl b/test/Bridges/Constraint/zero_one.jl index b09ef87e92..cbe70d8154 100644 --- a/test/Bridges/Constraint/zero_one.jl +++ b/test/Bridges/Constraint/zero_one.jl @@ -32,8 +32,6 @@ function test_ZeroOne() MOI.VariableIndex, MOI.ZeroOne, ) == bridge_type - - @test MOI.supports(bridged_mock, MOI.ConstraintPrimalStart(), bridge_type) MOI.Test.test_basic_VariableIndex_ZeroOne(bridged_mock, config) MOI.empty!(bridged_mock) MOI.Utilities.set_mock_optimize!( @@ -81,12 +79,6 @@ function test_ZeroOne() MOI.ListOfConstraintIndices{MOI.VariableIndex,MOI.ZeroOne}(), ), ) - for attr in [MOI.ConstraintPrimalStart()] - @test MOI.supports(bridged_mock, attr, typeof(ci)) - value = 1.0 - MOI.set(bridged_mock, attr, ci, value) - @test MOI.get(bridged_mock, attr, ci) ≈ value - end s = """ variables: x, y y == 1.0