compact add_disjunction!

Author: hdavid16

src/macros.jl

@@ -86,21 +86,18 @@ function add_disjunction!(m::Model,disj...;reformulation::Symbol,M=missing,ϵ=1e
     #run checks
     @assert reformulation in [:big_m, :hull] "Invalid reformulation method passed to keyword argument `:reformulation`. Valid options are :big_m (Big-M Reformulation) and :hull (Hull Reformulation)."
     @assert length(disj) > 1 "At least 2 disjuncts must be included. If there is an empty disjunct, use `nothing`."
-
-    #get kwargs and set defaults if missing
-    param = reformulation == :big_m ? M : ϵ
-    bin_var = ismissing(name) ? Symbol("disj",gensym()) : name
 
-    #apply reformulation
+    #create indicator variable
+    bin_var = ismissing(name) ? Symbol("disj_",gensym()) : name
     if bin_var in keys(object_dictionary(m))
-        @assert m[bin_var] isa Vector{VariableRef} "The binary variable $bin_var is already registered in the model and is not of type Vector{VariableRef}. Specify a new name for the disjunction."
-        @assert length(disj) <= length(m[bin_var]) "The binary variable $bin_var is already registered in the model and its size is smaller than the number of disjunts. Specify a new name for the disjunction."
+        @assert m[bin_var] isa AbstractArray{VariableRef} "The binary variable $bin_var is already registered in the model and is not of type AbstractArray{VariableRef}. Specify a new name for the disjunction."
+        @assert length(disj) <= prod(size(m[bin_var])) "The binary variable $bin_var is already registered in the model and its size is smaller than the number of disjunts. Specify a new name for the disjunction."
     else
-        #create indicator variable
         m[bin_var] = @variable(m, [eachindex(disj)], Bin, base_name = string(bin_var))
     end
 
     #reformulate disjunction
+    param = reformulation == :big_m ? M : ϵ
     reformulate_disjunction(m, disj...; bin_var, reformulation, param)
 end