power-grid-model-io 1.2.62__py3-none-any.whl → 1.2.64__py3-none-any.whl

power_grid_model_io/converters/pandapower_converter.py

@@ -699,7 +699,9 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         mag0_percent = self._get_pp_attr("trafo", "mag0_percent", expected_type="f8", default=np.nan)
         mag0_rx = self._get_pp_attr("trafo", "mag0_rx", expected_type="f8", default=np.nan)
         # Calculate rx ratio of magnetising branch
-        mag_g = pfe / (sn_mva * 1000)
+        valid = np.logical_and(np.not_equal(sn_mva, 0.0), np.isfinite(sn_mva))
+        mag_g = np.divide(pfe, sn_mva * 1000, where=valid)
+        mag_g[np.logical_not(valid)] = np.nan
         rx_mag = mag_g / np.sqrt(i_no_load * i_no_load * 1e-4 - mag_g * mag_g)
         # positive and zero sequence magnetising impedance must be equal.
         # mag0_percent = z0mag / z0.
@@ -727,8 +729,8 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         # Default vector group for odd clocks = DYn and for even clocks = YNyn
         no_vector_groups = np.isnan(winding_types["winding_from"]) | np.isnan(winding_types["winding_to"])
         no_vector_groups_dyn = no_vector_groups & (clocks % 2)
-        winding_types[no_vector_groups] = WindingType.wye_n
-        winding_types["winding_from"][no_vector_groups_dyn] = WindingType.delta
+        winding_types.loc[no_vector_groups] = WindingType.wye_n
+        winding_types.loc[no_vector_groups_dyn, "winding_from"] = WindingType.delta
 
         # Create PGM array
         pgm_transformers = initialize_array(data_type="input", component_type="transformer", shape=len(pp_trafo))
@@ -838,8 +840,8 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         no_vector_groups_ynd2 = no_vector_groups & (clocks_12 % 2)
         no_vector_groups_ynd3 = no_vector_groups & (clocks_13 % 2)
         winding_types[no_vector_groups] = WindingType.wye_n
-        winding_types["winding_2"][no_vector_groups_ynd2] = WindingType.delta
-        winding_types["winding_3"][no_vector_groups_ynd3] = WindingType.delta
+        winding_types.loc[no_vector_groups_ynd2, "winding_2"] = WindingType.delta
+        winding_types.loc[no_vector_groups_ynd3, "winding_3"] = WindingType.delta
 
         pgm_3wtransformers = initialize_array(
             data_type="input", component_type="three_winding_transformer", shape=len(pp_trafo3w)
@@ -1012,9 +1014,11 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
             * 1e6
         )
         p_spec = pgm_sym_loads_from_motor["p_specified"]
-        pgm_sym_loads_from_motor["q_specified"] = np.sqrt(
-            np.power(p_spec / self._get_pp_attr("motor", "cos_phi", expected_type="f8"), 2) - p_spec**2
-        )
+        cos_phi = self._get_pp_attr("motor", "cos_phi", expected_type="f8")
+        valid = np.logical_and(np.not_equal(cos_phi, 0.0), np.isfinite(cos_phi))
+        q_spec = np.sqrt(np.power(np.divide(p_spec, cos_phi, where=valid), 2, where=valid) - p_spec**2, where=valid)
+        q_spec[np.logical_not(valid)] = np.nan
+        pgm_sym_loads_from_motor["q_specified"] = q_spec
 
         #  If input data of loads has already been filled then extend it with data of motors. If it is empty and there
         #  is no data about loads,then assign motor data to it
@@ -1613,7 +1617,7 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
             links = self.pgm_output_data["link"]
             # For links, i_from = i_to = i_ka / 1e3
             link_ids = self._get_pp_ids("switch", links["id"], "b2b_switches")
-            pp_switches_output["i_ka"][link_ids] = links["i_from"] * 1e-3
+            pp_switches_output.loc[link_ids, "i_ka"] = links["i_from"] * 1e-3
 
         assert "res_switch" not in self.pp_output_data
         self.pp_output_data["res_switch"] = pp_switches_output
@@ -2247,7 +2251,7 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         Returns:
             the "closed" value of a Switch
         """
-        switch_state = (
+        switch_states = (
             component[["index", bus]]
             .merge(
                 switches,
@@ -2255,10 +2259,11 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
                 left_on=["index", bus],
                 right_on=["element", "bus"],
             )
-            .fillna(True)
-            .set_index(component.index)
+            .set_index(component.index)["closed"]
         )
-        return pd.Series(switch_state["closed"])
+
+        # no need to fill na because bool(NaN) == True
+        return pd.Series(switch_states.astype(bool, copy=False))
 
     def get_switch_states(self, pp_table: str) -> pd.DataFrame:
         """
@@ -2414,7 +2419,7 @@ class PandaPowerConverter(BaseConverter[PandaPowerData]):
         if any(nan_values):
             attr_data = attr_data.fillna(value=default, inplace=False)
 
-        return attr_data.to_numpy(dtype=exp_dtype)
+        return attr_data.to_numpy(dtype=exp_dtype, copy=True)
 
     def get_id(self, pp_table: str, pp_idx: int, name: Optional[str] = None) -> int:
         """

power_grid_model_io/data_stores/excel_file_store.py

@@ -140,7 +140,7 @@ class ExcelFileStore(BaseDataStore[TabularData]):
 
         to_rename = self._check_duplicate_values(sheet_name=sheet_name, data=data)
         if to_rename:
-            columns = data.columns.values
+            columns = data.columns.values.copy()
             for col_idx, new_name in to_rename.items():
                 self._log.warning(
                     "Column is renamed",

power_grid_model_io/data_types/tabular_data.py

@@ -80,12 +80,12 @@ class TabularData:
         # If the index 'column' is requested, but no column called 'index' exist,
         # return the index of the dataframe as if it were an actual column.
         if column_name == "index" and "index" not in table_data and hasattr(table_data, "index"):
-            return pd.Series(table_data.index, name="index")
+            return pd.Series(table_data.index, name="index", copy=False)
 
         column_data = table_data[column_name]
 
         if isinstance(column_data, np.ndarray):
-            column_data = pd.Series(column_data, name=column_name)
+            column_data = pd.Series(column_data, name=column_name, copy=False)
 
         # If unit information is available, convert the unit
         if not isinstance(column_data, pd.Series):

{power_grid_model_io-1.2.62.dist-info → power_grid_model_io-1.2.64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: power-grid-model-io
-Version: 1.2.62
+Version: 1.2.64
 Summary: Power Grid Model Input/Output
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -34,7 +34,8 @@ Requires-Dist: pre-commit ; extra == 'dev'
 Requires-Dist: pylint ; extra == 'dev'
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: pytest-cov ; extra == 'dev'
-Requires-Dist: pydantic ; extra == 'dev'
+Requires-Dist: pydantic >2 ; extra == 'dev'
+Requires-Dist: numba ; extra == 'dev'
 Provides-Extra: doc
 Requires-Dist: sphinx ; extra == 'doc'
 Requires-Dist: myst-nb ; extra == 'doc'

{power_grid_model_io-1.2.62.dist-info → power_grid_model_io-1.2.64.dist-info}/RECORD

@@ -7,19 +7,19 @@ power_grid_model_io/config/excel/vision_en.yaml,sha256=a6BtSeMzGumsUSoDqzZHyx2cp
 power_grid_model_io/config/excel/vision_nl.yaml,sha256=ps-vKUvYcIev7fxx5rIQqHe1ukP_WjHZvqF3AcLswd8,19226
 power_grid_model_io/converters/__init__.py,sha256=kmbjFW6kVr30fmHb6mAoD7DQAqmbrsOuF1ewd8b0Q3M,408
 power_grid_model_io/converters/base_converter.py,sha256=LNrDo1kUUuBkLMgZpGm0MW5rfr8nLoFcGCJGRR7ZuiY,6044
-power_grid_model_io/converters/pandapower_converter.py,sha256=05iNHqqVFphXRNsNE7aumkZGybY_-FOj1S8S1UhQo64,113429
+power_grid_model_io/converters/pandapower_converter.py,sha256=THJzytVLQDSOQVOj5y9HR2Wlz1QolAr0DEzZzKhntWU,113868
 power_grid_model_io/converters/pgm_json_converter.py,sha256=KKZEBLVW1hsS2YjOsUO6EBrXhvwPVl9VhkUNEw-3gWk,13066
 power_grid_model_io/converters/tabular_converter.py,sha256=hMb0pmnlq83GJEfOqr3K7XXsSiA_SYyQKHW1i6F5FSY,30577
 power_grid_model_io/converters/vision_excel_converter.py,sha256=aT_e_XSX4jQ3V-KlNxF5VGvWoM8uxOLpbL6qZCDmgAg,3636
 power_grid_model_io/data_stores/__init__.py,sha256=qwbj1j-Aa_yRB-E3j35pEVtF3mgH8CVIXAnog5mOry0,138
 power_grid_model_io/data_stores/base_data_store.py,sha256=XKdQY6Thrt_o7vtMXvTJFl1TCwBkSZVcImhbHXz23ls,1367
 power_grid_model_io/data_stores/csv_dir_store.py,sha256=H8ICXZRLDvp9OkbjkfHnoh4y7uNSXNepHAW6W53VsIw,1877
-power_grid_model_io/data_stores/excel_file_store.py,sha256=Pxgp_3OHLljHRnWdLtX1Ma3m7erl81v0TO8P5A1guWg,8615
+power_grid_model_io/data_stores/excel_file_store.py,sha256=WI8pauQNYLOEu7hsrHU7o8yJ1tG3IAN2XUq920BQKps,8622
 power_grid_model_io/data_stores/json_file_store.py,sha256=0njL2YZn_fImNcZqnIRpHp2UtIS6WGaQQ46TjIK8tyo,3954
 power_grid_model_io/data_stores/vision_excel_file_store.py,sha256=zU-zGktLmU7a808KwppiMc2YeCPfqjo03lRW0neEuQ4,805
 power_grid_model_io/data_types/__init__.py,sha256=63A_PkOsQkVd3To7Kl4FTUX7lbPG9BS9MSLzXTW6Ktk,383
 power_grid_model_io/data_types/_data_types.py,sha256=9xH5vBGrRVUSlPh4HXmORtKo3LFEhJEy3iTQqG7wsFA,1664
-power_grid_model_io/data_types/tabular_data.py,sha256=JaJRWaOlVTqb7nMXoRUovUtiqnFyDPC_wFbO7O5lT7s,8341
+power_grid_model_io/data_types/tabular_data.py,sha256=RRy2rZoXgNBDWYc8GuuqTRoyAK_0e_wb4CF2jULoKNE,8365
 power_grid_model_io/functions/__init__.py,sha256=pamhvKX5c_5fkVMRrUp6zhHWex2R63otRJk1Sfsw6y0,495
 power_grid_model_io/functions/_functions.py,sha256=tqwwZ0G8AeDza0IiS6CSMwKB0lV1hDo2D8e9-ARHXQM,2843
 power_grid_model_io/functions/phase_to_phase.py,sha256=zbaDXIj8S4cLO42LjkpcQoUrEW1frzBUj1OmKu-xkTg,4459
@@ -37,8 +37,8 @@ power_grid_model_io/utils/json.py,sha256=dQDRd2Vb8pfqLU2hTuWYv2cpSIBBbFhd0LOBP21
 power_grid_model_io/utils/modules.py,sha256=a4IdozSL-sOZcmIQON_aQS7-cpnCyt-3p7zs40wRFkU,928
 power_grid_model_io/utils/parsing.py,sha256=XB1QSHnslIieFJBKFXZCtiydqpOqQBiX_CXDbItXgAQ,4522
 power_grid_model_io/utils/zip.py,sha256=VXHX4xWPPZbhOlZUAbMDy3MgQFzK6_l7sRvGXihNUY4,3875
-power_grid_model_io-1.2.62.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
-power_grid_model_io-1.2.62.dist-info/METADATA,sha256=2tS69Nnadxj28ehsOckZix4op9Tj7zHgwx-Z1Aa-eNE,8000
-power_grid_model_io-1.2.62.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-power_grid_model_io-1.2.62.dist-info/top_level.txt,sha256=7sq9VveemMm2R0RgTBa4tH8y_xF4_1hxbufmX9OjCTo,20
-power_grid_model_io-1.2.62.dist-info/RECORD,,
+power_grid_model_io-1.2.64.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+power_grid_model_io-1.2.64.dist-info/METADATA,sha256=_wlckfWSUivW-ck5lk3ua4zDOlagu5Hkh0D3XREAqOM,8041
+power_grid_model_io-1.2.64.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+power_grid_model_io-1.2.64.dist-info/top_level.txt,sha256=7sq9VveemMm2R0RgTBa4tH8y_xF4_1hxbufmX9OjCTo,20
+power_grid_model_io-1.2.64.dist-info/RECORD,,