[Utilities] test pass_nonvariable_constraints (#2663)

Author: odow

src/Bridges/bridge_optimizer.jl

@@ -407,12 +407,13 @@ function MOI.Utilities.pass_nonvariable_constraints(
     if Variable.has_bridges(Variable.bridges(dest))
         # The functions may contained bridged variables which needs to be
         # substituted so we use the fallback.
-        return MOI.Utilities.pass_nonvariable_constraints_fallback(
+        MOI.Utilities.pass_nonvariable_constraints_fallback(
             dest,
             src,
             idxmap,
             constraint_types,
         )
+        return
     end
     not_bridged_types = eltype(constraint_types)[]
     bridged_types = eltype(constraint_types)[]

src/Utilities/cachingoptimizer.jl

@@ -264,13 +264,16 @@ function pass_nonvariable_constraints(
     idxmap::IndexMap,
     constraint_types,
 )
-    dest.state == ATTACHED_OPTIMIZER && reset_optimizer(dest)
-    return pass_nonvariable_constraints(
+    # This method gets called during default_copy_to, so the dest cannot be
+    # attached at that point.
+    @assert dest.state != ATTACHED_OPTIMIZER
+    pass_nonvariable_constraints(
         dest.model_cache,
         src,
         idxmap,
         constraint_types,
     )
+    return
 end
 
 function final_touch(m::CachingOptimizer, index_map)

src/Utilities/model.jl

@@ -608,12 +608,13 @@ function pass_nonvariable_constraints(
     idxmap::IndexMap,
     constraint_types,
 )
-    return pass_nonvariable_constraints(
+    pass_nonvariable_constraints(
         dest.constraints,
         src,
         idxmap,
         constraint_types,
     )
+    return
 end
 
 # Macro to generate Model

src/Utilities/universalfallback.jl

@@ -93,12 +93,8 @@ function pass_nonvariable_constraints(
         end
     end
     pass_nonvariable_constraints(dest.model, src, idxmap, supported_types)
-    return pass_nonvariable_constraints_fallback(
-        dest,
-        src,
-        idxmap,
-        unsupported_types,
-    )
+    pass_nonvariable_constraints_fallback(dest, src, idxmap, unsupported_types)
+    return
 end
 
 function MOI.copy_to(dest::UniversalFallback, src::MOI.ModelLike)

test/Utilities/cachingoptimizer.jl

@@ -1390,6 +1390,19 @@ function test_delete_not_allowed()
     return
 end
 
+function test_pass_nonvariable_constraints()
+    cache = MOI.Utilities.Model{Float64}()
+    optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
+    dest = MOI.Utilities.CachingOptimizer(cache, optimizer)
+    MOI.Utilities.attach_optimizer(dest)
+    src = MOI.Utilities.Model{Float64}()
+    x = MOI.add_variable(src)
+    MOI.add_constraint(src, 1.0 * x, MOI.GreaterThan(1.0))
+    index_map = MOI.Utilities.default_copy_to(dest, src)
+    @test sprint(print, dest) == sprint(print, src)
+    return
+end
+
 end  # module
 
 TestCachingOptimizer.runtests()