Skip to content

Commit 9e3a1ee

Browse files
authored
[Utilities] simplify various operate_ methods (#2212)
1 parent 972baf3 commit 9e3a1ee

File tree

4 files changed

+110
-219
lines changed

4 files changed

+110
-219
lines changed

src/Utilities/functions.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,15 +1283,17 @@ function map_terms!(
12831283
op,
12841284
func::Union{MOI.ScalarAffineFunction,MOI.VectorAffineFunction},
12851285
)
1286-
return map!(op, func.terms, func.terms)
1286+
map!(op, func.terms, func.terms)
1287+
return
12871288
end
12881289

12891290
function map_terms!(
12901291
op,
12911292
func::Union{MOI.ScalarQuadraticFunction,MOI.VectorQuadraticFunction},
12921293
)
12931294
map!(op, func.affine_terms, func.affine_terms)
1294-
return map!(op, func.quadratic_terms, func.quadratic_terms)
1295+
map!(op, func.quadratic_terms, func.quadratic_terms)
1296+
return
12951297
end
12961298

12971299
###################################### +/- #####################################

src/Utilities/mutable_arithmetics.jl

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,11 @@ function MA.operate!(
149149
return f
150150
end
151151

152-
function MA.operate!(::typeof(-), f::MOI.ScalarQuadraticFunction)
153-
operate_terms!(-, f.quadratic_terms)
154-
operate_terms!(-, f.affine_terms)
155-
f.constant = -f.constant
156-
return f
157-
end
158-
159-
function MA.operate!(::typeof(-), f::MOI.ScalarAffineFunction)
160-
operate_terms!(-, f.terms)
152+
function MA.operate!(
153+
::typeof(-),
154+
f::Union{MOI.ScalarAffineFunction,MOI.ScalarQuadraticFunction},
155+
)
156+
map_terms!(Base.Fix1(operate_term, -), f)
161157
f.constant = -f.constant
162158
return f
163159
end

0 commit comments

Comments
 (0)