Update to JuMP v0.21 (#254)

* add jump v0.21 to allowed versions * FIX: failing tests with JuMP v0.21 In the APO formulation version of `constraint_mc_power_balance_load`, instead of looping over the conductors explicitly, we attempted to use `.==`, which doesn’t seem work in the new version of JuMP for some reason if even some of the `sum` calls are empty. * UPD: changelog and version bump Co-authored-by: David M Fobes <[email protected]>
lanl-ansi · Mar 12, 2020 · c1d34bb · c1d34bb · pseudocubic · Mar 12, 2020
1 parent ea55a3d
commit c1d34bb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## staged
 
+- none
+
+## v0.8.1
+
+- Update to support JuMP v0.21
 - Makes bounds optional, turned on by default (#250)
 - Updated transformer data model in the mathematical model (#250)
 - Add automatic parsing of lon,lat from buscoords file into PMD data structure (#245, #249)

diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ name = "PowerModelsDistribution"
 uuid = "d7431456-977f-11e9-2de3-97ff7677985e"
 authors = ["David M Fobes <[email protected]>", "Carleton Coffrin"]
 repo = "https://github.com/lanl-ansi/PowerModelsDistribution.jl.git"
-version = "0.8.0"
+version = "0.8.1"
 
 [deps]
 InfrastructureModels = "2030c09a-7f63-5d83-885d-db604e0e9cc0"
@@ -19,7 +19,7 @@ Cbc = ">= 0.4"
 InfrastructureModels = "~0.4"
 Ipopt = ">= 0.4"
 JSON = "~0.18, ~0.19, ~0.20, ~0.21"
-JuMP = "~0.19.2, ~0.20"
+JuMP = "~0.19.2, ~0.20, ~0.21"
 Juniper = ">= 0.4"
 MathOptInterface = "~0.8, ~0.9"
 Memento = "~0.10, ~0.11, ~0.12"

diff --git a/src/form/apo.jl b/src/form/apo.jl
@@ -71,16 +71,21 @@ function constraint_mc_power_balance_load(pm::_PMs.AbstractActivePowerModel, nw:
     pt   = get(_PMs.var(pm, nw),   :pt, Dict()); _PMs._check_var_keys(pt, bus_arcs_trans, "active power", "transformer")
     pd   = get(_PMs.var(pm, nw),   :pd_bus, Dict()); _PMs._check_var_keys(pg, bus_gens, "active power", "generator")
 
-    cstr_p = JuMP.@constraint(pm.model,
-        sum(p[a] for a in bus_arcs)
-        + sum(psw[a_sw] for a_sw in bus_arcs_sw)
-        + sum(pt[a_trans] for a_trans in bus_arcs_trans)
-        .==
-        sum(pg[g] for g in bus_gens)
-        - sum(ps[s] for s in bus_storage)
-        - sum(pd[d] for d in bus_loads)
-        - sum(diag(gs) for gs in values(bus_gs))*1.0^2
-    )
+    cstr_p = []
+
+    for c in _PMs.conductor_ids(pm; nw=nw)
+        cp = JuMP.@constraint(pm.model,
+            sum(p[a][c] for a in bus_arcs)
+            + sum(psw[a_sw][c] for a_sw in bus_arcs_sw)
+            + sum(pt[a_trans][c] for a_trans in bus_arcs_trans)
+            ==
+            sum(pg[g][c] for g in bus_gens)
+            - sum(ps[s][c] for s in bus_storage)
+            - sum(pd[d][c] for d in bus_loads)
+            - sum(diag(gs)[c] for gs in values(bus_gs))*1.0^2
+        )
+        push!(cstr_p, cp)
+    end
     # omit reactive constraint
     cnds = _PMs.conductor_ids(pm, nw)
     ncnds = length(cnds)