fix support for data without an explicit switch section

Author: ccoffrin

CHANGELOG.md

@@ -2,6 +2,7 @@ PowerModels.jl Change Log
 =========================
 
 ### Staged
+- Fixed support for data without an explicit switch section
 - Fixed support for single values in add_setpoint! and add_dual!
 
 ### v0.12.3

src/core/base.jl

@@ -324,6 +324,10 @@ end
 function _ref_add_core!(nw_refs::Dict)
     for (nw, ref) in nw_refs
 
+        if !haskey(ref, :switch)
+                ref[:switch] = Dict{Int,Any}()
+        end
+
         ### filter out inactive components ###
         ref[:bus] = Dict(x for x in ref[:bus] if (x.second["bus_type"] != pm_component_status_inactive["bus"]))
         ref[:load] = Dict(x for x in ref[:load] if (x.second["status"] != pm_component_status_inactive["load"] && x.second["load_bus"] in keys(ref[:bus])))

src/core/data.jl

@@ -1288,13 +1288,15 @@ function check_connectivity(data::Dict{String,<:Any})
         end
     end
 
-    for (i, switch) in data["switch"]
-        if !(switch["f_bus"] in bus_ids)
-            Memento.error(_LOGGER, "from bus $(switch["f_bus"]) in switch $(i) is not defined")
-        end
+    if haskey(data, "switch")
+        for (i, switch) in data["switch"]
+            if !(switch["f_bus"] in bus_ids)
+                Memento.error(_LOGGER, "from bus $(switch["f_bus"]) in switch $(i) is not defined")
+            end
 
-        if !(switch["t_bus"] in bus_ids)
-            Memento.error(_LOGGER, "to bus $(switch["t_bus"]) in switch $(i) is not defined")
+            if !(switch["t_bus"] in bus_ids)
+                Memento.error(_LOGGER, "to bus $(switch["t_bus"]) in switch $(i) is not defined")
+            end
         end
     end
 

src/core/solution.jl

@@ -139,13 +139,17 @@ end
 
 ""
 function add_setpoint_switch_flow!(sol, pm::GenericPowerModel)
-    add_setpoint!(sol, pm, "switch", "psw", :psw, var_key = (idx,item) -> (idx, item["f_bus"], item["t_bus"]))
-    add_setpoint!(sol, pm, "switch", "qsw", :qsw, var_key = (idx,item) -> (idx, item["f_bus"], item["t_bus"]))
+    if haskey(pm.data, "swtich")
+        add_setpoint!(sol, pm, "switch", "psw", :psw, var_key = (idx,item) -> (idx, item["f_bus"], item["t_bus"]))
+        add_setpoint!(sol, pm, "switch", "qsw", :qsw, var_key = (idx,item) -> (idx, item["f_bus"], item["t_bus"]))
+    end
 end
 
 ""
 function add_setpoint_switch_status!(sol, pm::GenericPowerModel)
-    add_setpoint!(sol, pm, "switch", "status", :z_switch, conductorless=true, default_value = (item) -> item["status"]*1.0)
+    if haskey(pm.data, "swtich")
+        add_setpoint!(sol, pm, "switch", "status", :z_switch, conductorless=true, default_value = (item) -> item["status"]*1.0)
+    end
 end
 
 

src/form/apo.jl

@@ -155,7 +155,9 @@ end
 
 ""
 function add_setpoint_switch_flow!(sol, pm::GenericPowerModel{T}) where T <: AbstractActivePowerFormulation
-    add_setpoint!(sol, pm, "switch", "psw", :psw, var_key = (idx,item) -> (idx, item["f_bus"], item["t_bus"]))
-    add_setpoint_fixed!(sol, pm, "switch", "qsw")
+    if haskey(pm.data, "swtich")
+        add_setpoint!(sol, pm, "switch", "psw", :psw, var_key = (idx,item) -> (idx, item["f_bus"], item["t_bus"]))
+        add_setpoint_fixed!(sol, pm, "switch", "qsw")
+    end
 end