fix bugs to make more robust

Author: hdavid16

src/constraint.jl

@@ -30,6 +30,9 @@ function check_constraint!(m::Model, constr_j::Tuple, constr_list::Vector)
     map(constr_jk -> check_constraint!(m, constr_jk, constr_list), constr_j)
 end
 function check_constraint!(m::Model, constr_j::AbstractArray, constr_list::Vector)
+    map(constr_jk -> check_constraint!(m, constr_jk, constr_list), constr_j)
+end
+function check_constraint!(m::Model, constr_j::AbstractArray{<:ConstraintRef}, constr_list::Vector)
     push!(constr_list, check_constraint!(m, constr_j))
 end
 function check_constraint!(m::Model, constr_j::ConstraintRef, constr_list::Vector)
@@ -45,7 +48,7 @@ function check_constraint!(m::Model, constr::ConstraintRef)
     end
     return new_constr
 end
-function check_constraint!(m::Model, constr::AbstractArray)
+function check_constraint!(m::Model, constr::AbstractArray{<:ConstraintRef})
     @assert all(is_valid.(m, constr)) "$constr is not a valid constraint."
     if !any(is_interval.(constr)) && !any(is_equalto.(constr))
         new_constr = constr

src/reformulate.jl

@@ -17,21 +17,15 @@ function reformulate_disjunction(m::Model, disj...; bin_var, reformulation, para
     if reformulation == :hull
         disaggregate_variables(m, disj, bin_var)
     end
-    _reformulate_disjunction(disj, bin_var, reformulation, param)
-    for item in filter(is_constraint, disj)
-        if item isa ConstraintRef
-            push!(m.ext[bin_var], item)
-        else
-            append!(m.ext[bin_var], item)
-        end
-    end
-    # NOTE: Next line files when a disjunct has a single ConstraintRef since iterate is not defined for this type
-    # push!(m.ext[bin_var], Iterators.flatten(filter(is_constraint, disj))...)
+    reformulate_disjunction(m, disj, bin_var, reformulation, param)
 end
-function _reformulate_disjunction(disj, bin_var, reformulation, param)
+function reformulate_disjunction(m::Model, disj, bin_var, reformulation, param)
     for (i,constr) in enumerate(disj)
         reformulate_constraint(constr, bin_var, reformulation, param, i)
     end
+    update_constraint_list!(disj, m.ext[bin_var])
+    # NOTE: Next line files when a disjunct has a single ConstraintRef since iterate is not defined for this type
+    # push!(m.ext[bin_var], Iterators.flatten(filter(is_constraint, disj))...)
 end
 
 """

src/utils.jl

@@ -206,4 +206,22 @@ Check if a constraint or tuple of constraints is valid.
 is_constraint(constr::ConstraintRef) = is_valid(constr.model,constr)
 is_constraint(constr::AbstractArray) = all(is_constraint.(constr))
 is_constraint(constr::Tuple) = all(is_constraint.(constr))
-is_constraint(constr::Nothing) = false
+is_constraint(constr::Nothing) = false
+
+"""
+    update_constraint_list!(disj, list::Vector)
+
+Update constraint list (for disjunction constraints stored in .ext Dict)
+"""
+function update_constraint_list!(disj, list::Vector)
+    disj_constraints = filter(is_constraint, disj)
+    for item in disj_constraints
+        update_constraint_list!(item, list)
+    end
+end
+function update_constraint_list!(item::AbstractArray{<:ConstraintRef}, list::Vector)
+    for idx in eachindex(item)
+        update_constraint_list!(item[idx], list)
+    end
+end
+update_constraint_list!(item::ConstraintRef, list::Vector) = push!(list, item)