Fix quadratic tests

jump-dev · Jul 5, 2024 · 3fc901d · 3fc901d
1 parent 2ce16ca
commit 3fc901d
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 5 deletions.
diff --git a/test/Mock/mock_tests.jl b/test/Mock/mock_tests.jl
@@ -12,9 +12,9 @@ using Test, JuMP
 #@testset "Quartic constant" begin
 #    include("quartic_constant.jl")
 #end
-#@testset "Quadratic" begin
-#    include("quadratic.jl")
-#end
+@testset "Quadratic" begin
+    include("quadratic.jl")
+end
 @testset "Quartic ideal" begin
     include("quartic_ideal.jl")
 end

diff --git a/test/Mock/quadratic.jl b/test/Mock/quadratic.jl
@@ -27,10 +27,27 @@ for mock in [bridged_mock(optimize_bridged!), cached_mock(optimize_cached!)]
     Tests.sdsos_scaled_univariate_quadratic_test(mock, config)
     Tests.sdsos_scaled_bivariate_quadratic_test(mock, config)
     Tests.sos_cheby_univariate_quadratic_test(mock, config)
-    Tests.sos_cheby_bivariate_quadratic_test(mock, config)
     Tests.sdsos_cheby_univariate_quadratic_test(mock, config)
-    Tests.sdsos_cheby_bivariate_quadratic_test(mock, config)
 end
+function optimize!(mock)
+    return MOI.Utilities.mock_optimize!(
+        mock,
+        [2.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0],
+        (
+            MOI.VectorOfVariables,
+            MOI.MathOptInterface.PositiveSemidefiniteConeTriangle,
+        ) => [[0.0, 0.0, 1.0, 0.0, -1.0, 1.0]],
+        (MOI.VectorAffineFunction{Float64}, MOI.Zeros) =>
+            [[0.0, 0.0, 0.0, 2.0, -1.0, 2.0]],
+    )
+end
+for mock in [
+    bridged_mock(optimize!),
+    cached_mock(optimize!),
+]
+    Tests.sos_cheby_bivariate_quadratic_test(mock, config)
+end
+#Tests.sdsos_cheby_bivariate_quadratic_test(mock, config)
 function optimize!(mock)
     return MOI.Utilities.mock_optimize!(
         mock,

diff --git a/test/Solvers/generate.jl b/test/Solvers/generate.jl
@@ -0,0 +1,43 @@
+import SumOfSquares as SOS
+import MultivariateBases as MB
+using SemialgebraicSets
+using DynamicPolynomials
+
+function generate(test, solver, config)
+    optimizer = MOI.instantiate(solver, with_bridge_type = Float64)
+    # We don't use `UniversalFallback` so that the SOS bridges
+    # are applied
+    cached = MOI.Utilities.CachingOptimizer(
+        MOI.Utilities.Model{Float64}(),
+        optimizer,
+    )
+    bridged = MOI.Bridges.full_bridge_optimizer(cached, Float64)
+    # Second cache needed for the fallback for `ConstraintPrimal`
+    model = MOI.Utilities.CachingOptimizer(
+        MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()),
+        bridged,
+    )
+    MOI.Bridges.add_bridge(
+        bridged,
+        SOS.Bridges.Constraint.SOSPolynomialBridge{Float64},
+    )
+    MOI.Bridges.add_bridge(bridged, SOS.Bridges.Variable.KernelBridge{Float64})
+    MOI.Bridges.add_bridge(bridged, SOS.Bridges.Constraint.EmptyBridge{Float64})
+    MOI.Bridges.add_bridge(
+        bridged,
+        SOS.Bridges.Constraint.PositiveSemidefinite2x2Bridge{Float64},
+    )
+    MOI.Bridges.add_bridge(
+        bridged,
+        SOS.Bridges.Constraint.DiagonallyDominantBridge{Float64},
+    )
+    MOI.Bridges.add_bridge(
+        bridged,
+        SOS.Bridges.Constraint.ScaledDiagonallyDominantBridge{Float64},
+    )
+    MOI.Bridges.add_bridge(
+        bridged,
+        SOS.Bridges.Constraint.SOSPolynomialInSemialgebraicSetBridge{Float64},
+    )
+    return test(model, config)
+end