4040pp_ref_version = Version ("3.1.2" )
4141
4242
43+ def get_loss_params_3ph ():
44+ if pp_curr_version <= pp_ref_version :
45+ loss_params = ["p_a_l_mw" , "q_a_l_mvar" , "p_b_l_mw" , "q_b_l_mvar" , "p_c_l_mw" , "q_c_l_mvar" ]
46+ else :
47+ loss_params = ["pl_a_mw" , "ql_a_mvar" , "pl_b_mw" , "ql_b_mvar" , "pl_c_mw" , "ql_c_mvar" ]
48+ return loss_params
49+
50+
4351# pylint: disable=too-many-instance-attributes
4452class PandaPowerConverter (BaseConverter [PandaPowerData ]):
4553 """
@@ -1844,13 +1852,6 @@ def _pp_buses_output_3ph__accumulate_power(self, pp_output_buses_3ph: pd.DataFra
18441852 # Finally apply the unit conversion (W -> MW and VAR -> MVAR)
18451853 pp_output_buses_3ph [power_columns ] /= 1e6
18461854
1847- def get_loss_params_3ph (self ):
1848- if pp_curr_version <= pp_ref_version :
1849- loss_params = ["p_a_l_mw" , "q_a_l_mvar" , "p_b_l_mw" , "q_b_l_mvar" , "p_c_l_mw" , "q_c_l_mvar" ]
1850- else :
1851- loss_params = ["pl_a_mw" , "ql_a_mvar" , "pl_b_mw" , "ql_b_mvar" , "pl_c_mw" , "ql_c_mvar" ]
1852- return loss_params
1853-
18541855 def _pp_lines_output_3ph (self ):
18551856 """
18561857 This function converts a power-grid-model Line output array to a Line Dataframe of PandaPower.
@@ -1877,7 +1878,7 @@ def _pp_lines_output_3ph(self):
18771878 i_from = (pgm_output_lines ["p_from" ] + 1j * pgm_output_lines ["q_from" ]) / u_complex .iloc [from_nodes , :]
18781879 i_to = (pgm_output_lines ["p_to" ] + 1j * pgm_output_lines ["q_to" ]) / u_complex .iloc [to_nodes , :]
18791880
1880- loss_params = self . get_loss_params_3ph ()
1881+ loss_params = get_loss_params_3ph ()
18811882 pp_output_lines_3ph = pd .DataFrame (
18821883 columns = [
18831884 "p_a_from_mw" ,
@@ -2058,7 +2059,7 @@ def _pp_trafos_output_3ph(self): # pylint: disable=too-many-statements
20582059
20592060 loading = np .maximum (np .maximum (loading_a_percent , loading_b_percent ), loading_c_percent )
20602061
2061- loss_params = self . get_loss_params_3ph ()
2062+ loss_params = get_loss_params_3ph ()
20622063 pp_output_trafos_3ph = pd .DataFrame (
20632064 columns = [
20642065 "p_a_hv_mw" ,
0 commit comments