include variable-in-set constraints when including inequalities in incidence graph creation

Author: Robbybp

src/incidence_graph.jl

@@ -97,8 +97,7 @@ function get_bipartite_incidence_graph(
         # to standardize at some point. E.g. a get_scalar_constraints function.
         constraints = JuMP.all_constraints(
             model,
-            # TODO: Should this be an optional argument to this function?
-            include_variable_in_set_constraints=false,
+            include_variable_in_set_constraints = true,
         )   
     else
         constraints = get_equality_constraints(model)

test/incidence_graph.jl

@@ -93,9 +93,25 @@ function test_get_incidence_graph_badconstraint()
     return
 end
 
+function test_include_bound_as_inequality()
+    m = jmp.Model()
+    @jmp.variable(m, 0 <= x[1:2])
+    @jmp.constraint(m, eq1, x[1] + 2*x[2] == 1)
+    graph, con_node_map, var_node_map = get_bipartite_incidence_graph(
+        m, include_inequality = true
+    )
+    A, B, E = graph
+    @test length(A) == 3
+    @test length(B) == 2
+    @test length(E) == 4
+    pred_con_set = Set([eq1, jmp.LowerBoundRef(x[1]), jmp.LowerBoundRef(x[2])])
+    @test pred_con_set == keys(con_node_map)
+end
+
 function runtests()
     test_get_incidence_graph()
     test_get_incidence_graph_badconstraint()
+    test_include_bound_as_inequality()
     return
 end
 

test/interface.jl

@@ -238,6 +238,19 @@ function test_overconstrained_due_to_fixed_variable()
     @test length(con_dmp.unmatched) == 1
 end
 
+function test_overconstrained_due_to_including_bound()
+    m = JuMP.Model()
+    @JuMP.variable(m, x)
+    @JuMP.variable(m, 0.01 <= y)
+    @JuMP.constraint(m, 2*x + y == 1)
+    @JuMP.NLconstraint(m, x == sqrt(y))
+    igraph = ji.IncidenceGraphInterface(m, include_inequality = true)
+    con_dmp, var_dmp = ji.dulmage_mendelsohn(igraph)
+    @test length(var_dmp.overconstrained) == 2
+    @test length(con_dmp.overconstrained) == 2
+    @test length(con_dmp.unmatched) == 1
+end
+
 function runtests()
     test_construct_interface()
     test_construct_interface_rectangular()
@@ -248,6 +261,7 @@ function runtests()
     test_maximum_matching()
     test_dulmage_mendelsohn()
     test_overconstrained_due_to_fixed_variable()
+    test_overconstrained_due_to_including_bound()
 end
 
 end