Upate

Author: odow

src/Bridges/Objective/bridge.jl

@@ -95,12 +95,13 @@ end
 
 function MOI.set(
     ::MOI.ModelLike,
-    ::MOI.ObjectiveSense,
+    attr::MOI.ObjectiveSense,
     bridge::AbstractBridge,
     ::MOI.OptimizationSense,
 )
     return throw(
-        ArgumentError(
+        MOI.SetAttributeNotAllowed(
+            attr,
             "Objective bridge of type `$(typeof(bridge))` does not support " *
             "modifying the objective sense. As a workaround, set the sense " *
             "to `MOI.FEASIBILITY_SENSE` to clear the objective function and " *
@@ -111,11 +112,12 @@ end
 
 function MOI.get(
     ::MOI.ModelLike,
-    ::MOI.ObjectiveFunction,
+    attr::MOI.ObjectiveFunction,
     bridge::AbstractBridge,
 )
     return throw(
-        ArgumentError(
+        MOI.GetAttributeNotAllowed(
+            attr,
             "ObjectiveFunction bridge of type `$(typeof(bridge))` does not" *
             " support getting the objective function.",
         ),

src/Bridges/bridge_optimizer.jl

@@ -624,6 +624,7 @@ function MOI.delete(b::AbstractBridgeOptimizer, vis::Vector{MOI.VariableIndex})
     else
         MOI.delete(b.model, vis)
     end
+    return
 end
 
 function MOI.delete(b::AbstractBridgeOptimizer, vi::MOI.VariableIndex)

test/Bridges/Variable/HermitianToSymmetricPSDBridge.jl

@@ -113,6 +113,28 @@ function test_runtests()
     return
 end
 
+function test_delete()
+    inner = MOI.Utilities.Model{Float64}()
+    model = MOI.Bridges.Variable.HermitianToSymmetricPSD{Float64}(inner)
+    set = MOI.HermitianPositiveSemidefiniteConeTriangle(2)
+    x, _ = MOI.add_constrained_variables(model, set)
+    MOI.delete(model, x)
+    @test MOI.is_empty(inner)
+    return
+end
+
+function test_set_variable_primal_start()
+    inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Variable.HermitianToSymmetricPSD{Float64}(inner)
+    set = MOI.HermitianPositiveSemidefiniteConeTriangle(2)
+    x, _ = MOI.add_constrained_variables(model, set)
+    MOI.set(model, MOI.VariablePrimalStart(), x[1], 1.0)
+    @test MOI.get(model, MOI.VariablePrimalStart(), x[1]) == 1.0
+    MOI.set(model, MOI.VariablePrimalStart(), x[1], nothing)
+    @test MOI.get(model, MOI.VariablePrimalStart(), x[1]) === nothing
+    return
+end
+
 end  # module
 
 TestVariableHermitianToSymmetricPSD.runtests()

test/Bridges/Variable/NonposToNonnegBridge.jl

@@ -199,6 +199,14 @@ function test_runtests()
     return
 end
 
+function test_adjoint_map_function()
+    inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Variable.NonposToNonneg{Float64}(inner)
+    x, _ = MOI.add_constrained_variables(model, MOI.Nonpositives(1))
+    @test MOI.Bridges.adjoint_map_function(model.map[only(x)], 1.23) == -1.23
+    return
+end
+
 end  # module
 
 TestVariableFlipSign.runtests()

test/Bridges/Variable/RSOCtoSOCBridge.jl

@@ -144,6 +144,15 @@ function test_runtests()
     return
 end
 
+function test_adjoint_map_function()
+    inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Variable.RSOCtoSOC{Float64}(inner)
+    x, _ = MOI.add_constrained_variables(model, MOI.RotatedSecondOrderCone(3))
+    @test MOI.Bridges.adjoint_map_function(model.map[first(x)], [2, 0.5, 1]) ≈
+          [2.5 / sqrt(2), +1.5 / sqrt(2), 1.0]
+    return
+end
+
 end  # module
 
 TestVariableRSOCtoSOC.runtests()

test/Bridges/Variable/SOCtoRSOCBridge.jl

@@ -151,6 +151,15 @@ function test_runtests()
     return
 end
 
+function test_adjoint_map_function()
+    inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Variable.SOCtoRSOC{Float64}(inner)
+    x, _ = MOI.add_constrained_variables(model, MOI.SecondOrderCone(3))
+    @test MOI.Bridges.adjoint_map_function(model.map[first(x)], [2, 0.5, 1]) ≈
+          [2.5 / sqrt(2), +1.5 / sqrt(2), 1.0]
+    return
+end
+
 end  # module
 
 TestVariableSOCtoRSOC.runtests()

test/Bridges/Variable/VectorizeBridge.jl

@@ -287,6 +287,30 @@ function test_runtests()
     return
 end
 
+function test_list_of_constraint_indices()
+    inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Variable.Vectorize{Float64}(inner)
+    x, _ = MOI.add_constrained_variable(model, MOI.EqualTo(1.0))
+    attr = MOI.ListOfConstraintIndices{MOI.VectorOfVariables,MOI.Zeros}()
+    @test isempty(MOI.get(model, attr))
+    return
+end
+
+function test_variable_primal_ray()
+    inner = MOI.Utilities.MockOptimizer(
+        MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()),
+    )
+    model = MOI.Bridges.Variable.Vectorize{Float64}(inner)
+    x, _ = MOI.add_constrained_variable(model, MOI.EqualTo(1.0))
+    MOI.set(inner, MOI.PrimalStatus(), MOI.INFEASIBILITY_CERTIFICATE)
+    y = only(MOI.get(inner, MOI.ListOfVariableIndices()))
+    MOI.set(inner, MOI.VariablePrimal(), y, 1.23)
+    @test MOI.get(model, MOI.VariablePrimal(), x) == 1.23
+    MOI.set(inner, MOI.PrimalStatus(), MOI.FEASIBLE_POINT)
+    @test MOI.get(model, MOI.VariablePrimal(), x) == 2.23
+    return
+end
+
 end  # module
 
 TestVariableVectorize.runtests()

test/Bridges/Variable/bridge.jl

@@ -49,6 +49,15 @@ function test_AbstractBridge()
     return
 end
 
+function test_bridging_cost()
+    model = MOI.Bridges.Variable.SingleBridgeOptimizer{DummyVariableBridge}(
+        MOI.Utilities.Model{Float64}(),
+    )
+    @test MOI.Bridges.bridging_cost(model) == 1.0
+    @test MOI.Bridges.bridging_cost(model, MOI.ZeroOne) == 1.0
+    return
+end
+
 end  # module
 
 TestVariableBridge.runtests()

test/Bridges/bridge_optimizer.jl

@@ -1376,6 +1376,44 @@ function test_bridged_constraint_function_with_variable_bridges()
     return
 end
 
+struct EmptyObjectiveBridge <: MOI.Bridges.Objective.AbstractBridge end
+
+function test_fallback_bridge_objective()
+    model = MOI.Utilities.Model{Float64}()
+    x = MOI.add_variable(model)
+    @test_throws(
+        MOI.UnsupportedAttribute(MOI.ObjectiveFunction{MOI.VariableIndex}(x)),
+        MOI.Bridges.Objective.bridge_objective(EmptyObjectiveBridge, model, x),
+    )
+    return
+end
+
+function test_fallback_set_objective_sense()
+    model = MOI.Utilities.Model{Float64}()
+    bridge = EmptyObjectiveBridge()
+    @test_throws(
+        MOI.SetAttributeNotAllowed{MOI.ObjectiveSense},
+        MOI.set(model, MOI.ObjectiveSense(), bridge, MOI.MIN_SENSE),
+    )
+    return
+end
+
+function test_fallback_get_objective_function()
+    model = MOI.Utilities.Model{Float64}()
+    attr = MOI.ObjectiveFunction{MOI.VariableIndex}()
+    @test_throws(
+        MOI.GetAttributeNotAllowed{typeof(attr)},
+        MOI.get(model, attr, EmptyObjectiveBridge()),
+    )
+    return
+end
+
+function test_fallback_delete_objective_bridge()
+    model = MOI.Utilities.Model{Float64}()
+    @test_throws ArgumentError MOI.delete(model, EmptyObjectiveBridge())
+    return
+end
+
 end  # module
 
 TestBridgeOptimizer.runtests()

test/Bridges/debug.jl

@@ -327,7 +327,7 @@ function test_print_graph_stdout()
         return
     end
     @test read(filename, String) ==
-          "Bridge graph with 0 variable nodes, 0 constraint nodes and 0 objective nodes."
+          "Bridge graph with 0 variable nodes, 0 constraint nodes and 0 objective nodes.\n"
     return
 end