Skip to content

Add test_delete_bridge function #324

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 1 commit into from
Apr 20, 2018
Merged

Add test_delete_bridge function #324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
105 changes: 29 additions & 76 deletions test/bridge.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,26 @@ MOIB.@bridge RSOCtoPSD MOIB.RSOCtoPSDCBridge () () (RotatedSecondOrderCone,) ()
MOIB.@bridge LogDet MOIB.LogDetBridge () () (LogDetConeTriangle,) () () () (VectorOfVariables,) (VectorAffineFunction,)
MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (VectorOfVariables,) (VectorAffineFunction,)

# Test deletion of bridge
function test_delete_bridge(m::MOIB.AbstractBridgeOptimizer, ci::MOI.ConstraintIndex{F, S}, nvars::Int, nocs::Tuple) where {F, S}
@test MOI.get(m, MOI.NumberOfVariables()) == nvars
test_noc(m, F, S, 1)
for noc in nocs
test_noc(m, noc...)
end
@test MOI.isvalid(m, ci)
@test MOI.candelete(m, ci)
MOI.delete!(m, ci)
@test !MOI.isvalid(m, ci)
@test isempty(m.bridges)
test_noc(m, F, S, 0)
# As the bridge has been removed, if the constraints it has created where not removed, it wouldn't be there to decrease this counter anymore
@test MOI.get(m, MOI.NumberOfVariables()) == nvars
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do bridges change the value of MOI.NumberOfVariables() that's visible to users?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it adds variables as part of the reformulation, it needs to hide it from the user

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, just double checking!

for noc in nocs
test_noc(m, noc...)
end
end

@testset "Bridge tests" begin
mock = MOIU.MockOptimizer(SimpleModel{Float64}())
config = MOIT.TestConfig()
Expand All @@ -99,19 +119,8 @@ MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (V
MOI.modifyconstraint!(bridgedmock, ci, newf)
@test MOI.canget(bridgedmock, MOI.ConstraintFunction(), typeof(ci))
@test MOI.get(bridgedmock, MOI.ConstraintFunction(), ci) ≈ newf
# Test deletion
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 2
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.GreaterThan{Float64}, 0)
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}, 1)
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}, 0)
@test MOI.isvalid(bridgedmock, ci)
@test MOI.candelete(bridgedmock, ci)
MOI.delete!(bridgedmock, ci)
@test isempty(bridgedmock.bridges)
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 2
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.GreaterThan{Float64}, 0)
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}, 0)
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}, 0)
test_delete_bridge(bridgedmock, ci, 2, ((MOI.ScalarAffineFunction{Float64}, MOI.GreaterThan{Float64}, 0),
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}, 0)))
end

@testset "GeoMean" begin
Expand All @@ -122,21 +131,8 @@ MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (V
@test !MOI.canget(bridgedmock, MOI.ConstraintDual(), MOI.ConstraintIndex{MOI.VectorOfVariables, MOI.GeometricMeanCone})
ci = first(MOI.get(bridgedmock, MOI.ListOfConstraintIndices{MOI.VectorAffineFunction{Float64}, MOI.GeometricMeanCone}()))
@test !MOI.canmodifyconstraint(bridgedmock, ci, MOI.VectorAffineFunction{Float64})
# Test deletion
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 4
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.GeometricMeanCone, 1)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 0)
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}, 1)
@test MOI.isvalid(bridgedmock, ci)
@test MOI.candelete(bridgedmock, ci)
MOI.delete!(bridgedmock, ci)
@test !MOI.isvalid(bridgedmock, ci)
@test isempty(bridgedmock.bridges)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.GeometricMeanCone, 0)
# As the bridge has been removed, if the constraints it has created where not removed, it wouldn't be there to decrease this counter anymore
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 4
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 0)
test_noc(bridgedmock, MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}, 1)
test_delete_bridge(bridgedmock, ci, 4, ((MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 0),
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}, 1)))
end

@testset "SOCtoPSD" begin
Expand All @@ -148,17 +144,7 @@ MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (V
MOIT.soc1ftest(bridgedmock, config)
ci = first(MOI.get(bridgedmock, MOI.ListOfConstraintIndices{MOI.VectorAffineFunction{Float64}, MOI.SecondOrderCone}()))
@test !MOI.canmodifyconstraint(bridgedmock, ci, MOI.VectorAffineFunction{Float64})
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 3
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.SecondOrderCone, 1)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
@test MOI.isvalid(bridgedmock, ci)
@test MOI.candelete(bridgedmock, ci)
MOI.delete!(bridgedmock, ci)
@test !MOI.isvalid(bridgedmock, ci)
@test isempty(bridgedmock.bridges)
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 3
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.SecondOrderCone, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
test_delete_bridge(bridgedmock, ci, 3, ((MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0),))
end

@testset "RSOCtoPSD" begin
Expand All @@ -172,17 +158,7 @@ MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (V
MOIT.rotatedsoc1ftest(bridgedmock, config)
ci = first(MOI.get(bridgedmock, MOI.ListOfConstraintIndices{MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone}()))
@test !MOI.canmodifyconstraint(bridgedmock, ci, MOI.VectorAffineFunction{Float64})
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 2
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 1)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
@test MOI.isvalid(bridgedmock, ci)
@test MOI.candelete(bridgedmock, ci)
MOI.delete!(bridgedmock, ci)
@test !MOI.isvalid(bridgedmock, ci)
@test isempty(bridgedmock.bridges)
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 2
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
test_delete_bridge(bridgedmock, ci, 2, ((MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0),))
end

@testset "LogDet" begin
Expand All @@ -193,19 +169,7 @@ MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (V
@test !MOI.canget(bridgedmock, MOI.ConstraintDual(), MOI.ConstraintIndex{MOI.VectorAffineFunction{Float64}, MOI.LogDetConeTriangle})
ci = first(MOI.get(bridgedmock, MOI.ListOfConstraintIndices{MOI.VectorAffineFunction{Float64}, MOI.LogDetConeTriangle}()))
@test !MOI.canmodifyconstraint(bridgedmock, ci, MOI.VectorAffineFunction{Float64})
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 4
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.LogDetConeTriangle, 1)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.ExponentialCone, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
@test MOI.isvalid(bridgedmock, ci)
@test MOI.candelete(bridgedmock, ci)
MOI.delete!(bridgedmock, ci)
@test !MOI.isvalid(bridgedmock, ci)
@test isempty(bridgedmock.bridges)
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 4
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.LogDetConeTriangle, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.ExponentialCone, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
test_delete_bridge(bridgedmock, ci, 4, ((MOI.VectorAffineFunction{Float64}, MOI.ExponentialCone, 0), (MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)))
end

@testset "RootDet" begin
Expand All @@ -216,18 +180,7 @@ MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (V
@test !MOI.canget(bridgedmock, MOI.ConstraintDual(), MOI.ConstraintIndex{MOI.VectorAffineFunction{Float64}, MOI.RootDetConeTriangle})
ci = first(MOI.get(bridgedmock, MOI.ListOfConstraintIndices{MOI.VectorAffineFunction{Float64}, MOI.RootDetConeTriangle}()))
@test !MOI.canmodifyconstraint(bridgedmock, ci, MOI.VectorAffineFunction{Float64})
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 4
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RootDetConeTriangle, 1)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
@test MOI.isvalid(bridgedmock, ci)
@test MOI.candelete(bridgedmock, ci)
MOI.delete!(bridgedmock, ci)
@test !MOI.isvalid(bridgedmock, ci)
@test isempty(bridgedmock.bridges)
@test MOI.get(bridgedmock, MOI.NumberOfVariables()) == 4
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RootDetConeTriangle, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 0)
test_noc(bridgedmock, MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)
test_delete_bridge(bridgedmock, ci, 4, ((MOI.VectorAffineFunction{Float64}, MOI.RotatedSecondOrderCone, 0),
(MOI.VectorAffineFunction{Float64}, MOI.PositiveSemidefiniteConeTriangle, 0)))
end
end