Fix Deletion of Variable Dependencies

src/derivatives.jl

@@ -815,15 +815,15 @@
     # delete any derivative constraints associated with this derivative 
     delete_derivative_constraints(dref)
     # delete associated point variables and mapping
-    for index in _point_variable_dependencies(dref)
+    for index in copy(_point_variable_dependencies(dref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     # delete associated semi-infinite variables and mapping
-    for index in _semi_infinite_variable_dependencies(dref)
+    for index in copy(_semi_infinite_variable_dependencies(dref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     # delete associated derivative variables and mapping 
-    for index in _derivative_dependencies(dref)
+    for index in copy(_derivative_dependencies(dref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     return

src/infinite_variables.jl

@@ -815,15 +815,15 @@
         end
     end
     # delete associated point variables and mapping
-    for index in _point_variable_dependencies(vref)
+    for index in copy(_point_variable_dependencies(vref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     # delete associated semi-infinite variables and mapping
-    for index in _semi_infinite_variable_dependencies(vref)
+    for index in copy(_semi_infinite_variable_dependencies(vref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     # delete associated derivative variables and mapping 
-    for index in _derivative_dependencies(vref)
+    for index in copy(_derivative_dependencies(vref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     return

src/measures.jl

@@ -1441,7 +1441,7 @@
         end
     end
     # delete associated derivative variables and mapping 
-    for index in _derivative_dependencies(mref)
+    for index in copy(_derivative_dependencies(mref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     # Update that the variables used by it are no longer used by it

src/scalar_parameters.jl

@@ -1719,7 +1719,7 @@
     # delete dependence of measures on pref
     _update_measures(model, gvref)
     # delete any derivatives that use pref 
-    for index in _derivative_dependencies(pref)
+    for index in copy(_derivative_dependencies(pref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     # update constraints in mapping to remove the parameter

src/semi_infinite_variables.jl

@@ -812,7 +812,7 @@
     filter!(e -> e != JuMP.index(vref), _semi_infinite_variable_dependencies(ivref))
     # delete associated derivative variables and mapping 
     model = JuMP.owner_model(vref)
-    for index in _derivative_dependencies(vref)
+    for index in copy(_derivative_dependencies(vref))
         JuMP.delete(model, dispatch_variable_ref(model, index))
     end
     # remove the lookup entry

src/variable_basics.jl

@@ -1101,7 +1101,7 @@
     _delete_variable_dependencies(vref)
     gvref = GeneralVariableRef(model, JuMP.index(vref))
     # remove from measures if used
-    for mindex in _measure_dependencies(vref)
+    for mindex in copy(_measure_dependencies(vref))
         mref = dispatch_variable_ref(model, mindex)
         func = measure_function(mref)
         data = measure_data(mref)

test/deletion.jl

@@ -549,6 +549,7 @@ end
     @variable(m, 0 <= x <= 1, Infinite(par), Bin)
     @variable(m, y == 1, Infinite(par), Int)
     @variable(m, x0, Point(x, 0))
+    @variable(m, xf, Point(x, 1))
     var = build_variable(error, x, Dict{Int, Float64}(1 => 0.5), check = false)
     rv = add_variable(m, var)
     data = TestData(par, 0, 1)
@@ -570,6 +571,7 @@ end
     @test InfiniteOpt._infinite_variable_dependencies(par) == [index(y)]
     @test !is_valid(m, rv)
     @test !is_valid(m, x0)
+    @test !is_valid(m, xf)
     @test !is_valid(m, d1)
     @test !haskey(InfiniteOpt._data_dictionary(m, InfiniteVariable), JuMP.index(x))
     @test !is_valid(m, con3)
@@ -604,6 +606,7 @@ end
     d2 = @deriv(y, par^2)
     d3 = @deriv(d1, par2)
     @variable(m, dx0, Point(d1, 0, 0))
+    @variable(m, dxf, Point(d1, 1, 1))
     var = build_variable(error, d1, Dict{Int, Float64}(1 => 0.5), check = false)
     rv = add_variable(m, var)
     data = TestData(par, 0, 1)
@@ -625,6 +628,7 @@ end
     @test InfiniteOpt._derivative_dependencies(par) == [index(d2)]
     @test !is_valid(m, rv)
     @test !is_valid(m, dx0)
+    @test !is_valid(m, dxf)
     @test !is_valid(m, d3)
     @test !is_valid(m, cref)
     @test !is_valid(m, con3)