Skip to content

Commit bd22950

Browse files
authored
Refactor Utilities.default_copy_to (#1531)
1 parent b933423 commit bd22950

File tree

8 files changed

+279
-435
lines changed

8 files changed

+279
-435
lines changed

src/Bridges/bridge_optimizer.jl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ function MOIU.pass_nonvariable_constraints(
382382
dest::AbstractBridgeOptimizer,
383383
src::MOI.ModelLike,
384384
idxmap::MOIU.IndexMap,
385-
constraint_types,
386-
pass_cons;
385+
constraint_types;
387386
filter_constraints::Union{Nothing,Function} = nothing,
388387
)
389388
if Variable.has_bridges(Variable.bridges(dest))
@@ -393,8 +392,7 @@ function MOIU.pass_nonvariable_constraints(
393392
dest,
394393
src,
395394
idxmap,
396-
constraint_types,
397-
pass_cons;
395+
constraint_types;
398396
filter_constraints = filter_constraints,
399397
)
400398
end
@@ -411,16 +409,14 @@ function MOIU.pass_nonvariable_constraints(
411409
dest.model,
412410
src,
413411
idxmap,
414-
not_bridged_types,
415-
pass_cons;
412+
not_bridged_types;
416413
filter_constraints = filter_constraints,
417414
)
418415
MOIU.pass_nonvariable_constraints_fallback(
419416
dest,
420417
src,
421418
idxmap,
422-
bridged_types,
423-
pass_cons;
419+
bridged_types;
424420
filter_constraints = filter_constraints,
425421
)
426422
return

src/Test/test_model.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ function MOI.get(::BadModel, ::MOI.ListOfModelAttributesSet)
2222
return MOI.AbstractModelAttribute[]
2323
end
2424

25-
MOI.get(::BadModel, ::MOI.NumberOfVariables) = 1
26-
2725
MOI.get(::BadModel, ::MOI.ListOfVariableIndices) = [MOI.VariableIndex(1)]
2826

2927
function MOI.get(::BadModel, ::MOI.ListOfVariableAttributesSet)
@@ -54,10 +52,6 @@ function MOI.get(
5452
return MOI.EqualTo(0.0)
5553
end
5654

57-
function MOI.get(::BadModel, ::MOI.ListOfConstraintAttributesSet)
58-
return MOI.AbstractConstraintAttribute[]
59-
end
60-
6155
struct BadConstraintModel <: BadModel end
6256

6357
function MOI.get(::BadConstraintModel, ::MOI.ListOfConstraintTypesPresent)

src/Utilities/cachingoptimizer.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,17 +252,15 @@ function pass_nonvariable_constraints(
252252
dest::CachingOptimizer,
253253
src::MOI.ModelLike,
254254
idxmap::IndexMap,
255-
constraint_types,
256-
pass_cons;
255+
constraint_types;
257256
filter_constraints::Union{Nothing,Function} = nothing,
258257
)
259258
dest.state == ATTACHED_OPTIMIZER && reset_optimizer(dest)
260259
return pass_nonvariable_constraints(
261260
dest.model_cache,
262261
src,
263262
idxmap,
264-
constraint_types,
265-
pass_cons;
263+
constraint_types;
266264
filter_constraints = filter_constraints,
267265
)
268266
end

0 commit comments

Comments
 (0)