@@ -19,7 +19,7 @@ function load_network_data!(setup::Dict, path::AbstractString, inputs_nw::Dict)
1919 inputs_nw[" L" ] = L
2020 L_asym = 0 # Default number of asymmetrical lines
2121 if setup[" asymmetrical_trans_flow_limit" ] == 1
22- L_asym = length (as_vector (network_var, :Asymmetrical , :Network_Lines )) # Number of asymmetrical lines
22+ L_asym = length (filtered_vector (network_var, :Asymmetrical , :Network_Lines )) # Number of asymmetrical lines
2323 end
2424 println (" Number of asymmetric lines: $L_asym " )
2525 inputs_nw[" L_asym" ] = L_asym
@@ -154,8 +154,8 @@ function load_network_data!(setup::Dict, path::AbstractString, inputs_nw::Dict)
154154 inputs_nw[" EXPANSION_LINES" ] = findall (inputs_nw[" pMax_Line_Reinforcement" ] .>= 0 )
155155 inputs_nw[" NO_EXPANSION_LINES" ] = findall (inputs_nw[" pMax_Line_Reinforcement" ] .< 0 )
156156 if setup[" asymmetrical_trans_flow_limit" ] == 1
157- inputs_nw[" EXPANSION_LINES_ASYM" ] = findall ((inputs_nw[" pMax_Line_Reinforcement_Pos" ] .> 0 ) | | (inputs_nw[" pMax_Line_Reinforcement_Neg" ] .> 0 ))
158- inputs_nw[" NO_EXPANSION_LINES_ASYM" ] = findall ((inputs_nw[" pMax_Line_Reinforcement_Pos" ] .< 0 ) & & (inputs_nw[" pMax_Line_Reinforcement_Neg" ] .< 0 ))
157+ inputs_nw[" EXPANSION_LINES_ASYM" ] = findall ((inputs_nw[" pMax_Line_Reinforcement_Pos" ] .> 0 ) . | (inputs_nw[" pMax_Line_Reinforcement_Neg" ] .> 0 ))
158+ inputs_nw[" NO_EXPANSION_LINES_ASYM" ] = findall ((inputs_nw[" pMax_Line_Reinforcement_Pos" ] .< 0 ) . & (inputs_nw[" pMax_Line_Reinforcement_Neg" ] .< 0 ))
159159 end
160160 end
161161
@@ -240,7 +240,7 @@ function network_map_matrix_format_deprecation_warning()
240240 """ maxlog= 1
241241end
242242
243- function as_vector (network_var :: DataFrame , asym_column :: Symbol , col :: Symbol )
244- asym_network_var = network_var[network_var[asym_col ] .== 1 , :]
245- return collect (skipmissing (asym_network_var [! , col ]))
243+ function filtered_vector (df :: DataFrame , condition_col :: Symbol , data_col :: Symbol )
244+ filtered_df = df[df[ ! ,condition_col ] .== 1 , :]
245+ return collect (skipmissing (filtered_df [! , data_col ]))
246246end
0 commit comments