Skip to content

Fix fallback load_constraint #760

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
Jun 9, 2019
Merged

Fix fallback load_constraint #760

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
4 changes: 2 additions & 2 deletions src/Utilities/copy.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ end

Sets the constraint function and set for the constraint of index `ci`.
"""
function load_constraint(model::MOI.ModelLike, func::MOI.AbstractFunction,
set::MOI.AbstractSet)
function load_constraint(model::MOI.ModelLike, ::MOI.ConstraintIndex,
func::MOI.AbstractFunction, set::MOI.AbstractSet)
MOI.throw_add_constraint_error_fallback(model, func, set;
error_if_supported=ALLOCATE_LOAD_NOT_IMPLEMENTED)
end
Expand Down
30 changes: 21 additions & 9 deletions test/errors.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,21 @@
MOI.add_constraint(model, func, MOI.Nonnegatives(2))
end
end
@testset "Unsupported constraint with $f" for f in (MOI.add_constraint,
MOIU.allocate_constraint,
MOIU.load_constraint)
@testset "Unsupported constraint with $f" for f in (
MOI.add_constraint, MOIU.allocate_constraint,
(model, func, set) -> MOIU.load_constraint(model, MOI.ConstraintIndex{typeof(func), typeof(set)}(1), func, set))
@test_throws MOI.UnsupportedConstraint begin
MOI.add_constraint(model, func, MOI.EqualTo(0))
f(model, func, MOI.EqualTo(0))
end
try
MOI.add_constraint(model, func, MOI.EqualTo(0))
f(model, func, MOI.EqualTo(0))
catch err
@test sprint(showerror, err) == "$MOI.UnsupportedConstraint{$MOI.SingleVariable,$MOI.EqualTo{$Int}}:" *
" `$MOI.SingleVariable`-in-`$MOI.EqualTo{$Int}` constraint is" *
" not supported by the model."
end
end
@testset "Unsupported constraint for shortcuts" begin
@test_throws MOI.UnsupportedConstraint begin
MOI.add_constraint(model, vi, MOI.EqualTo(0))
end
Expand Down Expand Up @@ -76,13 +78,23 @@
end
end

@testset "$f errors" for f in (MOIU.allocate_constraint,
MOIU.load_constraint)
@testset "allocate_constraint errors" begin
@test_throws MOI.ErrorException begin
MOIU.allocate_constraint(model, func, MOI.EqualTo(0.0))
end
try
MOIU.allocate_constraint(model, func, MOI.EqualTo(0.0))
catch err
@test err === MOIU.ALLOCATE_LOAD_NOT_IMPLEMENTED
end
end
@testset "load_constraint errors" begin
ci = MOI.ConstraintIndex{typeof(func), MOI.EqualTo{Float64}}(1)
@test_throws MOI.ErrorException begin
f(model, func, MOI.EqualTo(0.0))
MOIU.load_constraint(model, ci, func, MOI.EqualTo(0.0))
end
try
f(model, func, MOI.EqualTo(0.0))
MOIU.load_constraint(model, ci, func, MOI.EqualTo(0.0))
catch err
@test err === MOIU.ALLOCATE_LOAD_NOT_IMPLEMENTED
end
Expand Down