Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions src/MOI_wrapper/MOI_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ function MOI.Utilities.load_constants(
return
end

function MOI.Utilities.function_constants(x::_SetConstants, rows)
return MOI.Utilities.function_constants(x.b, rows)
end

function MOI.Utilities.set_from_constants(x::_SetConstants, S, rows)
return MOI.Utilities.set_from_constants(x.b, S, rows)
end
Expand Down
45 changes: 1 addition & 44 deletions src/MOI_wrapper/sets/ComplexPositiveSemidefiniteConeTriangle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,6 @@ function MOI.dimension(x::ComplexPositiveSemidefiniteConeTriangle)
return x.side_dimension^2
end

function MOI.Utilities.set_dot(
x::AbstractVector{S},
y::AbstractVector{T},
set::ComplexPositiveSemidefiniteConeTriangle,
) where {S,T}
U = promote_type(S, T)
result = zero(U)
d = set.side_dimension
k = 0
for j in 1:d
for i in 1:j-1
k += 1
result += 2 * x[k] * y[k]
k += 1
result += 2 * x[k] * y[k]
end
k += 1
result += x[k] * y[k]
end
return result
end

function MOI.Utilities.set_dot(
x::MOI.Utilities.CanonicalVector{T},
y::MOI.Utilities.CanonicalVector{T},
Expand All @@ -66,28 +44,7 @@ function MOI.Utilities.set_dot(
end
end

function MOI.Utilities.dot_coefficients(
a::AbstractVector,
set::ComplexPositiveSemidefiniteConeTriangle,
)
d = set.side_dimension
b = copy(a)
k = 0
for j in 1:d
for i in 1:j-1
k += 1
b[k] /= 2
k += 1
b[k] /= 2
end
k += 1
end
return b
end

function MOI.is_set_dot_scaled(::Type{ComplexPositiveSemidefiniteConeTriangle})
return true
end
MOI.is_set_dot_scaled(::Type{ComplexPositiveSemidefiniteConeTriangle}) = true

struct HermitianComplexPSDConeBridge{T,F} <:
MOI.Bridges.Constraint.SetMapBridge{
Expand Down
26 changes: 26 additions & 0 deletions test/MOI_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,32 @@ function test_NormNuclearConeBridge()
return
end

function test_HermitianComplexPSDConeBridge()
MOI.Bridges.runtests(
SCS.HermitianComplexPSDConeBridge,
"""
variables: x1, x2, x3, x4
[x1, x2, x3, x4] in MOI.HermitianPositiveSemidefiniteConeTriangle(2)
""",
"""
variables: x1, x2, x3, x4
[x1, x2, x4, x3] in SCS.ComplexPositiveSemidefiniteConeTriangle(2)
""",
)
MOI.Bridges.runtests(
SCS.HermitianComplexPSDConeBridge,
"""
variables: x1, x2, x3, x4, x5, x6, x7, x8, x9
[x1, x2, x3, x4, x5, x6, x7, x8, x9] in MOI.HermitianPositiveSemidefiniteConeTriangle(3)
""",
"""
variables: x1, x2, x3, x4, x5, x6, x7, x8, x9
[x1, x2, x7, x3, x4, x8, x5, x9, x6] in SCS.ComplexPositiveSemidefiniteConeTriangle(3)
""",
)
return
end

end # module

TestSCS.runtests()
Loading