Fix conflicts and test

Author: iagoschavarry

Project.toml

@@ -1,6 +1,6 @@
 name = "ParserPWF"
 uuid = "0f4c3beb-4231-4c4d-93e1-709cb40a89e6"
-version = "0.2.0"
+version = "1.0.0"
 
 [deps]
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

src/pwf2pm/transformer.jl

@@ -122,12 +122,12 @@ function _pwf2pm_transformer!(pm_data::Dict, pwf_data::Dict, branch::Dict; add_c
             sub_data["control_data"]["constraint_type"] = "setpoint"
             shift_type = branch_dctr[circuit]["CONTROL TYPE"]
             sub_data["control_data"]["shift_control_variable"] = shift_type == 'C' ? "current" : shift_type == 'P' ? "power" : "fixed"
-            sub_data["control_data"]["shiftmin"] = branch_dctr[circuit]["MINIMUM PHASE"]
-            sub_data["control_data"]["shiftmax"] = branch_dctr[circuit]["MAXIMUM PHASE"]
-            sub_data["control_data"]["valsp"] = branch_dctr[circuit]["SPECIFIED VALUE"]
-
+            sub_data["control_data"]["shiftmin"] = branch_dctr[circuit]["MINIMUM PHASE"] / (180/pi)
+            sub_data["control_data"]["shiftmax"] = branch_dctr[circuit]["MAXIMUM PHASE"] / (180/pi)
+            sub_data["control_data"]["valsp"] = branch_dctr[circuit]["SPECIFIED VALUE"] / 100
+    
             sub_data["control_data"]["controlled_bus"] = branch_dctr[circuit]["MEASUREMENT EXTREMITY"]
-
+    
         else # fix
             sub_data["control_data"]["control_type"] = "fix"
             sub_data["control_data"]["constraint_type"] = nothing
@@ -137,41 +137,21 @@ function _pwf2pm_transformer!(pm_data::Dict, pwf_data::Dict, branch::Dict; add_c
             sub_data["control_data"]["valsp"] = nothing
         end
 
-    elseif constraint_type == "PHASE CONTROL" # phase control
-        sub_data["control_data"]["control_type"] = "shift_control"
-        sub_data["control_data"]["constraint_type"] = "setpoint"
-        shift_type = branch_dctr[circuit]["CONTROL TYPE"]
-        sub_data["control_data"]["shift_control_variable"] = shift_type == 'C' ? "current" : shift_type == 'P' ? "power" : "fixed"
-        sub_data["control_data"]["shiftmin"] = branch_dctr[circuit]["MINIMUM PHASE"] / (180/pi)
-        sub_data["control_data"]["shiftmax"] = branch_dctr[circuit]["MAXIMUM PHASE"] / (180/pi)
-        sub_data["control_data"]["valsp"] = branch_dctr[circuit]["SPECIFIED VALUE"] / 100
-
-        sub_data["control_data"]["controlled_bus"] = branch_dctr[circuit]["MEASUREMENT EXTREMITY"]
-
-    else # fix
-        sub_data["control_data"]["control_type"] = "fix"
-        sub_data["control_data"]["constraint_type"] = nothing
-        sub_data["control_data"]["shift_control_variable"] = nothing
-        sub_data["control_data"]["shiftmin"] = nothing
-        sub_data["control_data"]["shiftmax"] = nothing
-        sub_data["control_data"]["valsp"] = nothing
-    end
-
-    ctrl_bus = pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]
-    sub_data["control_data"]["vmsp"] = ctrl_bus["vm"]
-    sub_data["control_data"]["vmmin"] = ctrl_bus["vmin"]
-    sub_data["control_data"]["vmmax"] = ctrl_bus["vmax"]
-    sub_data["control_data"]["control"] =  true 
-    if haskey(pwf_data, "DTPF CIRC")
-        for (k,v) in pwf_data["DTPF CIRC"]
-            for i in 1:5
-                if v["FROM BUS $i"] == sub_data["f_bus"] && v["TO BUS $i"] == sub_data["t_bus"] && v["CIRCUIT $i"] == branch["CIRCUIT"]
-                    sub_data["control_data"]["control"] = false
+        ctrl_bus = pm_data["bus"]["$(sub_data["control_data"]["controlled_bus"])"]
+        sub_data["control_data"]["vmsp"] = ctrl_bus["vm"]
+        sub_data["control_data"]["vmmin"] = ctrl_bus["vmin"]
+        sub_data["control_data"]["vmmax"] = ctrl_bus["vmax"]
+        sub_data["control_data"]["control"] =  true 
+        if haskey(pwf_data, "DTPF CIRC")
+            for (k,v) in pwf_data["DTPF CIRC"]
+                for i in 1:5
+                    if v["FROM BUS $i"] == sub_data["f_bus"] && v["TO BUS $i"] == sub_data["t_bus"] && v["CIRCUIT $i"] == branch["CIRCUIT"]
+                        sub_data["control_data"]["control"] = false
+                    end
                 end
             end
         end
     end
-
     idx = string(sub_data["index"])
     pm_data["branch"][idx] = sub_data
 end