Skip to content

Commit 7919b2f

Browse files
committed
Fix format
1 parent e954eec commit 7919b2f

File tree

3 files changed

+46
-37
lines changed

3 files changed

+46
-37
lines changed

src/Bridges/Constraint/bridges/linear_combination.jl

+5-8
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ end
3131
function _map_function(set::MOI.LinearCombinationInSet, func)
3232
scalars = MOI.Utilities.eachscalar(func)
3333
return MOI.Utilities.vectorize([
34-
sum(scalars[j] * set.vectors[j][i] for j in eachindex(scalars))
35-
for i in 1:MOI.dimension(set.set)
34+
sum(scalars[j] * set.vectors[j][i] for j in eachindex(scalars)) for
35+
i in 1:MOI.dimension(set.set)
3636
])
3737
end
3838

@@ -61,13 +61,10 @@ function MOI.Bridges.inverse_map_set(
6161
return bridge.set
6262
end
6363

64-
function MOI.Bridges.adjoint_map_function(
65-
bridge::LinearCombinationBridge,
66-
func,
67-
)
64+
function MOI.Bridges.adjoint_map_function(bridge::LinearCombinationBridge, func)
6865
scalars = MOI.Utilities.eachscalar(func)
6966
return MOI.Utilities.vectorize([
70-
MOI.Utilities.set_dot(vector, scalars, bridge.set.set)
71-
for vector in bridge.set.vectors
67+
MOI.Utilities.set_dot(vector, scalars, bridge.set.set) for
68+
vector in bridge.set.vectors
7269
])
7370
end

src/Bridges/Variable/bridges/set_dot.jl

+4-12
Original file line numberDiff line numberDiff line change
@@ -4,8 +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-
struct DotProductsBridge{T,S,A,V} <:
8-
SetMapBridge{T,S,MOI.SetDotProducts{S,A,V}}
7+
struct DotProductsBridge{T,S,A,V} <: SetMapBridge{T,S,MOI.SetDotProducts{S,A,V}}
98
variables::Vector{MOI.VariableIndex}
109
constraint::MOI.ConstraintIndex{MOI.VectorOfVariables,S}
1110
set::MOI.SetDotProducts{S,A,V}
@@ -59,18 +58,11 @@ function MOI.Bridges.map_function(
5958
)
6059
end
6160

62-
function MOI.Bridges.map_function(
63-
bridge::DotProductsBridge{T},
64-
func,
65-
) where {T}
61+
function MOI.Bridges.map_function(bridge::DotProductsBridge{T}, func) where {T}
6662
scalars = MOI.Utilities.eachscalar(func)
6763
return MOI.Utilities.vectorize([
68-
MOI.Utilities.set_dot(
69-
vector,
70-
scalars,
71-
bridge.set.set,
72-
)
73-
for vector in bridge.set.vectors
64+
MOI.Utilities.set_dot(vector, scalars, bridge.set.set) for
65+
vector in bridge.set.vectors
7466
])
7567
end
7668

src/Test/test_conic.jl

+37-17
Original file line numberDiff line numberDiff line change
@@ -5801,7 +5801,11 @@ function test_conic_PositiveSemidefinite_RankOne_polynomial(
58015801
MOI.PositiveSemidefiniteFactorization(T[1, 1]),
58025802
]),
58035803
)
5804-
@requires MOI.supports_constraint(model, MOI.VectorAffineFunction{T}, typeof(set))
5804+
@requires MOI.supports_constraint(
5805+
model,
5806+
MOI.VectorAffineFunction{T},
5807+
typeof(set),
5808+
)
58055809
@requires MOI.supports_incremental_interface(model)
58065810
@requires MOI.supports(model, MOI.ObjectiveSense())
58075811
@requires MOI.supports(model, MOI.ObjectiveFunction{MOI.VariableIndex}())
@@ -5839,17 +5843,23 @@ function setup_test(
58395843
model::MOIU.MockOptimizer,
58405844
::Config{T},
58415845
) where {T<:Real}
5842-
A = MOI.TriangleVectorization{T,MOI.PositiveSemidefiniteFactorization{T,Vector{T}}}
5846+
A = MOI.TriangleVectorization{
5847+
T,
5848+
MOI.PositiveSemidefiniteFactorization{T,Vector{T}},
5849+
}
58435850
MOIU.set_mock_optimize!(
58445851
model,
58455852
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
58465853
mock,
58475854
T[-1],
5848-
(MOI.VectorAffineFunction{T}, MOI.SetDotProducts{
5849-
MOI.PositiveSemidefiniteConeTriangle,
5850-
A,
5851-
Vector{A},
5852-
}) => [T[0, 1]],
5855+
(
5856+
MOI.VectorAffineFunction{T},
5857+
MOI.SetDotProducts{
5858+
MOI.PositiveSemidefiniteConeTriangle,
5859+
A,
5860+
Vector{A},
5861+
},
5862+
) => [T[0, 1]],
58535863
),
58545864
)
58555865
return
@@ -5877,14 +5887,18 @@ function test_conic_PositiveSemidefinite_RankOne_moment(
58775887
@requires MOI.supports_add_constrained_variables(model, typeof(set))
58785888
@requires MOI.supports_incremental_interface(model)
58795889
@requires MOI.supports(model, MOI.ObjectiveSense())
5880-
@requires MOI.supports(model, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{T}}())
5881-
y, cy = MOI.add_constrained_variables(
5890+
@requires MOI.supports(
58825891
model,
5883-
set,
5892+
MOI.ObjectiveFunction{MOI.ScalarAffineFunction{T}}(),
58845893
)
5894+
y, cy = MOI.add_constrained_variables(model, set)
58855895
c = MOI.add_constraint(model, T(1) * y[1] + T(1) * y[2], MOI.EqualTo(T(1)))
58865896
MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE)
5887-
MOI.set(model, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{T}}(), T(3) * y[1] - T(1) * y[2])
5897+
MOI.set(
5898+
model,
5899+
MOI.ObjectiveFunction{MOI.ScalarAffineFunction{T}}(),
5900+
T(3) * y[1] - T(1) * y[2],
5901+
)
58885902
if _supports(config, MOI.optimize!)
58895903
@test MOI.get(model, MOI.TerminationStatus()) == MOI.OPTIMIZE_NOT_CALLED
58905904
MOI.optimize!(model)
@@ -5912,18 +5926,24 @@ function setup_test(
59125926
model::MOIU.MockOptimizer,
59135927
::Config{T},
59145928
) where {T<:Real}
5915-
A = MOI.TriangleVectorization{T,MOI.PositiveSemidefiniteFactorization{T,Vector{T}}}
5929+
A = MOI.TriangleVectorization{
5930+
T,
5931+
MOI.PositiveSemidefiniteFactorization{T,Vector{T}},
5932+
}
59165933
MOIU.set_mock_optimize!(
59175934
model,
59185935
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
59195936
mock,
59205937
T[0, 1],
59215938
(MOI.ScalarAffineFunction{T}, MOI.EqualTo{T}) => [T(-1)],
5922-
(MOI.VectorOfVariables, MOI.LinearCombinationInSet{
5923-
MOI.PositiveSemidefiniteConeTriangle,
5924-
A,
5925-
Vector{A},
5926-
}) => [T[4, 0]],
5939+
(
5940+
MOI.VectorOfVariables,
5941+
MOI.LinearCombinationInSet{
5942+
MOI.PositiveSemidefiniteConeTriangle,
5943+
A,
5944+
Vector{A},
5945+
},
5946+
) => [T[4, 0]],
59275947
),
59285948
)
59295949
return

0 commit comments

Comments
 (0)