close #55

Author: hdavid16

Project.toml

@@ -4,15 +4,11 @@ authors = ["hdavid16 <[email protected]>"]
 version = "0.3.2"
 
 [deps]
-IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
-Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 
 [compat]
-IntervalArithmetic = "0.20"
 JuMP = "1.2"
-Suppressor = "0.2"
 Symbolics = "4"
 julia = "1.6"
 

src/DisjunctiveProgramming.jl

@@ -1,6 +1,6 @@
 module DisjunctiveProgramming
 
-using JuMP, IntervalArithmetic, Symbolics, Suppressor
+using JuMP, Symbolics
 
 export add_disjunction!, add_proposition!
 export @disjunction, @proposition

src/bigm.jl

@@ -43,23 +43,35 @@ big_m_reformulation!(constr::AbstractArray{<:ConstraintRef}, bin_var, M, i, j, k
 Apply interval arithmetic on a constraint to infer the tightest Big-M value from the bounds on the constraint.
 """
 function infer_bigm(constr::ConstraintRef)
-    #convert constraints into Expr to replace variables with interval sets and determine bounds
-    constr_type, constr_func_expr, constr_rhs = parse_constraint(constr)
+    constr_obj = constraint_object(constr)
+    constr_terms = constr_obj.func.terms
+    constr_set = constr_obj.set
     #create a map of variables to their bounds
-    interval_map = Dict()
-    vars = all_variables(constr.model)#constr.model[:gdp_variable_constrs]
-    obj_dict = object_dictionary(constr.model)
-    bounds_dict = :variable_bounds_dict in keys(obj_dict) ? obj_dict[:variable_bounds_dict] : Dict() #NOTE: should pass as an keyword argument
-    for var in vars
-        LB, UB = get_bounds(var, bounds_dict)
-        interval_map[string(var)] = LB..UB
+    bounds_dict = :variable_bounds_dict in keys(constr.model.ext) ? constr.model.ext[:variable_bounds_dict] : Dict()
+    bounds_map = Dict(
+        var => get_bounds(var, bounds_dict)
+        for var in get_constraint_variables(constr)
+    )
+    #apply interval arithmetic
+    if constr_set isa MOI.LessThan
+        M = -constr_set.upper
+        for (var,coeff) in constr_terms
+            if coeff > 0
+                M += coeff*bounds_map[var][2]
+            else
+                M += coeff*bounds_map[var][1]
+            end
+        end
+    elseif constr_set isa MOI.GreaterThan
+        M = -constr_st.lower
+        for (var,coeff) in constr_terms
+            if coeff < 0
+                M += coeff*bounds_map[var][2]
+            else
+                M += coeff*bounds_map[var][1]
+            end
+        end
     end
-    constr_func_expr = replace_intevals!(constr_func_expr, interval_map)
-    #get bounds on the entire expression
-    func_bounds = eval(constr_func_expr)
-    Mlo = func_bounds.lo - constr_rhs
-    Mhi = func_bounds.hi - constr_rhs
-    M = constr_type == :(<=) ? Mhi : Mlo
     isinf(M) && error("M parameter for $constr cannot be infered due to lack of variable bounds.")
     return M
 end