Refactor Utilities.default_copy_to (#1531)

jump-dev · Aug 14, 2021 · bd22950 · bd22950
1 parent b933423
commit bd22950
Show file tree

Hide file tree

Showing 8 changed files with 279 additions and 435 deletions.
diff --git a/src/Bridges/bridge_optimizer.jl b/src/Bridges/bridge_optimizer.jl
@@ -382,8 +382,7 @@ function MOIU.pass_nonvariable_constraints(
     dest::AbstractBridgeOptimizer,
     src::MOI.ModelLike,
     idxmap::MOIU.IndexMap,
-    constraint_types,
-    pass_cons;
+    constraint_types;
     filter_constraints::Union{Nothing,Function} = nothing,
 )
     if Variable.has_bridges(Variable.bridges(dest))
@@ -393,8 +392,7 @@ function MOIU.pass_nonvariable_constraints(
             dest,
             src,
             idxmap,
-            constraint_types,
-            pass_cons;
+            constraint_types;
             filter_constraints = filter_constraints,
         )
     end
@@ -411,16 +409,14 @@ function MOIU.pass_nonvariable_constraints(
         dest.model,
         src,
         idxmap,
-        not_bridged_types,
-        pass_cons;
+        not_bridged_types;
         filter_constraints = filter_constraints,
     )
     MOIU.pass_nonvariable_constraints_fallback(
         dest,
         src,
         idxmap,
-        bridged_types,
-        pass_cons;
+        bridged_types;
         filter_constraints = filter_constraints,
     )
     return

diff --git a/src/Test/test_model.jl b/src/Test/test_model.jl
@@ -22,8 +22,6 @@ function MOI.get(::BadModel, ::MOI.ListOfModelAttributesSet)
     return MOI.AbstractModelAttribute[]
 end
 
-MOI.get(::BadModel, ::MOI.NumberOfVariables) = 1
-
 MOI.get(::BadModel, ::MOI.ListOfVariableIndices) = [MOI.VariableIndex(1)]
 
 function MOI.get(::BadModel, ::MOI.ListOfVariableAttributesSet)
@@ -54,10 +52,6 @@ function MOI.get(
     return MOI.EqualTo(0.0)
 end
 
-function MOI.get(::BadModel, ::MOI.ListOfConstraintAttributesSet)
-    return MOI.AbstractConstraintAttribute[]
-end
-
 struct BadConstraintModel <: BadModel end
 
 function MOI.get(::BadConstraintModel, ::MOI.ListOfConstraintTypesPresent)

diff --git a/src/Utilities/cachingoptimizer.jl b/src/Utilities/cachingoptimizer.jl
@@ -252,17 +252,15 @@ function pass_nonvariable_constraints(
     dest::CachingOptimizer,
     src::MOI.ModelLike,
     idxmap::IndexMap,
-    constraint_types,
-    pass_cons;
+    constraint_types;
     filter_constraints::Union{Nothing,Function} = nothing,
 )
     dest.state == ATTACHED_OPTIMIZER && reset_optimizer(dest)
     return pass_nonvariable_constraints(
         dest.model_cache,
         src,
         idxmap,
-        constraint_types,
-        pass_cons;
+        constraint_types;
         filter_constraints = filter_constraints,
     )
 end