Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions src/bridges.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,43 @@

function MOI.get(
model::MOI.ModelLike,
attr::ObjectiveFunctionAttribute{ReverseObjectiveFunction,G},
attr::MOI.Bridges.ObjectiveFunctionAttribute{ReverseObjectiveFunction,G},
::MOI.Bridges.Objective.FunctionConversionBridge{T,F,G},
) where {T,F,G}
return MOI.get(
model,
ObjectiveFunctionAttribute{ReverseObjectiveFunction,F}(attr.attr),
MOI.Bridges.ObjectiveFunctionAttribute{ReverseObjectiveFunction,F}(
attr.attr,
),
)
end

function MOI.set(
model::MOI.ModelLike,
attr::ObjectiveFunctionAttribute{ForwardObjectiveFunction,G},
attr::MOI.Bridges.ObjectiveFunctionAttribute{ForwardObjectiveFunction,G},
::MOI.Bridges.Objective.FunctionConversionBridge{T,F,G},
value,
) where {T,F,G}
return MOI.set(
model,
ObjectiveFunctionAttribute{ForwardObjectiveFunction,F}(attr.attr),
MOI.Bridges.ObjectiveFunctionAttribute{ForwardObjectiveFunction,F}(
attr.attr,
),
value,
)
end

function MOI.get(
model::MOI.ModelLike,
::ObjectiveFunctionAttribute{ReverseObjectiveFunction},
::MOI.Bridges.ObjectiveFunctionAttribute{ReverseObjectiveFunction},
bridge::MOI.Bridges.Objective.SlackBridge,
)
return MOI.get(model, ReverseConstraintFunction(), bridge.constraint)
end

function MOI.set(
model::MOI.ModelLike,
::ObjectiveFunctionAttribute{ForwardObjectiveFunction},
::MOI.Bridges.ObjectiveFunctionAttribute{ForwardObjectiveFunction},
bridge::MOI.Bridges.Objective.SlackBridge,
value,
)
Expand Down
54 changes: 5 additions & 49 deletions src/copy_dual.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,6 @@
# Use of this source code is governed by an MIT-style license that can be found
# in the LICENSE.md file or at https://opensource.org/licenses/MIT.

"""
struct ObjectiveFunctionAttribute{A,F} <: MOI.AbstractModelAttribute
attr::A
end

Objective function attribute `attr` for the function type `F`.
The type `F` is used by a `MOI.Bridges.AbstractBridgeOptimizer` to keep track
of its position in a chain of objective bridges.
"""
struct ObjectiveFunctionAttribute{A,F} <: MOI.AbstractModelAttribute
attr::A
end

function MOI.get(
b::MOI.Bridges.AbstractBridgeOptimizer,
attr::ObjectiveFunctionAttribute{A,F},
) where {A,F}
obj_attr = MOI.ObjectiveFunction{F}()
if MOI.Bridges.is_bridged(b, obj_attr)
return MOI.get(
MOI.Bridges.recursive_model(b),
attr,
MOI.Bridges.bridge(b, obj_attr),
)
else
return MOI.get(b.model, attr.attr)
end
end

function MOI.get(
b::MOI.Bridges.AbstractBridgeOptimizer,
attr::ReverseObjectiveFunction,
Expand All @@ -40,27 +11,12 @@ function MOI.get(
F = MOI.Bridges.Objective.function_type(
MOI.Bridges.Objective.bridges(b),
)
return MOI.get(b, ObjectiveFunctionAttribute{typeof(attr),F}(attr))
else
return MOI.get(b.model, attr)
end
end

function MOI.set(
b::MOI.Bridges.AbstractBridgeOptimizer,
attr::ObjectiveFunctionAttribute{A,F},
value,
) where {A,F}
obj_attr = MOI.ObjectiveFunction{F}()
if MOI.Bridges.is_bridged(b, obj_attr)
return MOI.set(
MOI.Bridges.recursive_model(b),
attr,
MOI.Bridges.bridge(b, obj_attr),
value,
return MOI.get(
b,
MOI.Bridges.ObjectiveFunctionAttribute{typeof(attr),F}(attr),
)
else
return MOI.set(b.model, attr.attr, value)
return MOI.get(b.model, attr)
end
end

Expand All @@ -75,7 +31,7 @@ function MOI.set(
)
return MOI.set(
b,
ObjectiveFunctionAttribute{typeof(attr),F}(attr),
MOI.Bridges.ObjectiveFunctionAttribute{typeof(attr),F}(attr),
value,
)
else
Expand Down
57 changes: 57 additions & 0 deletions test/bridges.jl
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,63 @@ function test_square_offset()
[1, 2]
end

MOI.Utilities.@model(
ObjectiveContextModel,
(),
(MOI.GreaterThan,),
(),
(),
(),
(MOI.ScalarAffineFunction,),
(),
()
)

function MOI.supports(
::MOI.Utilities.UniversalFallback{<:ObjectiveContextModel},
::MOI.ObjectiveFunction{F},
) where {F<:MOI.AbstractFunction}
return F == MOI.VariableIndex
end

function MOI.supports_constraint(
model::MOI.Utilities.UniversalFallback{<:ObjectiveContextModel},
::Type{F},
::Type{S},
) where {F<:MOI.AbstractFunction,S<:MOI.AbstractSet}
return MOI.supports_constraint(model.model, F, S)
end

function test_objective_attributes_in_bridge_context()
inner = MOI.Utilities.MockOptimizer(
MOI.Utilities.UniversalFallback(ObjectiveContextModel{Float64}()),
)
model = MOI.Bridges.LazyBridgeOptimizer(inner)
MOI.Bridges.add_bridge(model, MOI.Bridges.Objective.SlackBridge{Float64})
MOI.Bridges.add_bridge(
model,
MOI.Bridges.Constraint.LessToGreaterBridge{Float64},
)
x = MOI.add_variable(model)
f = 2.0 * x + 3.0
MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE)
attr = MOI.ObjectiveFunction{typeof(f)}()
MOI.set(model, attr, f)
bridge = MOI.Bridges.bridge(model, attr)
@test MOI.Bridges.is_bridged(model, bridge.constraint)
child_bridge = MOI.Bridges.bridge(model, bridge.constraint)
child_attr =
MOI.ListOfConstraintIndices{typeof(f),MOI.GreaterThan{Float64}}()
child = only(MOI.get(child_bridge, child_attr))
direction = 4.0 * x + 5.0
MOI.set(model, DiffOpt.ForwardObjectiveFunction(), direction)
@test MOI.get(inner, DiffOpt.ForwardConstraintFunction(), child) ≈
-direction
MOI.set(inner, DiffOpt.ReverseConstraintFunction(), child, direction)
@test MOI.get(model, DiffOpt.ReverseObjectiveFunction()) ≈ -direction
return
end

end

TestBridges.runtests()
Loading