giving network expansion variables _ne names

Author: ccoffrin

src/core/base.jl

@@ -40,27 +40,35 @@ type GenericPowerModel{T<:AbstractPowerFormulation} <: AbstractPowerModel
 end
 
 # default generic constructor
-function GenericPowerModel{T}(data::Dict{AbstractString,Any}, vars::T; setting = Dict{AbstractString,Any}(), solver = JuMP.UnsetSolver())
-    data, sets = process_raw_data(data)
+function GenericPowerModel{T}(data::Dict{AbstractString,Any}, vars::T; setting = Dict{AbstractString,Any}(), solver = JuMP.UnsetSolver(), data_processor = process_raw_mp_data)
+    data, sets, ext = data_processor(data)
     pm = GenericPowerModel{T}(
         Model(solver = solver), # model
         data, # data
         sets, # sets
         setting, # setting
         Dict{AbstractString,Any}(), # solution
-        Dict{Symbol,Any}() # ext
+        ext # ext
     )
 
     return pm
 end
 
-function process_raw_data(data::Dict{AbstractString,Any})
+function process_raw_mp_data(data::Dict{AbstractString,Any})
     make_per_unit(data)
-    unify_transformer_taps(data)
-    add_branch_parameters(data)
+
+    min_theta_delta = calc_min_phase_angle(data)
+    max_theta_delta = calc_max_phase_angle(data)
+
+    unify_transformer_taps(data["branch"])
+    add_branch_parameters(data["branch"], min_theta_delta, max_theta_delta)
+
     standardize_cost_order(data)
     sets = build_sets(data)
-    return data, sets
+
+    ext = Dict{Symbol,Any}()
+
+    return data, sets, ext
 end
 
 #
@@ -235,20 +243,17 @@ function make_per_unit(mva_base::Number, data::Number)
     #println("$(parent) $(data)")
 end
 
-function unify_transformer_taps(data::Dict{AbstractString,Any})
-    for branch in data["branch"]
+function unify_transformer_taps(branches)
+    for branch in branches
         if branch["tap"] == 0.0
             branch["tap"] = 1.0
         end
     end
 end
 
 # NOTE, this function assumes all values are p.u. and angles are in radians
-function add_branch_parameters(data::Dict{AbstractString,Any})
-    min_theta_delta = calc_min_phase_angle(data)
-    max_theta_delta = calc_max_phase_angle(data)
-    
-    for branch in data["branch"]
+function add_branch_parameters(branches, min_theta_delta, max_theta_delta)
+    for branch in branches
         r = branch["br_r"]
         x = branch["br_x"]
         tap_ratio = branch["tap"]

src/core/variable.jl

@@ -89,10 +89,7 @@ function variable_reactive_line_flow{T}(pm::GenericPowerModel{T}; bounded = true
     return q
 end
 
-function compute_voltage_product_bounds{T}(pm::GenericPowerModel{T})
-    buspairs = pm.set.buspairs
-    buspair_indexes = pm.set.buspair_indexes
-
+function compute_voltage_product_bounds(buspairs, buspair_indexes)
     wr_min = Dict([(bp, -Inf) for bp in buspair_indexes])
     wr_max = Dict([(bp,  Inf) for bp in buspair_indexes])
     wi_min = Dict([(bp, -Inf) for bp in buspair_indexes])
@@ -126,7 +123,7 @@ end
 
 function variable_complex_voltage_product{T}(pm::GenericPowerModel{T}; bounded = true)
     if bounded
-        wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm)
+        wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm.set.buspairs, pm.set.buspair_indexes)
 
         @variable(pm.model, wr_min[bp] <= wr[bp in pm.set.buspair_indexes] <= wr_max[bp], start = getstart(pm.set.buspairs, bp, "wr_start", 1.0))
         @variable(pm.model, wi_min[bp] <= wi[bp in pm.set.buspair_indexes] <= wi_max[bp], start = getstart(pm.set.buspairs, bp, "wi_start"))
@@ -138,7 +135,7 @@ function variable_complex_voltage_product{T}(pm::GenericPowerModel{T}; bounded =
 end
 
 function variable_complex_voltage_product_on_off{T}(pm::GenericPowerModel{T})
-    wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm)
+    wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm.set.buspairs, pm.set.buspair_indexes)
 
     bi_bp = Dict([(i, (b["f_bus"], b["t_bus"])) for (i,b) in pm.set.branches])
 
@@ -149,7 +146,7 @@ function variable_complex_voltage_product_on_off{T}(pm::GenericPowerModel{T})
 end
 
 function variable_complex_voltage_product_matrix{T}(pm::GenericPowerModel{T})
-    wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm)
+    wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm.set.buspairs, pm.set.buspair_indexes)
 
     w_index = 1:length(pm.set.bus_indexes)
     lookup_w_index = Dict([(bi, i) for (i,bi) in enumerate(pm.set.bus_indexes)])

src/form/wr.jl

@@ -224,7 +224,7 @@ function constraint_voltage_magnitude_sqr_to_on_off{T}(pm::GenericPowerModel{T})
 end
 
 function constraint_complex_voltage_product_on_off{T}(pm::GenericPowerModel{T})
-    wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm)
+    wr_min, wr_max, wi_min, wi_max = compute_voltage_product_bounds(pm.set.buspairs, pm.set.buspair_indexes)
 
     bi_bp = Dict([(i, (b["f_bus"], b["t_bus"])) for (i,b) in pm.set.branches])