rm obsolete VariableContainer

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## dev
 - add `multiphase_variable_container` methods for bus and edge variables
-    - make variable indexing order consistent across single and multiphase models (bus/edge, time, phase)
+    - make variable indexing order consistent across single and multiphase models (bus/edge, time,
+      phase)
+- rm `VariableContainer`
 
 ## v0.4.1
 - add codecov to ci

src/CommonOPF.jl

@@ -25,7 +25,6 @@ const VARIABLE_NAMES = String[
     "current_magnitude",
     "current_magnitude_squared",
 ]
-VariableContainer = Dict{String, Dict{Int, Any}}  # edge/bus String, time step Int, variable(s)
 
 export 
     dsstxt_to_sparse_array,
@@ -97,7 +96,6 @@ export
 
     # variables
     VARIABLE_NAMES,
-    VariableContainer,
     multiphase_bus_variable_container,
     multiphase_edge_variable_container,
     add_time_vector_variables!,

src/results.jl

@@ -45,7 +45,7 @@ time-vector or matrix values. When `var_name` ends with "_squared" we return the
 """
 function get_variable_values(model_key, var_name::String, m::JuMP.AbstractModel, net::Network{SinglePhase}; digits=8)
     d = Dict()
-    if var in [:Pj, :Qj, :vsqrd]
+    if var_name in [:Pj, :Qj, :vsqrd]
         vals = value.(m[model_key])  # time, bus 
         for b in busses(net)
             d[b] = round.(vals[b,:].data, digits=digits)
@@ -55,18 +55,18 @@ function get_variable_values(model_key, var_name::String, m::JuMP.AbstractModel,
                 d[b] *= net.Sbase  # scale powers back to absolute units TODO in BFM
             end
         end
-    elseif var in [:Pij, :Qij, :lij]  # TODO make these a const in CommonOPF TODO in BFM
-        vals = value.(m[var])
+    elseif var_name in [:Pij, :Qij, :lij]  # TODO make these a const in CommonOPF TODO in BFM
+        vals = value.(m[var_name])
         for ek in edges(net)
             d[ek] = round.(vals[ek,:].data, digits=digits)
-            if var == :lij
+            if var_name == :lij
                 d[ek] = sqrt.(d[ek])
             else
                 d[ek] *= net.Sbase  # scale powers back to absolute units
             end
         end
     else
-        @warn "$var is not a valid variable symbol"
+        @warn "$var_name is not a valid variable symbol"
     end
     return d
 end

test/test_results.jl

@@ -2,7 +2,6 @@
 
     # TODO test Network.var_name_map and VARIABLE_NAMES
     # TODO test get_variable_values with vectors and matrices
-    # TODO test get_variable_values with _squared, after defining containers with CommonOPF.VariableContainer
     m = Model()
     m.obj_dict[:vsqrd] = Dict("bus1" => [1.123456789])