Merge pull request #132 from JuliaOpt/bl/attr_functionize

Fix getting attributes with Functionize bridge

Author: blegat

Project.toml

@@ -18,7 +18,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 [compat]
 DynamicPolynomials = "≥ 0.1.3"
 JuMP = "0.20"
-MathOptInterface = "~0.9.2"
+MathOptInterface = "~0.9.7"
 MultivariateMoments = "≥ 0.2.1"
 MultivariatePolynomials = "~0.3"
 PolyJuMP = "0.3.3"

src/attributes.jl

@@ -57,12 +57,10 @@ end
 # If a variable is bridged, the `VectorOfVariables`-in-`SOSPolynomialSet` is
 # bridged by `MOI.Bridges.Constraint.VectorFunctionizeBridge` and it has
 # to pass the constraint to the SOS bridge.
-function MOI.get(model::MOI.ModelLike,
-                 attr::Union{CertificateMonomials, GramMatrixAttribute,
-                             MomentMatrixAttribute, LagrangianMultipliers,
-                             PolyJuMP.MomentsAttribute},
-                 bridge::MOI.Bridges.Constraint.VectorFunctionizeBridge)
-    return MOI.get(model, attr, bridge.constraint)
+function MOI.Bridges.Constraint.invariant_under_function_conversion(::Union{
+    CertificateMonomials, GramMatrixAttribute,
+    MomentMatrixAttribute, LagrangianMultipliers})
+    return true
 end
 
 # This is type piracy but we tolerate it.

test/Mock/term.jl

@@ -1,9 +1,27 @@
 config = MOI.Test.TestConfig()
-optimize!(mock) = MOIU.mock_optimize!(mock, [0.0, 0.0],
-    (MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1.0]],
-    (MOI.VectorAffineFunction{Float64}, MOI.Zeros) => [[1.0]])
-for mock in mocks(optimize!)
-    Tests.sos_term_test(mock, config)
-    Tests.sdsos_term_test(mock, config)
-    Tests.dsos_term_test(mock, config)
+
+@testset "Model" begin
+    optimize!(mock) = MOIU.mock_optimize!(mock, [0.0, 0.0],
+        (MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1.0]],
+        (MOI.VectorAffineFunction{Float64}, MOI.Zeros) => [[1.0]])
+    for mock in mocks(optimize!)
+        Tests.sos_term_test(mock, config)
+        Tests.sdsos_term_test(mock, config)
+        Tests.dsos_term_test(mock, config)
+    end
+end
+
+# The VectorOfVariables-in-SOSPolynomialSet is bridged by VectorFunctionizeBridge
+# since the free variable is bridged. This tests that the GramMatrixAttribute, ...
+# are passed by the VectorFunctionizeBridge.
+@testset "NoFreeVariable" begin
+    optimize!(mock) = MOIU.mock_optimize!(mock, [0.0, 0.0, 0.0],
+        (MOI.VectorAffineFunction{Float64}, MOI.Nonnegatives) => [[1.0]],
+        (MOI.VectorAffineFunction{Float64}, MOI.Zeros) => [[1.0]])
+    nofree_mock = bridged_mock(optimize!, model = NoFreeVariable{Float64}())
+    for mock in mocks(optimize!)
+        Tests.sos_term_test(nofree_mock, config)
+        Tests.sdsos_term_test(nofree_mock, config)
+        Tests.dsos_term_test(nofree_mock, config)
+    end
 end

test/Mock/utilities.jl

@@ -1,6 +1,12 @@
 using JuMP
 const MOIT = MOI.Test
 
+MOIU.@model(NoFreeVariable,
+            (), (MOI.EqualTo, MOI.LessThan, MOI.GreaterThan), (MOI.Nonnegatives, MOI.Nonpositives, MOI.Zeros, MOI.RotatedSecondOrderCone, MOI.PositiveSemidefiniteConeTriangle), (),
+            (), (MOI.ScalarAffineFunction,), (MOI.VectorOfVariables,), (MOI.VectorAffineFunction,))
+# No free variables to make sure variable bridges are used to increase coverage
+MOI.supports_constraint(::NoFreeVariable, ::Type{MOI.VectorOfVariables}, ::Type{MOI.Reals}) = false
+
 function bridged_mock(mock_optimize!::Function...;
                       model = MOI.Utilities.Model{Float64}())
     mock = MOI.Utilities.MockOptimizer(model)