From 3c17ebf76dd6cbf0b24c0c30e8b84766dde64127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 11 Dec 2024 09:26:51 +0100 Subject: [PATCH] Remove what was moved to LowRankOpt --- docs/src/background/duality.md | 4 +- docs/src/manual/standard_form.md | 2 - docs/src/reference/standard_form.md | 2 - test/Bridges/Variable/set_dot.jl | 72 ----------------------------- test/sets.jl | 1 - 5 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 test/Bridges/Variable/set_dot.jl diff --git a/docs/src/background/duality.md b/docs/src/background/duality.md index f1c56d27f5..1042e2b5eb 100644 --- a/docs/src/background/duality.md +++ b/docs/src/background/duality.md @@ -113,9 +113,7 @@ and similarly, the dual is: The scalar product is different from the canonical one for the sets [`PositiveSemidefiniteConeTriangle`](@ref), [`LogDetConeTriangle`](@ref), -[`RootDetConeTriangle`](@ref), -[`SetDotProducts`](@ref) and -[`LinearCombinationInSet`](@ref). +[`RootDetConeTriangle`](@ref). If the set ``C_i`` of the section [Duality](@ref) is one of these three cones, then the rows of the matrix ``A_i`` corresponding to off-diagonal entries are diff --git a/docs/src/manual/standard_form.md b/docs/src/manual/standard_form.md index 4596021400..57b8a8e2d2 100644 --- a/docs/src/manual/standard_form.md +++ b/docs/src/manual/standard_form.md @@ -82,8 +82,6 @@ The vector-valued set types implemented in MathOptInterface.jl are: | [`RelativeEntropyCone(d)`](@ref MathOptInterface.RelativeEntropyCone) | ``\{ (u, v, w) \in \mathbb{R}^{d} : u \ge \sum_i w_i \log (\frac{w_i}{v_i}), v_i \ge 0, w_i \ge 0 \}`` | | [`HyperRectangle(l, u)`](@ref MathOptInterface.HyperRectangle) | ``\{x \in \bar{\mathbb{R}}^d: x_i \in [l_i, u_i] \forall i=1,\ldots,d\}`` | | [`NormCone(p, d)`](@ref MathOptInterface.NormCone) | ``\{ (t,x) \in \mathbb{R}^{d} : t \ge \left(\sum\limits_i \lvert x_i \rvert^p\right)^{\frac{1}{p}} \}`` | -| [`SetDotProducts(s, v)`](@ref MathOptInterface.SetDotProducts) | The cone `s` with dot products with the fixed vectors `v`. | -| [`LinearCombinationInSet(s, v)`](@ref MathOptInterface.LinearCombinationInSet) | The cone of vector `(y, x)` such that ``\sum_i y_i v_i + x`` belongs to `s`. | ## Matrix cones diff --git a/docs/src/reference/standard_form.md b/docs/src/reference/standard_form.md index 3c62a6b632..98ff739a33 100644 --- a/docs/src/reference/standard_form.md +++ b/docs/src/reference/standard_form.md @@ -153,6 +153,4 @@ LogDetConeTriangle LogDetConeSquare RootDetConeTriangle RootDetConeSquare -SetDotProducts -LinearCombinationInSet ``` diff --git a/test/Bridges/Variable/set_dot.jl b/test/Bridges/Variable/set_dot.jl deleted file mode 100644 index b9a52377a9..0000000000 --- a/test/Bridges/Variable/set_dot.jl +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (c) 2017: Miles Lubin and contributors -# Copyright (c) 2017: Google Inc. -# -# Use of this source code is governed by an MIT-style license that can be found -# in the LICENSE.md file or at https://opensource.org/licenses/MIT. - -module TestVariableDotProducts - -using Test - -import MathOptInterface as MOI - -function runtests() - for name in names(@__MODULE__; all = true) - if startswith("$(name)", "test_") - @testset "$(name)" begin - getfield(@__MODULE__, name)() - end - end - end - return -end - -include("../utilities.jl") - -function test_psd() - MOI.Bridges.runtests( - MOI.Bridges.Variable.DotProductsBridge, - model -> begin - x, _ = MOI.add_constrained_variables( - model, - MOI.SetDotProducts( - MOI.PositiveSemidefiniteConeTriangle(2), - MOI.TriangleVectorization.([ - [ - 1 2.0 - 2 3 - ], - [ - 4 5.0 - 5 6 - ], - ]), - ), - ) - MOI.add_constraint(model, 1.0x[1], MOI.EqualTo(0.0)) - MOI.add_constraint(model, 1.0x[2], MOI.LessThan(0.0)) - end, - model -> begin - Q, _ = MOI.add_constrained_variables( - model, - MOI.PositiveSemidefiniteConeTriangle(2), - ) - MOI.add_constraint( - model, - 1.0 * Q[1] + 4.0 * Q[2] + 3.0 * Q[3], - MOI.EqualTo(0.0), - ) - MOI.add_constraint( - model, - 4.0 * Q[1] + 10.0 * Q[2] + 6.0 * Q[3], - MOI.LessThan(0.0), - ) - end; - cannot_unbridge = true, - ) - return -end - -end # module - -TestVariableDotProducts.runtests() diff --git a/test/sets.jl b/test/sets.jl index 952cf7ce49..bf52326974 100644 --- a/test/sets.jl +++ b/test/sets.jl @@ -8,7 +8,6 @@ module TestSets using Test import MathOptInterface as MOI -import LinearAlgebra include("dummy.jl")