Skip to content

Fix broadcast for scalar sets #798

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 2 commits into from
Jul 19, 2019
Merged

Fix broadcast for scalar sets #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed08ee9
Fix broadcast for scalar sets
blegat Jul 19, 2019
9a83068
Address comments
blegat Jul 19, 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
2 changes: 2 additions & 0 deletions src/sets.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Abstract supertype for subsets of ``\\mathbb{R}``.
"""
abstract type AbstractScalarSet <: AbstractSet end

Base.broadcastable(set::AbstractScalarSet) = Ref(set)

dimension(s::AbstractScalarSet) = 1

"""
Expand Down
17 changes: 16 additions & 1 deletion test/sets.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
using Test

using MathOptInterface
const MOI = MathOptInterface

include("dummy.jl")

"""
MutLessThan{T<:Real} <: MOI.AbstractScalarSet

Expand Down Expand Up @@ -32,7 +39,15 @@ Base.copy(mlt::MutLessThan) = MutLessThan(Base.copy(mlt.upper))
@test s3.set.upper ≈ 4.0
s3_copy.set.upper = 5.0
@test s3.set.upper ≈ 4.0
@test s3_copy.set.upper ≈ 5.0
@test s3_copy.set.upper ≈ 5.0
end
end
@testset "Broadcast" begin
model = DummyModelWithAdd()
x = MOI.add_variables(model, 3)
cis = MOI.add_constraint.(model, x, MOI.EqualTo(0.0))
@test cis isa Vector{MOI.ConstraintIndex{MOI.SingleVariable,
MOI.EqualTo{Float64}}}
@test length(cis) == 3
end
end