address pr review

Author: m-bossart

src/parsers/power_models_data.jl

@@ -1238,11 +1238,9 @@ function get_branch_type_psse(
     is_tap_controllable, is_alpha_controllable = _determine_control_modes(d, "COD1", "tap")
     if d["group_number"] == WindingGroupNumber.UNDEFINED || is_alpha_controllable
         return PhaseShiftingTransformer
-    # parse TapTransformer from PSSE regardless of is_tap_controllable to avoid parsing mixed transformer types in parallel
-    elseif d["group_number"] != WindingGroupNumber.UNDEFINED
+        # parse TapTransformer from PSSE regardless of is_tap_controllable to avoid parsing mixed transformer types in parallel
+    else 
         return TapTransformer
-    else
-        error("Couldn't infer the branch type for branch $d")
     end
 end
 
@@ -1812,13 +1810,13 @@ function _determine_control_modes(d::Dict, control_flag::String, tap_key::String
         is_tap_controllable = true
         is_alpha_controllable = true
     elseif control_code == -99
-        @warn "Can't determine control objective for the transformer from the $(control_flag) field for $d"
+        @warn "Can't determine control objective for the transformer from the $(control_flag) field for $d \
+              Will attempt to infer control objective from shift and tap fields."
         if d["shift"] != 0.0
             is_alpha_controllable = true
-        elseif (tap != 0.0) || (tap != 1.0)
+        end 
+        if (tap != 0.0) && (tap != 1.0)
             is_tap_controllable = true
-        else
-            @warn "Can't determine control objective for the other fields. Will return a TapTransformer"
         end
     else
         error(d)

test/test_parse_psse.jl

@@ -73,6 +73,7 @@ end
     @info "Testing Three-Winding Transformer Parsing"
 
     @test isnothing(get_component(Transformer3W, sys3, "1"))
+    @test isempty(get_components(Transformer2W, sys3))
     @test haskey(
         get_ext(get_component(TapTransformer, sys3, "DALLAS 1 3-DALLAS 1 0-i_1")),
         "psse_name",
@@ -313,6 +314,7 @@ end
     file_dir = joinpath(base_dir, "test_data", "modified_14bus_system.raw")
     sys = System(file_dir)
 
+    @test isempty(get_components(Transformer2W, sys)) 
     tr2w_1 = get_component(TapTransformer, sys, "BUS 110-BUS 109-i_1")
     suppl_attr_tr2w_1 = only(get_supplemental_attributes(tr2w_1))
     @test get_table_number(suppl_attr_tr2w_1) == 3