Skip to content

Doubled methods removed #711

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
Apr 23, 2019
Merged

Doubled methods removed #711

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
31d512a
remove doubled method
matbesancon Apr 18, 2019
48af5f2
join == function
matbesancon Apr 18, 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: 0 additions & 2 deletions src/Test/intlinear.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ function int1test(model::MOI.ModelLike, config::TestConfig)
end
end

Base.isapprox(a::T, b::T; kwargs...) where T <: Union{MOI.SOS1, MOI.SOS2} = isapprox(a.weights, b.weights; kwargs...)

# sos from CPLEX.jl" begin
function int2test(model::MOI.ModelLike, config::TestConfig)
atol = config.atol
Expand Down
8 changes: 2 additions & 6 deletions src/sets.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,6 @@ struct SOS1{T <: Real} <: AbstractVectorSet
weights::Vector{T}
end

Base.:(==)(a::SOS1{T}, b::SOS1{T}) where T = a.weights == b.weights
Base.isapprox(a::SOS1{T}, b::SOS1{T}; kwargs...) where T = isapprox(a.weights, b.weights; kwargs...)

"""
SOS2{T <: Real}(weights::Vector{T})

Expand All @@ -433,12 +430,11 @@ struct SOS2{T <: Real} <: AbstractVectorSet
weights::Vector{T}
end

Base.:(==)(a::SOS2{T}, b::SOS2{T}) where T = a.weights == b.weights
Base.isapprox(a::SOS2{T}, b::SOS2{T}; kwargs...) where T = isapprox(a.weights, b.weights; kwargs...)
Base.:(==)(a::T, b::T) where {T <: Union{SOS1, SOS2}} = a.weights == b.weights
Base.isapprox(a::T, b::T; kwargs...) where {T <: Union{SOS1, SOS2}} = isapprox(a.weights, b.weights; kwargs...)

dimension(s::Union{SOS1, SOS2}) = length(s.weights)


# isbits types, nothing to copy
function Base.copy(set::Union{Reals, Zeros, Nonnegatives, Nonpositives,
GreaterThan, LessThan, EqualTo, Interval,
Expand Down