Skip to content

Commit e81356a

Browse files
committed
remove restriction on dimensions
1 parent cae2e41 commit e81356a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/Test/contconic.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,12 +1999,11 @@ function normspec2test(model::MOI.ModelLike, config::TestConfig)
19991999

20002000
if config.duals
20012001
invrt3 = inv(rt3)
2002-
@test MOI.get(model, MOI.ConstraintDual(), spec) Float64[1, 0, invrt3, -invrt3, 0, 0, -invrt3] atol=atol rtol=rtol
2002+
@test MOI.get(model, MOI.ConstraintDual(), spec) Float64[1, 0, 0, 0, -invrt3, invrt3, -invrt3] atol=atol rtol=rtol
20032003
end
20042004
end
20052005
end
20062006

2007-
20082007
normspectests = Dict(
20092008
"normspec1" => normspec1test,
20102009
"normspec2" => normspec2test,
@@ -2120,7 +2119,7 @@ function normnuc2test(model::MOI.ModelLike, config::TestConfig)
21202119
if config.duals
21212120
invrt2 = inv(rt2)
21222121
invrt3 = inv(rt3)
2123-
@test MOI.get(model, MOI.ConstraintDual(), nuc) Float64[1, -invrt2, invrt3, -invrt3, 0, -invrt2, -invrt3] atol=atol rtol=rtol
2122+
@test MOI.get(model, MOI.ConstraintDual(), nuc) Float64[1, -invrt2, -invrt2, 0, -invrt3, invrt3, -invrt3] atol=atol rtol=rtol
21242123
end
21252124
end
21262125
end

src/sets.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ end
290290
"""
291291
NormSpectralCone(row_dim, column_dim)
292292
293-
The epigraph of the matrix spectral norm (maximum singular value function) ``\\{ (t, X) \\in \\mathbb{R}^{1 + row_dim \\times column_dim} : t \\ge \\sigma_1(X) \\}`` where ``\\sigma_i`` is the ``i``th singular value of the matrix ``X`` of row dimension `row_dim` and column dimension `column_dim`, with ``row_dim \\le column_dim`` (without loss of generality, since ``\\sigma_i(X) = \\sigma_i(X^\\top)``).
293+
The epigraph of the matrix spectral norm (maximum singular value function) ``\\{ (t, X) \\in \\mathbb{R}^{1 + row_dim \\times column_dim} : t \\ge \\sigma_1(X) \\}`` where ``\\sigma_i`` is the ``i``th singular value of the matrix ``X`` of row dimension `row_dim` and column dimension `column_dim`.
294294
The matrix X is vectorized by stacking the columns, matching the behavior of Julia's `vec` function.
295295
"""
296296
struct NormSpectralCone <: AbstractVectorSet
@@ -303,7 +303,7 @@ dual_set(s::NormSpectralCone) = NormNuclearCone(s.row_dim, s.column_dim)
303303
"""
304304
NormNuclearCone(row_dim, column_dim)
305305
306-
The epigraph of the matrix nuclear norm (sum of singular values function) ``\\{ (t, X) \\in \\mathbb{R}^{1 + row_dim \\times column_dim} : t \\ge \\sum_i \\sigma_i(X) \\}`` where ``\\sigma_i`` is the ``i``th singular value of the matrix ``X`` of row dimension `row_dim` and column dimension `column_dim`, with ``row_dim \\le column_dim`` (without loss of generality, since ``\\sigma_i(X) = \\sigma_i(X^\\top)``).
306+
The epigraph of the matrix nuclear norm (sum of singular values function) ``\\{ (t, X) \\in \\mathbb{R}^{1 + row_dim \\times column_dim} : t \\ge \\sum_i \\sigma_i(X) \\}`` where ``\\sigma_i`` is the ``i``th singular value of the matrix ``X`` of row dimension `row_dim` and column dimension `column_dim`.
307307
The matrix X is vectorized by stacking the columns, matching the behavior of Julia's `vec` function.
308308
"""
309309
struct NormNuclearCone <: AbstractVectorSet

0 commit comments

Comments
 (0)