bug fix and update version

Author: hdavid16

Project.toml

@@ -1,7 +1,7 @@
 name = "DisjunctiveProgramming"
 uuid = "0d27d021-0159-4c7d-b4a7-9ccb5d9366cf"
 authors = ["hdavid16 <[email protected]>"]
-version = "0.1.3"
+version = "0.1.4"
 
 [deps]
 IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"

README.md

@@ -34,16 +34,25 @@ m = Model()
 @constraint(m, con3[i=1:2], [5,4][i] <= x[i])
 @constraint(m, con4[i=1:2], x[i] <= [9,6][i])
 
-@disjunction(m,(con1,con2),(con3,con4), reformulation=:BMR)
-
-┌ Warning: No M value passed for con1[1] : x[1] <= 3.0. M = 7.0 was inferred from the variable bounds.
-┌ Warning: No M value passed for con1[2] : x[2] <= 4.0. M = 6.0 was inferred from the variable bounds.
-┌ Warning: No M value passed for con2[1] : -x[1] <= 0.0. M = 0.0 was inferred from the variable bounds.
-┌ Warning: No M value passed for con2[2] : -x[2] <= 0.0. M = 0.0 was inferred from the variable bounds.
-┌ Warning: No M value passed for con3[1] : -x[1] <= -5.0. M = 5.0 was inferred from
-the variable bounds.
-┌ Warning: No M value passed for con3[2] : -x[2] <= -4.0. M = 4.0 was inferred from
-the variable bounds.
-┌ Warning: No M value passed for con4[1] : x[1] <= 9.0. M = 1.0 was inferred from the variable bounds.
-┌ Warning: No M value passed for con4[2] : x[2] <= 6.0. M = 4.0 was inferred from the variable bounds.
+@disjunction(m,(con1,con2),(con3,con4), reformulation=:BMR, name = :y)
+
+print(m)
+
+# Feasibility
+# Subject to
+#  y[1] + y[2] == 1.0
+#  con1[1] : x[1] + 7 y[1] <= 10.0
+#  con1[2] : x[2] + 6 y[1] <= 10.0
+#  con2[1] : -x[1] <= 0.0
+#  con2[2] : -x[2] <= 0.0
+#  con3[1] : -x[1] + 5 y[2] <= 0.0
+#  con3[2] : -x[2] + 4 y[2] <= 0.0
+#  con4[1] : x[1] + y[2] <= 10.0
+#  con4[2] : x[2] + 4 y[2] <= 10.0
+#  x[1] >= 0.0
+#  x[2] >= 0.0
+#  x[1] <= 10.0
+#  x[2] <= 10.0
+#  y[1] binary
+#  y[2] binary
 ```

src/reformulate.jl

@@ -94,7 +94,7 @@ function apply_interval_arithmetic(ref)
     ref_func_expr = Meta.parse(ref_func)
     #create a map of variables to their bounds
     interval_map = Dict()
-    vars = all_variables(ref.model) #get all variable names
+    vars = ref.model[:original_model_variables]
     for var in vars
         @assert !is_binary(var) && !is_integer(var) "GDP does not allow mixed-integer or integer constraints inside the disjuncts."
         UB = has_upper_bound(var) ? upper_bound(var) : Inf
@@ -122,11 +122,9 @@ function lin_bigM(ref, bin_var_ref, M)
 end
 
 function nl_bigM(ref, bin_var_ref, M)
-    #extract info
-    vars = ref.model[:original_model_variables]
-
     #create symbolic variables (using Symbolics.jl)
     sym_vars = []
+    vars = ref.model[:original_model_variables]
     for var in vars
         var_sym = Symbol(var)
         push!(sym_vars, eval(:(Symbolics.@variables($var_sym)))[1])
@@ -201,12 +199,10 @@ function lin_perspective_function(ref, bin_var_ref, i)
 end
 
 function nl_perspective_function(ref, bin_var_ref, i, eps)
-    #extract info
-    vars = ref.model[:original_model_variables]
-
     #create symbolic variables (using Symbolics.jl)
     sym_vars = []
     sym_i_vars = []
+    vars = ref.model[:original_model_variables]
     for var in vars
         var_sym = Symbol(var) #original variable
         push!(sym_vars, eval(:(Symbolics.@variables($var_sym)))[1])