Update

Author: odow

src/Bridges/Variable/set_map.jl

@@ -72,8 +72,6 @@ function MOI.Bridges.added_constraint_types(::Type{<:SetMapBridge})
     return Tuple{Type,Type}[]
 end
 
-# Get a primal function, going from bridged-space -> user-space
-#   => use inverse_map_function
 function MOI.get(
     model::MOI.ModelLike,
     attr::Union{
@@ -83,27 +81,28 @@ function MOI.get(
     },
     bridge::SetMapBridge,
 )
-    f = MOI.get(model, attr, bridge.constraint)
-    return MOI.Bridges.inverse_map_function(bridge, f)
+    value = MOI.get(model, attr, bridge.constraint)
+    if value === nothing
+        return
+    end
+    return MOI.Bridges.inverse_map_function(bridge, value)
 end
 
-# Set a primal function, going from user-space -> bridged-space
-#   => use map_function
 function MOI.set(
     model::MOI.ModelLike,
     attr::MOI.ConstraintPrimalStart,
     bridge::SetMapBridge,
     value,
 )
+    if value === nothing
+        MOI.set(model, attr, bridge.constraint, nothing)
+        return
+    end
     bridged_value = MOI.Bridges.map_function(bridge, value)
     MOI.set(model, attr, bridge.constraint, bridged_value)
     return
 end
 
-# Get a primal set, going from bridged-space -> user-space
-#   => well we should use inverse_map_set, but for some reason, the convention
-#      is reversed in Variable.SetMapBridge and Constraint.SetMapBridge
-#   => use map_set instead
 function MOI.get(
     model::MOI.ModelLike,
     attr::MOI.ConstraintSet,
@@ -113,40 +112,39 @@ function MOI.get(
     return MOI.Bridges.map_set(bridge, set)
 end
 
-# Set a primal set, going from user-space -> bridged-space
-#   => well we should use map_set, but for some reason, the convention is
-#      reversed in Variable.SetMapBridge and Constraint.SetMapBridge
-#   => use inverse_map_set instead
 function MOI.set(
     model::MOI.ModelLike,
     attr::MOI.ConstraintSet,
     bridge::SetMapBridge{T,S1},
     set::S1,
 ) where {T,S1}
-    mapped = MOI.Bridges.inverse_map_set(typeof(bridge), set)
+    mapped = MOI.Bridges.inverse_map_set(bridge, set)
     MOI.set(model, attr, bridge.constraint, mapped)
     return
 end
 
-# Get a dual function, going from bridged-space -> user-space
-#   => use inverse_adjoint_map_function
 function MOI.get(
     model::MOI.ModelLike,
     attr::Union{MOI.ConstraintDual,MOI.ConstraintDualStart},
     bridge::SetMapBridge,
 )
     value = MOI.get(model, attr, bridge.constraint)
-    return MOI.Bridges.inverse_adjoint_map_function(typeof(bridge), value)
+    if value === nothing
+        return
+    end
+    return MOI.Bridges.inverse_adjoint_map_function(bridge, value)
 end
 
-# Set a dual function, going from user-space -> bridged-space
-#   => use adjoint_map_function
 function MOI.set(
     model::MOI.ModelLike,
     attr::MOI.ConstraintDualStart,
     bridge::SetMapBridge,
     value,
 )
+    if value === nothing
+        MOI.set(model, attr, bridge.constraint, nothing)
+        return
+    end
     bridged_value = MOI.Bridges.adjoint_map_function(bridge, value)
     MOI.set(model, attr, bridge.constraint, bridged_value)
     return
@@ -221,6 +219,9 @@ function MOI.get(
     bridge::SetMapBridge,
 )
     value = MOI.get(model, attr, bridge.variable)
+    if value === nothing
+        return
+    end
     return MOI.Bridges.map_function(bridge, value)
 end
 
@@ -230,6 +231,10 @@ function MOI.set(
     bridge::SetMapBridge,
     value,
 )
+    if value === nothing
+        MOI.set(model, attr, bridge.variable, nothing)
+        return
+    end
     bridged_value = MOI.Bridges.inverse_map_function(bridge, value)
     MOI.set(model, attr, bridge.variable, bridged_value)
     return
@@ -287,7 +292,7 @@ function MOI.get(
 )
     value = MOI.get(model, attr, bridge.variables)
     if any(isnothing, value)
-        return nothing
+        return
     end
     return MOI.Bridges.map_function(bridge, value, i)
 end
@@ -299,6 +304,10 @@ function MOI.set(
     value,
     i::MOI.Bridges.IndexInVector,
 )
+    if value === nothing
+        MOI.set(model, attr, bridge.variables[i.value], nothing)
+        return
+    end
     bridged_value = MOI.Bridges.inverse_map_function(bridge, value)
     MOI.set(model, attr, bridge.variables[i.value], bridged_value)
     return

src/Bridges/set_map.jl

@@ -67,8 +67,6 @@ function map_function(bridge::AbstractBridge, func)
     return map_function(typeof(bridge), func)
 end
 
-map_function(::AbstractBridge, ::Nothing) = nothing
-
 """
     map_function(::Type{BT}, func, i::IndexInVector) where {BT}
 
@@ -108,8 +106,6 @@ function inverse_map_function(bridge::AbstractBridge, func)
     return inverse_map_function(typeof(bridge), func)
 end
 
-inverse_map_function(::AbstractBridge, ::Nothing) = nothing
-
 """
     adjoint_map_function(bridge::MOI.Bridges.AbstractBridge, func)
     adjoint_map_function(::Type{BT}, func) where {BT}
@@ -127,8 +123,6 @@ function adjoint_map_function(bridge::AbstractBridge, func)
     return adjoint_map_function(typeof(bridge), func)
 end
 
-adjoint_map_function(::AbstractBridge, ::Nothing) = nothing
-
 """
     inverse_adjoint_map_function(bridge::MOI.Bridges.AbstractBridge, func)
     inverse_adjoint_map_function(::Type{BT}, func) where {BT}
@@ -148,5 +142,3 @@ interface is kept for backward compatibility.
 function inverse_adjoint_map_function(bridge::AbstractBridge, func)
     return inverse_adjoint_map_function(typeof(bridge), func)
 end
-
-inverse_adjoint_map_function(::AbstractBridge, ::Nothing) = nothing

test/Bridges/Variable/ParameterToEqualToBridge.jl

@@ -80,6 +80,18 @@ function test_list_of_constraint_indices()
     return
 end
 
+function test_VariablePrimalStart()
+    inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Variable.ParameterToEqualTo{Float64}(inner)
+    x, ci = MOI.add_constrained_variable(model, MOI.Parameter(2.0))
+    @test MOI.supports(model, MOI.VariablePrimalStart(), MOI.VariableIndex)
+    MOI.set(model, MOI.VariablePrimalStart(), x, 2.0)
+    @test MOI.get(model, MOI.VariablePrimalStart(), x) == 2.0
+    MOI.set(model, MOI.VariablePrimalStart(), x, nothing)
+    @test MOI.get(model, MOI.VariablePrimalStart(), x) === nothing
+    return
+end
+
 function test_ConstraintPrimalStart()
     inner = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}())
     model = MOI.Bridges.Variable.ParameterToEqualTo{Float64}(inner)