Updating syntax for Julia v0.5 and JuMP v0.15 (#57)

* adding Julia 0.5, JuMP 0.15, Pajarito 3.1 requirements
* updating summation syntax

* removing julia 0.4 from travis

* removing Julia v0.6

Author: ccoffrin

.travis.yml

@@ -3,7 +3,6 @@ os:
   - linux
   - osx
 julia:
-  - 0.4
   - 0.5
 cache:
  directories:

CHANGELOG.md

@@ -1,6 +1,9 @@
 PowerModels.jl Change Log 
 =================
 
+### staged
+- Updated to JuMP v0.15 syntax
+
 ### v0.2.3
 - Multiple improvements to Matlab file parsing
   - Added support matlab cell arrays

REQUIRE

@@ -1,5 +1,5 @@
-julia 0.4.6
+julia 0.5
 JSON 0.6.0
 MathProgBase 0.5.4
-JuMP 0.14 0.15-
+JuMP 0.15 0.16-
 Compat 0.7.9

src/core/objective.jl

@@ -6,7 +6,7 @@
 function objective_min_fuel_cost{T}(pm::GenericPowerModel{T})
     pg = getvariable(pm.model, :pg)
     cost = (i) -> pm.set.gens[i]["cost"]
-    return @objective(pm.model, Min, sum{ cost(i)[1]*pg[i]^2 + cost(i)[2]*pg[i] + cost(i)[3], i in pm.set.gen_indexes} )
+    return @objective(pm.model, Min, sum(cost(i)[1]*pg[i]^2 + cost(i)[2]*pg[i] + cost(i)[3] for i in pm.set.gen_indexes) )
 end
 
 function objective_min_fuel_cost{T <: AbstractConicPowerFormulation}(pm::GenericPowerModel{T})
@@ -19,12 +19,12 @@ function objective_min_fuel_cost{T <: AbstractConicPowerFormulation}(pm::Generic
     end
 
     cost = (i) -> pm.set.gens[i]["cost"]
-    return @objective(pm.model, Min, sum{ cost(i)[1]*pg_sqr[i] + cost(i)[2]*pg[i] + cost(i)[3], i in pm.set.gen_indexes} )
+    return @objective(pm.model, Min, sum( cost(i)[1]*pg_sqr[i] + cost(i)[2]*pg[i] + cost(i)[3] for i in pm.set.gen_indexes) )
 end
 
 ### Cost of building lines
 function objective_tnep_cost{T}(pm::GenericPowerModel{T})
     line_ne = getvariable(pm.model, :line_ne)
     branches = pm.ext[:ne].branches
-    return @objective(pm.model, Min, sum{ branches[i]["construction_cost"]*line_ne[i], (i,branch) in branches} )
+    return @objective(pm.model, Min, sum( branches[i]["construction_cost"]*line_ne[i] for (i,branch) in branches) )
 end

src/form/acp.jl

@@ -61,7 +61,7 @@ function constraint_active_kcl_shunt{T <: AbstractACPForm}(pm::GenericPowerModel
     p = getvariable(pm.model, :p)
     pg = getvariable(pm.model, :pg)
 
-    c = @constraint(pm.model, sum{p[a], a in bus_branches} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*v[i]^2)
+    c = @constraint(pm.model, sum(p[a] for a in bus_branches) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*v[i]^2)
     return Set([c])
 end
 
@@ -76,7 +76,7 @@ function constraint_active_kcl_shunt_ne{T <: AbstractACPForm}(pm::GenericPowerMo
     p_ne = getvariable(pm.model, :p_ne)
     pg = getvariable(pm.model, :pg)
 
-    c = @constraint(pm.model, sum{p[a], a in bus_branches} + sum{p_ne[a], a in bus_branches_ne} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*v[i]^2)
+    c = @constraint(pm.model, sum(p[a] for a in bus_branches) + sum(p_ne[a] for a in bus_branches_ne) == sum(pg[g], g in bus_gens) - bus["pd"] - bus["gs"]*v[i]^2)
     return Set([c])
 end
 
@@ -90,7 +90,7 @@ function constraint_reactive_kcl_shunt{T <: AbstractACPForm}(pm::GenericPowerMod
     q = getvariable(pm.model, :q)
     qg = getvariable(pm.model, :qg)
 
-    c = @constraint(pm.model, sum{q[a], a in bus_branches} == sum{qg[g], g in bus_gens} - bus["qd"] + bus["bs"]*v[i]^2)
+    c = @constraint(pm.model, sum(q[a] for a in bus_branches) == sum(qg[g] for g in bus_gens) - bus["qd"] + bus["bs"]*v[i]^2)
     return Set([c])
 end
 
@@ -105,7 +105,7 @@ function constraint_reactive_kcl_shunt_ne{T <: AbstractACPForm}(pm::GenericPower
     q_ne = getvariable(pm.model, :q_ne)
     qg = getvariable(pm.model, :qg)
 
-    c = @constraint(pm.model, sum{q[a], a in bus_branches} + sum{q_ne[a], a in bus_branches_ne} == sum{qg[g], g in bus_gens} - bus["qd"] + bus["bs"]*v[i]^2)
+    c = @constraint(pm.model, sum(q[a] for a in bus_branches) + sum(q_ne[a] for a in bus_branches_ne) == sum(qg[g] for g in bus_gens) - bus["qd"] + bus["bs"]*v[i]^2)
     return Set([c])
 end
 
@@ -409,7 +409,7 @@ function objective_max_loading_voltage_norm{T}(pm::GenericPowerModel{T})
     scale = length(pm.set.buses)
     v = getvariable(pm.model, :v)
 
-    return @objective(pm.model, Max, 10*scale*load_factor - sum{ ((bus["vmin"] + bus["vmax"])/2 - v[i])^2, (i,bus) in pm.set.buses })
+    return @objective(pm.model, Max, 10*scale*load_factor - sum(((bus["vmin"] + bus["vmax"])/2 - v[i])^2 for (i,bus) in pm.set.buses ))
 end
 
 # Works but adds unnessiary runtime
@@ -420,7 +420,7 @@ function objective_max_loading_gen_output{T}(pm::GenericPowerModel{T})
     pg = getvariable(pm.model, :pg)
     qg = getvariable(pm.model, :qg)
 
-    return @NLobjective(pm.model, Max, 100*scale*load_factor - sum{ (pg[i]^2 - (2*qg[i])^2)^2, (i,gen) in pm.set.gens })
+    return @NLobjective(pm.model, Max, 100*scale*load_factor - sum( (pg[i]^2 - (2*qg[i])^2)^2 for (i,gen) in pm.set.gens ))
 end
 
 
@@ -453,10 +453,10 @@ function constraint_active_kcl_shunt_scaled(pm::APIACPPowerModel, bus)
     pg = getvariable(pm.model, :pg)
 
     if bus["pd"] > 0 && bus["qd"] > 0
-        c = @constraint(pm.model, sum{p[a], a in bus_branches} == sum{pg[g], g in bus_gens} - bus["pd"]*load_factor - bus["gs"]*v[i]^2)
+        c = @constraint(pm.model, sum(p[a] for a in bus_branches) == sum(pg[g] for g in bus_gens) - bus["pd"]*load_factor - bus["gs"]*v[i]^2)
     else
         # super fallback impl
-        c = @constraint(pm.model, sum{p[a], a in bus_branches} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*v[i]^2)
+        c = @constraint(pm.model, sum(p[a] for a in bus_branches) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*v[i]^2)
     end
 
     return Set([c])

src/form/dcp.jl

@@ -88,7 +88,7 @@ function constraint_active_kcl_shunt{T <: AbstractDCPForm}(pm::GenericPowerModel
     pg = getvariable(pm.model, :pg)
     p_expr = pm.model.ext[:p_expr]
 
-    c = @constraint(pm.model, sum{p_expr[a], a in bus_branches} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*1.0^2)
+    c = @constraint(pm.model, sum(p_expr[a] for a in bus_branches) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*1.0^2)
     return Set([c])
 end
 
@@ -102,7 +102,7 @@ function constraint_active_kcl_shunt_ne{T <: AbstractDCPForm}(pm::GenericPowerMo
     p_expr = pm.model.ext[:p_expr]
     p_ne_expr = pm.model.ext[:p_ne_expr]
 
-    c = @constraint(pm.model, sum{p_expr[a], a in bus_branches} + sum{p_ne_expr[a], a in bus_branches_ne} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*1.0^2)
+    c = @constraint(pm.model, sum(p_expr[a] for a in bus_branches) + sum(p_ne_expr[a] for a in bus_branches_ne) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*1.0^2)
     return Set([c])
 end
 
@@ -358,7 +358,7 @@ function constraint_active_kcl_shunt{T <: AbstractDCPLLForm}(pm::GenericPowerMod
     pg = getvariable(pm.model, :pg)
     p = getvariable(pm.model, :p)
 
-    c = @constraint(pm.model, sum{p[a], a in bus_branches} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*1.0^2)
+    c = @constraint(pm.model, sum(p[a] for a in bus_branches) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*1.0^2)
     return Set([c])
 end
 
@@ -372,7 +372,7 @@ function constraint_active_kcl_shunt_ne{T <: AbstractDCPLLForm}(pm::GenericPower
     p_ne = getvariable(pm.model, :p_ne)
     pg = getvariable(pm.model, :pg)
 
-    c = @constraint(pm.model, sum{p[a], a in bus_branches} + sum{p_ne[a], a in bus_branches_ne} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*1.0^2)
+    c = @constraint(pm.model, sum(p[a] for a in bus_branches) + sum(p_ne[a] for a in bus_branches_ne) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*1.0^2)
     return Set([c])
 end
 

src/form/wr.jl

@@ -56,7 +56,7 @@ function constraint_active_kcl_shunt{T <: AbstractWRForm}(pm::GenericPowerModel{
     p = getvariable(pm.model, :p)
     pg = getvariable(pm.model, :pg)
 
-    c = @constraint(pm.model, sum{p[a], a in bus_branches} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*w[i])
+    c = @constraint(pm.model, sum(p[a] for a in bus_branches) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*w[i])
     return Set([c])
 end
 
@@ -71,7 +71,7 @@ function constraint_active_kcl_shunt_ne{T <: AbstractWRForm}(pm::GenericPowerMod
     p_ne = getvariable(pm.model, :p_ne)
     pg = getvariable(pm.model, :pg)
 
-    c = @constraint(pm.model, sum{p[a], a in bus_branches} + sum{p_ne[a], a in bus_branches_ne} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*w[i])
+    c = @constraint(pm.model, sum(p[a] for a in bus_branches) + sum(p_ne[a] for a in bus_branches_ne) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*w[i])
     return Set([c])
 end
 
@@ -84,7 +84,7 @@ function constraint_reactive_kcl_shunt{T <: AbstractWRForm}(pm::GenericPowerMode
     q = getvariable(pm.model, :q)
     qg = getvariable(pm.model, :qg)
 
-    c = @constraint(pm.model, sum{q[a], a in bus_branches} == sum{qg[g], g in bus_gens} - bus["qd"] + bus["bs"]*w[i])
+    c = @constraint(pm.model, sum(q[a] for a in bus_branches) == sum(qg[g] for g in bus_gens) - bus["qd"] + bus["bs"]*w[i])
     return Set([c])
 end
 
@@ -99,7 +99,7 @@ function constraint_reactive_kcl_shunt_ne{T <: AbstractWRForm}(pm::GenericPowerM
     q_ne = getvariable(pm.model, :q_ne)
     qg = getvariable(pm.model, :qg)
 
-    c = @constraint(pm.model, sum{q[a], a in bus_branches} + sum{q_ne[a], a in bus_branches_ne} == sum{qg[g], g in bus_gens} - bus["qd"] + bus["bs"]*w[i])
+    c = @constraint(pm.model, sum(q[a] for a in bus_branches) + sum(q_ne[a] for a in bus_branches_ne) == sum(qg[g] for g in bus_gens) - bus["qd"] + bus["bs"]*w[i])
     return Set([c])
 end
 

src/form/wrm.jl

@@ -44,7 +44,7 @@ function constraint_active_kcl_shunt{T <: AbstractWRMForm}(pm::GenericPowerModel
     p = getvariable(pm.model, :p)
     pg = getvariable(pm.model, :pg)
 
-    c = @constraint(pm.model, sum{p[a], a in bus_branches} == sum{pg[g], g in bus_gens} - bus["pd"] - bus["gs"]*w_i)
+    c = @constraint(pm.model, sum(p[a] for a in bus_branches) == sum(pg[g] for g in bus_gens) - bus["pd"] - bus["gs"]*w_i)
     return Set([c])
 end
 
@@ -60,7 +60,7 @@ function constraint_reactive_kcl_shunt{T <: AbstractWRMForm}(pm::GenericPowerMod
     q = getvariable(pm.model, :q)
     qg = getvariable(pm.model, :qg)
 
-    c = @constraint(pm.model, sum{q[a], a in bus_branches} == sum{qg[g], g in bus_gens} - bus["qd"] + bus["bs"]*w_i)
+    c = @constraint(pm.model, sum(q[a] for a in bus_branches) == sum(qg[g] for g in bus_gens) - bus["qd"] + bus["bs"]*w_i)
     return Set([c])
 end
 

test/REQUIRE

@@ -1,9 +1,8 @@
-julia 0.4.6
+julia 0.5
 
 Ipopt 
 SCS
 GLPKMathProgInterface
-Pajarito 0.2.1
+Pajarito 0.3.1
 
-BaseTestNext 0.2.2
 Logging 0.3.1

test/runtests.jl

@@ -14,12 +14,7 @@ if (Pkg.installed("AmplNLWriter") != nothing && Pkg.installed("CoinOptServices")
     using CoinOptServices
 end
 
-if VERSION >= v"0.5.0-dev+7720"
-    using Base.Test
-else
-    using BaseTestNext
-    const Test = BaseTestNext
-end
+using Base.Test
 
 # default setup for solvers
 ipopt_solver = IpoptSolver(tol=1e-6, print_level=0)