Skip to content

Fix is_canonical for SQF, VQF #1081

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
May 11, 2020
Merged

Fix is_canonical for SQF, VQF #1081

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e946dc3
Merge pull request #1 from JuliaOpt/master
mewilhel May 3, 2020
5eef18c
Fix is_canonical for SQF, VQF
mewilhel May 3, 2020
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
18 changes: 15 additions & 3 deletions src/Utilities/functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,17 +364,29 @@ function unsafe_add(t1::VT, t2::VT) where VT <: Union{MOI.VectorAffineTerm,
end

"""
is_canonical(f::Union{ScalarAffineFunction, ScalarQuadraticFunction
VectorAffineFunction, VectorQuadraticTerm})
is_canonical(f::Union{ScalarAffineFunction, VectorAffineFunction})

Returns a Bool indicating whether the function is in canonical form.
See [`canonical`](@ref).
"""
function is_canonical(f::Union{SAF, VAF, SQF, VQF})
function is_canonical(f::Union{SAF, VAF})
is_strictly_sorted(f.terms, MOI.term_indices,
t -> !iszero(MOI.coefficient(t)))
end

"""
is_canonical(f::Union{ScalarQuadraticFunction, VectorQuadraticFunction})

Returns a Bool indicating whether the function is in canonical form.
See [`canonical`](@ref).
"""
function is_canonical(f::Union{SQF, VQF})
v = is_strictly_sorted(f.affine_terms, MOI.term_indices,
t -> !iszero(MOI.coefficient(t)))
v &= is_strictly_sorted(f.quadratic_terms, MOI.term_indices,
t -> !iszero(MOI.coefficient(t)))
end

"""
is_strictly_sorted(x::AbstractVector, by, filter)

Expand Down