Skip to content

Extract set instead of caching it #6

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
blegat merged 3 commits into from
Apr 3, 2026
Merged

Extract set instead of caching it #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c091367
Extract set instead of caching it
blegat Apr 3, 2026
f67d1b1
Fix
blegat Apr 3, 2026
8d86526
Fix
blegat Apr 3, 2026
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
23 changes: 12 additions & 11 deletions src/bridge.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@ from the iterators for each combination and converts each expanded expression
to the type `F` declared by the `FunctionGenerator{F}` type parameter.
If the expanded expression cannot be converted to `F`, an error is thrown.
"""
struct FunctionGeneratorBridge{T,F,S,VS<:MOI.Utilities.VectorLinearSet} <:
MOI.Bridges.Constraint.AbstractBridge
struct FunctionGeneratorBridge{T,F,S} <: MOI.Bridges.Constraint.AbstractBridge
constraints::Vector{MOI.ConstraintIndex{F,S}}
func::FunctionGenerator{F}
set::VS
end

function MOI.Bridges.Constraint.bridge_constraint(
::Type{FunctionGeneratorBridge{T,F,S,VS}},
::Type{FunctionGeneratorBridge{T,F,S}},
model::MOI.ModelLike,
func::FunctionGenerator{F},
set::VS,
) where {T,F,S,VS<:MOI.Utilities.VectorLinearSet}
set::MOI.Utilities.VectorLinearSet,
) where {T,F,S}
scalar_set = S(zero(T))
constraints = MOI.ConstraintIndex{F,S}[]
sizes = Tuple(length.(func.iterators))
Expand All @@ -44,7 +42,7 @@ function MOI.Bridges.Constraint.bridge_constraint(
)
push!(constraints, ci)
end
return FunctionGeneratorBridge{T,F,S,VS}(constraints, func, set)
return FunctionGeneratorBridge{T,F,S}(constraints, func)
end

function MOI.supports_constraint(
Expand All @@ -61,7 +59,7 @@ function MOI.Bridges.Constraint.concrete_bridge_type(
VS::Type{<:MOI.Utilities.VectorLinearSet},
) where {T,F}
S = MOI.Utilities.scalar_set_type(VS, T)
return FunctionGeneratorBridge{T,F,S,VS}
return FunctionGeneratorBridge{T,F,S}
end

function MOI.Bridges.added_constraint_types(
Expand Down Expand Up @@ -101,9 +99,12 @@ end
function MOI.get(
::MOI.ModelLike,
::MOI.ConstraintSet,
bridge::FunctionGeneratorBridge,
)
return bridge.set
bridge::FunctionGeneratorBridge{T,F,S},
) where {T,F,S}
return MOI.Utilities.set_with_dimension(
MOI.Utilities.vector_set_type(S),
length(bridge.constraints),
)
end

function MOI.delete(model::MOI.ModelLike, bridge::FunctionGeneratorBridge)
Expand Down
Loading