resolved test_pandapower_converter_ouput to completely test trafo and switch output, also corrected bugs in pp_trafo_output and pp_switch_output

Signed-off-by: furqan463 <[email protected]>

Author: furqan463

src/power_grid_model_io/converters/pandapower_converter.py

@@ -425,7 +425,7 @@ def _create_pgm_input_lines(self):
         pgm_lines["tan1"] = np.divide(
             self._get_pp_attr("line", "g_us_per_km", expected_type="f8", default=0),
             c_nf_per_km * (2 * np.pi * self.system_frequency * 1e-3),
-            where=np.not_equal(c_nf_per_km, 0.0),
+            where= c_nf_per_km != 0.0,
         )
         pgm_lines["tan1"][np.equal(c_nf_per_km, 0.0)] = 0.0
         pgm_lines["i_n"] = (
@@ -439,7 +439,7 @@ def _create_pgm_input_lines(self):
         pgm_lines["tan0"] = np.divide(
             self._get_pp_attr("line", "g0_us_per_km", expected_type="f8", default=0),
             c0_nf_per_km * (2 * np.pi * self.system_frequency * 1e-3),
-            where=np.not_equal(c0_nf_per_km, 0.0),
+            where= c0_nf_per_km != 0.0,
         )
         pgm_lines["tan0"][np.equal(c0_nf_per_km, 0.0)] = 0.0
         assert ComponentType.line not in self.pgm_input_data
@@ -1384,7 +1384,8 @@ def _pp_trafos_output(self):
         if self.trafo_loading == "current":
             ui_from = pgm_output_transformers["i_from"] * pgm_input_transformers["u1"]
             ui_to = pgm_output_transformers["i_to"] * pgm_input_transformers["u2"]
-            loading = np.maximum(ui_from, ui_to) / pgm_input_transformers["sn"] * loading_multiplier * 1e2
+            loading = (np.sqrt(3) * np.maximum(ui_from, ui_to) /
+                       pgm_input_transformers["sn"]) * loading_multiplier * 1e2
         elif self.trafo_loading == "power":
             loading = pgm_output_transformers["loading"] * loading_multiplier * 1e2
         else:
@@ -1706,15 +1707,18 @@ def join_currents(table: str, bus_name: str, i_name: str) -> pd.DataFrame:
         )
         pp_switches_output = pp_switches_output[["i_ka"]]
         pp_switches_output.set_index(pp_switches_output_index, inplace=True)
-        pp_switches_output["loading_percent"] = np.nan
 
         # For et=b, ie bus to bus switches, links are created. get result from them
         if not links_absent:
             links = self.pgm_output_data[ComponentType.link]
             # For links, i_from = i_to = i_ka / 1e3
             link_ids = self._get_pp_ids("switch", links["id"], "b2b_switches")
             pp_switches_output.loc[link_ids, "i_ka"] = links["i_from"] * 1e-3
-
+        in_ka = self.pp_input_data["switch"]["in_ka"].values
+        pp_switches_output["loading_percent"] = np.nan
+        pp_switches_output["loading_percent"] = np.divide(pp_switches_output["i_ka"],
+                                                          in_ka, where= in_ka != 0)
+        
         assert "res_switch" not in self.pp_output_data
         self.pp_output_data["res_switch"] = pp_switches_output
 

tests/data/pandapower/pp_v2_net_output.json

@@ -2708,7 +2708,7 @@
     "res_switch": {
       "_module": "pandas.core.frame",
       "_class": "DataFrame",
-      "_object": "{\"columns\":[\"i_ka\",\"loading_percent\"],\"index\":[101,3021,321],\"data\":[[0.064048243266779,null],[null,null],[0.020545341606839,null]]}",
+      "_object": "{\"columns\":[\"i_ka\",\"loading_percent\"],\"index\":[101,3021,321],\"data\":[[0.064048243266779,null],[0.0,null],[0.020545341606839,null]]}",
       "orient": "split",
       "dtype": {
         "i_ka": "float64",

tests/unit/converters/test_pandapower_converter_output.py

@@ -770,6 +770,7 @@ def test_pp_switch_output():
                 "element": [10, 10, 10, 10, 10, 11, 11, 77, 88],
                 "et": ["t", "t", "t3", "t3", "t3", "l", "l", "b", "b"],
                 "closed": [True, True, True, True, True, True, True, True, True],
+                "in_ka": [np.nan, np.nan, np.nan, np.nan, np.nan, np.nan, np.nan, np.nan, np.nan], 
             },
             index=[40, 41, 42, 43, 44, 45, 46, 47, 48],
         ),
@@ -863,7 +864,6 @@ def test_output_line_3ph(converter):
         mock_pgm_array.__getitem__.assert_any_call("q_to")
         mock_pgm_array.__getitem__.assert_any_call("i_from")
         mock_pgm_array.__getitem__.assert_any_call("i_to")
-        mock_pgm_array.__getitem__.assert_any_call("loading")
 
         # assignment
         mock_pp_df.return_value.__setitem__.assert_any_call("p_a_from_mw", ANY)

tests/validation/converters/test_pandapower_converter_output.py

@@ -38,13 +38,14 @@ def temporary_file_cleanup(file_path):
 
 
 @lru_cache
-def load_and_convert_pgm_data() -> PandaPowerData:
+def load_and_convert_pgm_data(trafo_loading="power") -> PandaPowerData:
     """
     Load and convert the power_grid_model results
     """
-    data, extra_info = load_json_single_dataset(PGM_OUTPUT_FILE, data_type="sym_output")
-    converter = PandaPowerConverter()
-    return converter.convert(data=data, extra_info=extra_info)
+    data, _ = load_json_single_dataset(PGM_OUTPUT_FILE, data_type="sym_output")
+    converter = PandaPowerConverter(trafo_loading=trafo_loading)
+    converter.load_input_data(load_validation_data(), make_extra_info=False)
+    return converter.convert(data=data)
 
 
 @lru_cache
@@ -77,12 +78,12 @@ def load_validation_data_3ph(trafo_loading="power") -> PandaPowerData:
         return pp.file_io.from_json(PP_V2_NET_3PH_OUTPUT_FILE_CURRENT_LOADING)
 
 
-@pytest.fixture
-def output_data() -> Tuple[PandaPowerData, PandaPowerData]:
+@pytest.fixture(params = ["power", "current"])
+def output_data(request) -> Tuple[PandaPowerData, PandaPowerData]:
     """
     Load the pandapower network and the json file, and return the output_data
     """
-    actual = load_and_convert_pgm_data()
+    actual = load_and_convert_pgm_data(request.param)
     expected = load_validation_data()
     return actual, expected