Skip to content

Commit fc4e47f

Browse files
committed
rename NonlinearizeBridge to ToScalarNonlinearBridge
1 parent d15a084 commit fc4e47f

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

src/Bridges/Objective/Objective.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The coefficient type used is `T`.
2828
function add_all_bridges(model, ::Type{T}) where {T}
2929
MOI.Bridges.add_bridge(model, FunctionizeBridge{T})
3030
MOI.Bridges.add_bridge(model, QuadratizeBridge{T})
31-
MOI.Bridges.add_bridge(model, NonlinearizeBridge{T})
31+
MOI.Bridges.add_bridge(model, ToScalarNonlinearBridge{T})
3232
MOI.Bridges.add_bridge(model, SlackBridge{T})
3333
MOI.Bridges.add_bridge(model, VectorFunctionizeBridge{T})
3434
MOI.Bridges.add_bridge(model, VectorSlackBridge{T})

src/Bridges/Objective/bridges/FunctionConversionBridge.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ const Quadratize{T,OT<:MOI.ModelLike} =
174174
SingleBridgeOptimizer{QuadratizeBridge{T},OT}
175175

176176
"""
177-
NonlinearizeBridge{T,G} <: FunctionConversionBridge{T,MOI.ScalarNonlinearFunction,G}
177+
ToScalarNonlinearBridge{T,G} <: FunctionConversionBridge{T,MOI.ScalarNonlinearFunction,G}
178178
179-
`NonlinearizeBridge` implements the following reformulations:
179+
`ToScalarNonlinearBridge` implements the following reformulations:
180180
181181
* ``\\min\\{x^\\top \\mathbf{𝑄} x + a^\\top x + b\\}`` into ``\\min\\{f(x)\\}``
182182
* ``\\max\\{x^\\top \\mathbf{𝑄} x + a^\\top x + b\\}`` into ``\\max\\{f(x)\\}``
@@ -185,21 +185,21 @@ where `f(x)` is a `MOI.ScalarNonlinearFunction`.
185185
186186
## Source node
187187
188-
`NonlinearizeBridge` supports:
188+
`ToScalarNonlinearBridge` supports:
189189
190190
* [`MOI.ObjectiveFunction{G}`](@ref)
191191
192192
## Target nodes
193193
194-
`NonlinearizeBridge` creates:
194+
`ToScalarNonlinearBridge` creates:
195195
196196
* One objective node: [`MOI.ObjectiveFunction{MOI.ScalarNonlinearFunction}`](@ref)
197197
"""
198-
const NonlinearizeBridge{T,G} =
198+
const ToScalarNonlinearBridge{T,G} =
199199
FunctionConversionBridge{T,MOI.ScalarNonlinearFunction,G}
200200

201-
const Nonlinearize{T,OT<:MOI.ModelLike} =
202-
SingleBridgeOptimizer{NonlinearizeBridge{T},OT}
201+
const ToScalarNonlinear{T,OT<:MOI.ModelLike} =
202+
SingleBridgeOptimizer{ToScalarNonlinearBridge{T},OT}
203203

204204
"""
205205
VectorFunctionizeBridge{T,G} <: FunctionConversionBridge{T,MOI.VectorAffineFunction{T},G}

test/Bridges/Objective/SlackBridge.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ function test_complex_objective()
527527
)
528528
MOI.Bridges.remove_bridge(
529529
dest,
530-
MOI.Bridges.Objective.NonlinearizeBridge{Float64},
530+
MOI.Bridges.Objective.ToScalarNonlinearBridge{Float64},
531531
) # Otherwise, would be bridged to Nonlinear.
532532
@test_throws MOI.UnsupportedAttribute(attr) MOI.copy_to(dest, model)
533533
end

test/Bridges/Objective/NonlinearizeBridge.jl renamed to test/Bridges/Objective/ToScalarNonlinearBridge.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Use of this source code is governed by an MIT-style license that can be found
55
# in the LICENSE.md file or at https://opensource.org/licenses/MIT.
66

7-
module TestObjectiveNonlinearize
7+
module TestObjectiveToScalarNonlinear
88

99
using Test
1010

@@ -25,7 +25,7 @@ include("../utilities.jl")
2525

2626
function test_solve_singlevariable_obj()
2727
mock = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
28-
model = MOI.Bridges.Objective.Nonlinearize{Float64}(mock)
28+
model = MOI.Bridges.Objective.ToScalarNonlinear{Float64}(mock)
2929
MOI.Utilities.set_mock_optimize!(
3030
mock,
3131
(mock::MOI.Utilities.MockOptimizer) ->
@@ -60,7 +60,7 @@ end
6060

6161
function test_solve_result_index()
6262
mock = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
63-
model = MOI.Bridges.Objective.Nonlinearize{Float64}(mock)
63+
model = MOI.Bridges.Objective.ToScalarNonlinear{Float64}(mock)
6464
MOI.Utilities.set_mock_optimize!(
6565
mock,
6666
(mock::MOI.Utilities.MockOptimizer) -> MOI.Utilities.mock_optimize!(
@@ -83,7 +83,7 @@ end
8383

8484
function test_runtests()
8585
MOI.Bridges.runtests(
86-
MOI.Bridges.Objective.NonlinearizeBridge,
86+
MOI.Bridges.Objective.ToScalarNonlinearBridge,
8787
model -> begin
8888
x = MOI.add_variable(model)
8989
aff = MOI.ScalarAffineFunction(
@@ -118,7 +118,7 @@ function test_runtests()
118118
end,
119119
)
120120
MOI.Bridges.runtests(
121-
MOI.Bridges.Objective.NonlinearizeBridge,
121+
MOI.Bridges.Objective.ToScalarNonlinearBridge,
122122
model -> begin
123123
x = MOI.add_variable(model)
124124
aff = MOI.ScalarAffineFunction(
@@ -157,4 +157,4 @@ end
157157

158158
end # module
159159

160-
TestObjectiveNonlinearize.runtests()
160+
TestObjectiveToScalarNonlinear.runtests()

test/Bridges/debug.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function test_print_active_bridges_objective_unsupported()
190190
model = MOI.Bridges.full_bridge_optimizer(Model{Float64}(), Float64)
191191
MOI.Bridges.remove_bridge(
192192
model,
193-
MOI.Bridges.Objective.NonlinearizeBridge{Float64},
193+
MOI.Bridges.Objective.ToScalarNonlinearBridge{Float64},
194194
) # Otherwise, Int would be bridged to Nonlinear.
195195
F = MOI.ScalarAffineFunction{Int}
196196
@test_throws(

0 commit comments

Comments
 (0)