Skip to content

[Bridges.Variable] change ParameterToEqualToBridge to <: SetMapBridge #2664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2025
Merged

[Bridges.Variable] change ParameterToEqualToBridge to <: SetMapBridge #2664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 18 additions & 101 deletions src/Bridges/Variable/bridges/ParameterToEqualToBridge.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,121 +23,38 @@

* One variable node: [`MOI.VariableIndex`](@ref) in [`MOI.EqualTo{T}`](@ref)
"""
struct ParameterToEqualToBridge{T} <: AbstractBridge
x::MOI.VariableIndex
ci::MOI.ConstraintIndex{MOI.VariableIndex,MOI.EqualTo{T}}
struct ParameterToEqualToBridge{T} <:
SetMapBridge{T,MOI.EqualTo{T},MOI.Parameter{T}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is much better

variable::MOI.VariableIndex
constraint::MOI.ConstraintIndex{MOI.VariableIndex,MOI.EqualTo{T}}
end

const ParameterToEqualTo{T,OT<:MOI.ModelLike} =
SingleBridgeOptimizer{ParameterToEqualToBridge{T},OT}

function bridge_constrained_variable(
::Type{ParameterToEqualToBridge{T}},
model::MOI.ModelLike,
set::MOI.Parameter{T},
) where {T}
x, ci = MOI.add_constrained_variable(model, MOI.EqualTo(set.value))
return ParameterToEqualToBridge{T}(x, ci)
end

function supports_constrained_variable(
::Type{ParameterToEqualToBridge{T}},
::Type{MOI.Parameter{T}},
) where {T}
return true
end

function MOI.Bridges.added_constrained_variable_types(
::Type{ParameterToEqualToBridge{T}},
) where {T}
return Tuple{Type}[(MOI.EqualTo{T},)]
end

function MOI.Bridges.added_constraint_types(::Type{<:ParameterToEqualToBridge})
return Tuple{Type,Type}[]
end

MOI.get(bridge::ParameterToEqualToBridge, ::MOI.NumberOfVariables)::Int64 = 1

function MOI.get(bridge::ParameterToEqualToBridge, ::MOI.ListOfVariableIndices)
return [bridge.x]
end

function MOI.get(
::ParameterToEqualToBridge{T},
::MOI.NumberOfConstraints{MOI.VariableIndex,MOI.EqualTo{T}},
)::Int64 where {T}
return 1
end

function MOI.get(
bridge::ParameterToEqualToBridge{T},
::MOI.ListOfConstraintIndices{MOI.VariableIndex,MOI.EqualTo{T}},
function MOI.Bridges.map_set(

Check warning on line 35 in src/Bridges/Variable/bridges/ParameterToEqualToBridge.jl

View check run for this annotation

Codecov / codecov/patch

src/Bridges/Variable/bridges/ParameterToEqualToBridge.jl#L35 

Added line #L35 was not covered by tests
::Type{<:ParameterToEqualToBridge{T}},
set::MOI.EqualTo{T},
) where {T}
return [bridge.ci]
return MOI.Parameter{T}(set.value)
end

function MOI.delete(model::MOI.ModelLike, bridge::ParameterToEqualToBridge)
MOI.delete(model, bridge.x)
return
end

function MOI.get(
model::MOI.ModelLike,
::MOI.ConstraintSet,
bridge::ParameterToEqualToBridge{T},
function MOI.Bridges.inverse_map_set(

Check warning on line 42 in src/Bridges/Variable/bridges/ParameterToEqualToBridge.jl

View check run for this annotation

Codecov / codecov/patch

src/Bridges/Variable/bridges/ParameterToEqualToBridge.jl#L42 

Added line #L42 was not covered by tests
::Type{<:ParameterToEqualToBridge{T}},
set::MOI.Parameter{T},
) where {T}
set = MOI.get(model, MOI.ConstraintSet(), bridge.ci)
return MOI.Parameter(set.value)
return MOI.EqualTo{T}(set.value)
end

function MOI.get(
model::MOI.ModelLike,
attr::Union{MOI.ConstraintFunction,MOI.ConstraintPrimal,MOI.ConstraintDual},
bridge::ParameterToEqualToBridge,
)
return MOI.get(model, attr, bridge.ci)
end
MOI.Bridges.map_function(::Type{<:ParameterToEqualToBridge}, f) = f

function _to_one(::Type{T}, x) where {T}
return MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(one(T), x)], zero(T))
end
MOI.Bridges.inverse_map_function(::Type{<:ParameterToEqualToBridge}, f) = f

function MOI.Bridges.bridged_function(
bridge::ParameterToEqualToBridge{T},
) where {T}
return _to_one(T, bridge.x)
end
MOI.Bridges.adjoint_map_function(::Type{<:ParameterToEqualToBridge}, f) = f

function unbridged_map(
bridge::ParameterToEqualToBridge{T},
x::MOI.VariableIndex,
) where {T}
return [bridge.x => _to_one(T, x)]
end

function MOI.supports(
model::MOI.ModelLike,
attr::MOI.VariablePrimalStart,
function MOI.Bridges.inverse_adjoint_map_function(

Check warning on line 55 in src/Bridges/Variable/bridges/ParameterToEqualToBridge.jl

View check run for this annotation

Codecov / codecov/patch

src/Bridges/Variable/bridges/ParameterToEqualToBridge.jl#L55 

Added line #L55 was not covered by tests
::Type{<:ParameterToEqualToBridge},
f,
)
return MOI.supports(model, attr, MOI.VariableIndex)
end

function MOI.get(
model::MOI.ModelLike,
attr::Union{MOI.VariablePrimal,MOI.VariablePrimalStart},
bridge::ParameterToEqualToBridge,
)
return MOI.get(model, attr, bridge.x)
end

function MOI.set(
model::MOI.ModelLike,
attr::MOI.VariablePrimalStart,
bridge::ParameterToEqualToBridge,
value,
)
MOI.set(model, attr, bridge.x, value)
return
return f
end
2 changes: 2 additions & 0 deletions src/Bridges/Variable/map.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ is set by this constraint and such bound has already been set for `vi`.
"""
function MOI.add_constraint(::Map, ::MOI.VariableIndex, ::MOI.AbstractScalarSet)
# Nothing to do as this is not recognized as setting a lower or upper bound
return
end

# We cannot use `SUPPORTED_VARIABLE_SCALAR_SETS` because
Expand Down Expand Up @@ -321,6 +322,7 @@ function MOI.delete(
ci::MOI.ConstraintIndex{MOI.VariableIndex,<:MOI.AbstractScalarSet},
)
# Nothing to do as this is not recognized as setting a lower or upper bound
return
end

function MOI.delete(
Expand Down
Loading
Loading