Fix ambiguities found by Aqua (#647)

Author: odow

src/atoms/VcatAtom.jl

@@ -127,3 +127,7 @@ function Base.getindex(x::VcatAtom, inds::AbstractVector{<:Real})
     remaining = VcatAtom(keep_children...)
     return IndexAtom(remaining, inds)
 end
+
+function Base.getindex(x::VcatAtom, inds::AbstractVector{Bool})
+    return getindex(x, first.(filter!(last, collect(enumerate(inds)))))
+end

src/constraints/GenericConstraint.jl

@@ -96,7 +96,11 @@ function _add_constraint!(context::Context, c::GenericConstraint)
     return
 end
 
-function populate_dual!(model::MOI.ModelLike, c::GenericConstraint, indices)
+function populate_dual!(
+    model::MOI.ModelLike,
+    c::GenericConstraint,
+    indices::MOI.ConstraintIndex,
+)
     ret = MOI.get(model, MOI.ConstraintDual(), indices)
     c.dual = output(reshape(ret, c.child.size))
     return
@@ -241,7 +245,11 @@ end
 
 head(io::IO, ::MOI.PositiveSemidefiniteConeSquare) = print(io, "PSD")
 
-function is_feasible(x, ::MOI.PositiveSemidefiniteConeSquare, tol)
+function is_feasible(
+    x::AbstractMatrix,
+    ::MOI.PositiveSemidefiniteConeSquare,
+    tol,
+)
     return x ≈ transpose(x) && LinearAlgebra.eigmin(x) >= -tol
 end
 

src/problems.jl

@@ -186,9 +186,10 @@ end
 function Problem{T}(
     head::Symbol,
     objective::AbstractExpr,
+    constraint::Constraint,
     constraints::Constraint...,
 ) where {T<:Real}
-    return Problem{T}(head, objective, [constraints...])
+    return Problem{T}(head, objective, [constraint, constraints...])
 end
 
 # Allow users to simply type minimize

src/reformulations/quadform.jl

@@ -66,7 +66,7 @@ Represents `x' * A * x` where either:
    semidefinite or negative semidefinite.
  * or `A` is a matrix-valued variable and `x` is a vector.
 """
-quadform(x::Value, A::AbstractExpr; assume_psd = false) = x' * A * x
+quadform(x::Value, A::AbstractExpr; kwargs...) = x' * A * x
 
 function quadform(x::AbstractExpr, A::Value; assume_psd = false)
     if length(size(A)) != 2 || size(A, 1) != size(A, 2)
@@ -85,15 +85,19 @@ function quadform(x::AbstractExpr, A::Value; assume_psd = false)
     return factor * square(norm2(P * x))
 end
 
-function quadform(x::Constant, A::AbstractExpr; assume_psd = false)
-    return quadform(evaluate(x), A; assume_psd)
+function quadform(x::Constant, A::AbstractExpr; kwargs...)
+    return quadform(evaluate(x), A; kwargs...)
 end
 
-function quadform(x::AbstractExpr, A::Constant; assume_psd = false)
-    return quadform(x, evaluate(A); assume_psd)
+function quadform(x::AbstractExpr, A::Constant; kwargs...)
+    return quadform(x, evaluate(A); kwargs...)
 end
 
-function quadform(x::AbstractExpr, A::AbstractExpr; assume_psd = false)
+function quadform(x::Constant, A::Constant; kwargs...)
+    return evaluate(x)' * evaluate(A) * evaluate(x)
+end
+
+function quadform(x::AbstractExpr, A::AbstractExpr; kwargs...)
     return error(
         "Convex.jl v0.13.5 introduced the ability to use `fix!`ed variables " *
         "in `quadform`. However, this did not consider the case that the " *

test/runtests.jl

@@ -21,6 +21,6 @@ end
     Aqua.test_all(Convex; ambiguities = false, piracies = false)
     # Convex currently has some light piracy of `hcat`, `vcat` and `hvcat`
     Aqua.test_piracies(Convex; treat_as_own = [hcat, vcat, hvcat])
-    # Convex currently has some ambiguities
-    Aqua.test_ambiguities(Convex; broken = true)
+    # Test ambiguities only in Convex.jl
+    Aqua.test_ambiguities(Convex)
 end

test/test_atoms.jl

@@ -866,6 +866,11 @@ function test_VcatAtom_getindex()
         @test vexity(v[5:6, 1:2]) isa Convex.ConcaveVexity
         @test vexity(v[1:3, 1]) isa Convex.ConvexVexity
     end
+    x = Variable()
+    y = square(x)
+    f = vcat(x, y)
+    @test isequal(f[[true, false]], x)
+    @test isequal(f[[false, true]], y)
     return
 end
 
@@ -2210,6 +2215,7 @@ function test_quadform()
         ErrorException("quadform only defined for Hermitian matrices"),
         quadform(Variable(2), [1 0; -2 1]),
     )
+    @test quadform(constant([1, 2]), constant([1 2; 2 3])) == 21
     return
 end