Skip to content

Remove variables instead of substracting it #754

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
May 31, 2019
Merged

Remove variables instead of substracting it #754

Show file tree
Hide file tree
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
6 changes: 2 additions & 4 deletions src/Bridges/slackbridge.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ end

function MOI.get(model::MOI.ModelLike, attr::MOI.ConstraintFunction,
b::ScalarSlackBridge{T}) where T
return MOIU.operate(+, T, MOI.get(model, attr, b.equality),
MOI.SingleVariable(b.slack))
return MOIU.removevariable(MOI.get(model, attr, b.equality), b.slack)
end
function MOI.get(model::MOI.ModelLike, attr::MOI.ConstraintSet,
b::ScalarSlackBridge)
Expand Down Expand Up @@ -192,8 +191,7 @@ end

function MOI.get(model::MOI.ModelLike, attr::MOI.ConstraintFunction,
b::VectorSlackBridge{T}) where T
return MOIU.operate(+, T, MOI.get(model, attr, b.equality),
MOI.VectorOfVariables(b.slacks))
return MOIU.removevariable(MOI.get(model, attr, b.equality), b.slacks)
end
function MOI.get(model::MOI.ModelLike, attr::MOI.ConstraintSet,
b::VectorSlackBridge)
Expand Down
19 changes: 18 additions & 1 deletion src/Test/UnitTests/basic_constraint_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,21 @@ function basic_constraint_tests(model::MOI.ModelLike, config::TestConfig;
end
end

variables(func::MOI.SingleVariable) = func.variable
variables(func::MOI.VectorOfVariables) = func.variables
variables(func::MOI.ScalarAffineFunction) = Set(term.variable_index for term in func.terms)
variables(func::MOI.VectorAffineFunction) = Set(term.scalar_term.variable_index for term in func.terms)
function variables(func::MOI.ScalarQuadraticFunction)
return Set(term.variable_index for term in func.affine_terms) ∪
Set(term.variable_index_1 for term in func.quadratic_terms)
Set(term.variable_index_2 for term in func.quadratic_terms)
end
function variables(func::MOI.VectorQuadraticFunction)
return Set(term.scalar_term.variable_index for term in func.affine_terms) ∪
Set(term.scalar_term.variable_index_1 for term in func.quadratic_terms)
Set(term.scalar_term.variable_index_2 for term in func.quadratic_terms)
end

"""
basic_constraint_test_helper(model::MOI.ModelLike, config::TestConfig, func::Function, set::MOI.AbstractSet, N::Int;
delete::Bool = true,
Expand Down Expand Up @@ -188,7 +203,9 @@ function basic_constraint_test_helper(model::MOI.ModelLike, config::TestConfig,

if get_constraint_function
@testset "ConstraintFunction" begin
@test MOI.get(model, MOI.ConstraintFunction(), c) ≈ constraint_function
func = MOI.get(model, MOI.ConstraintFunction(), c)
@test func ≈ constraint_function
@test variables(func) == variables(constraint_function)
end
end
if get_constraint_set
Expand Down
9 changes: 5 additions & 4 deletions src/Utilities/functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,12 +449,13 @@ function test_models_equal(model1::MOI.ModelLike, model2::MOI.ModelLike, variabl
end


_hasvar(v::VI, vi::Vector{VI}) = v in vi
_hasvar(v::VI, vi::VI) = v == vi
_hasvar(t::MOI.ScalarAffineTerm, vi::VI) = t.variable_index == vi
_hasvar(t::MOI.ScalarQuadraticTerm, vi::VI) = t.variable_index_1 == vi || t.variable_index_2 == vi
_hasvar(t::Union{MOI.VectorAffineTerm, MOI.VectorQuadraticTerm}, vi::VI) = _hasvar(t.scalar_term, vi)
_hasvar(t::MOI.ScalarAffineTerm, vi) = _hasvar(t.variable_index, vi)
_hasvar(t::MOI.ScalarQuadraticTerm, vi) = _hasvar(t.variable_index_1, vi) || _hasvar(t.variable_index_2, vi)
_hasvar(t::Union{MOI.VectorAffineTerm, MOI.VectorQuadraticTerm}, vi) = _hasvar(t.scalar_term, vi)
# Removes terms or variables in `vis_or_terms` that contains the variable of index `vi`
function _rmvar(vis_or_terms::Vector, vi::VI)
function _rmvar(vis_or_terms::Vector, vi)
return vis_or_terms[.!_hasvar.(vis_or_terms, Ref(vi))]
end

Expand Down
5 changes: 3 additions & 2 deletions test/Bridges/slackbridge.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ config = MOIT.TestConfig()
@testset "Scalar slack" begin
MOI.empty!(mock)
bridged_mock = MOIB.ScalarSlack{Float64}(mock)

x = MOI.add_variable(bridged_mock)
y = MOI.add_variable(bridged_mock)
f = MOI.ScalarAffineFunction(MOI.ScalarAffineTerm{Float64}.([1.0, 2.0], [x, y]), 0.0)
Expand All @@ -37,8 +38,7 @@ config = MOIT.TestConfig()
F in [MOI.ScalarAffineFunction{Float64},
MOI.ScalarQuadraticFunction{Float64}],
S in [MOI.GreaterThan{Float64},
MOI.LessThan{Float64}]
])
MOI.LessThan{Float64}]])

# There are extra variables due to the bridge
MOIU.set_mock_optimize!(mock,
Expand Down Expand Up @@ -88,6 +88,7 @@ end
@testset "Vector slack" begin
MOI.empty!(mock)
bridged_mock = MOIB.VectorSlack{Float64}(mock)

x = MOI.add_variable(bridged_mock)
y = MOI.add_variable(bridged_mock)
f = MOI.VectorAffineFunction(MOI.VectorAffineTerm.(1, MOI.ScalarAffineTerm.([1.0, 2.0], [x, y])), [0.0])
Expand Down