power-grid-model-ds 1.4.2__tar.gz → 1.4.3__tar.gz

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-ds
-Version: 1.4.2
+Version: 1.4.3
 Summary: Power Grid Model extension which provides a grid data structure for simulation and analysis
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0

power_grid_model_ds-1.4.3/PYPI_VERSION

@@ -0,0 +1 @@
+1.4.3

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/src/power_grid_model_ds/_core/fancypy.py

@@ -4,7 +4,7 @@
 
 """A set of helper functions that mimic numpy functions but are specifically designed for FancyArrays."""
 
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, TypeVar, Union
 
 import numpy as np
 
@@ -13,8 +13,10 @@ from power_grid_model_ds._core.utils.misc import array_equal_with_nan
 if TYPE_CHECKING:
     from power_grid_model_ds._core.model.arrays.base.array import FancyArray
 
+T = TypeVar("T", bound="FancyArray")
 
-def concatenate(fancy_array: "FancyArray", *other_arrays: Union["FancyArray", np.ndarray]) -> "FancyArray":
+
+def concatenate(fancy_array: T, *other_arrays: Union[T, np.ndarray]) -> T:
     """Concatenate arrays."""
     np_arrays = [array if isinstance(array, np.ndarray) else array.data for array in other_arrays]
     try:
@@ -24,7 +26,7 @@ def concatenate(fancy_array: "FancyArray", *other_arrays: Union["FancyArray", np
     return fancy_array.__class__(data=concatenated)
 
 
-def unique(array: "FancyArray", **kwargs):
+def unique(array: T, **kwargs):
     """Return the unique elements of the array."""
     for column in array.columns:
         if np.issubdtype(array.dtype[column], np.floating) and np.isnan(array[column]).any():
@@ -37,13 +39,13 @@ def unique(array: "FancyArray", **kwargs):
     return array.__class__(data=unique_data)
 
 
-def sort(array: "FancyArray", axis=-1, kind=None, order=None) -> "FancyArray":
+def sort(array: T, axis=-1, kind=None, order=None) -> T:
     """Sort the array in-place and return sorted array."""
     array.data.sort(axis=axis, kind=kind, order=order)
     return array
 
 
-def array_equal(array1: "FancyArray", array2: "FancyArray", equal_nan: bool = True) -> bool:
+def array_equal(array1: T, array2: T, equal_nan: bool = True) -> bool:
     """Return True if two arrays are equal."""
     if equal_nan:
         return array_equal_with_nan(array1.data, array2.data)

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/src/power_grid_model_ds/_core/model/arrays/base/array.py

@@ -66,7 +66,7 @@ class FancyArray(ABC):
             self._data = data
 
     @property
-    def data(self: Self):
+    def data(self: Self) -> NDArray:
         return self._data
 
     @classmethod

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/src/power_grid_model_ds/_core/model/arrays/pgm_arrays.py

@@ -9,6 +9,7 @@ from typing import Literal
 import numpy as np
 from numpy.typing import NDArray
 
+from power_grid_model_ds._core.fancypy import concatenate
 from power_grid_model_ds._core.model.arrays.base.array import FancyArray
 from power_grid_model_ds._core.model.dtypes.appliances import Source, SymGen, SymLoad
 from power_grid_model_ds._core.model.dtypes.branches import (
@@ -99,7 +100,26 @@ class TransformerArray(Transformer, BranchArray):
 
 
 class Branch3Array(IdArray, Branch3):
-    pass
+    def as_branches(self) -> BranchArray:
+        """Convert Branch3Array to BranchArray."""
+        branches_1_2 = BranchArray.empty(self.size)
+        branches_1_2.from_node = self.node_1
+        branches_1_2.to_node = self.node_2
+        branches_1_2.from_status = self.status_1
+        branches_1_2.to_status = self.status_2
+
+        branches_1_3 = BranchArray.empty(self.size)
+        branches_1_3.from_node = self.node_1
+        branches_1_3.to_node = self.node_3
+        branches_1_3.from_status = self.status_1
+        branches_1_3.to_status = self.status_3
+
+        branches_2_3 = BranchArray.empty(self.size)
+        branches_2_3.from_node = self.node_2
+        branches_2_3.to_node = self.node_3
+        branches_2_3.from_status = self.status_2
+        branches_2_3.to_status = self.status_3
+        return concatenate(branches_1_2, branches_1_3, branches_2_3)
 
 
 class ThreeWindingTransformerArray(Branch3Array, ThreeWindingTransformer):

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/src/power_grid_model_ds/_core/model/graphs/models/base.py

@@ -15,7 +15,6 @@ from power_grid_model_ds._core.model.graphs.errors import (
     MissingNodeError,
     NoPathBetweenNodes,
 )
-from power_grid_model_ds._core.model.utils import _get_branch3_branches
 
 if TYPE_CHECKING:
     from power_grid_model_ds._core.model.grids.base import Grid
@@ -175,8 +174,7 @@ class BaseGraphModel(ABC):
     def add_branch3_array(self, branch3_array: Branch3Array) -> None:
         """Add all branch3s in the branch3 array to the graph."""
         for branch3 in branch3_array:
-            branches = _get_branch3_branches(branch3)
-            self.add_branch_array(branches)
+            self.add_branch_array(branch3.as_branches())
 
     def delete_branch_array(self, branch_array: BranchArray, raise_on_fail: bool = True) -> None:
         """Delete all branches in branch_array from the graph."""
@@ -187,8 +185,7 @@ class BaseGraphModel(ABC):
     def delete_branch3_array(self, branch3_array: Branch3Array, raise_on_fail: bool = True) -> None:
         """Delete all branch3s in the branch3 array from the graph."""
         for branch3 in branch3_array:
-            branches = _get_branch3_branches(branch3)
-            self.delete_branch_array(branches, raise_on_fail=raise_on_fail)
+            self.delete_branch_array(branch3.as_branches(), raise_on_fail=raise_on_fail)
 
     @contextmanager
     def tmp_remove_nodes(self, nodes: list[int]) -> Generator:

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/src/power_grid_model_ds/_core/visualizer/parsers.py

@@ -6,7 +6,6 @@ from typing import Any, Literal
 
 from power_grid_model_ds._core.model.arrays.base.array import FancyArray
 from power_grid_model_ds._core.model.grids.base import Grid
-from power_grid_model_ds._core.model.utils import _get_branch3_branches
 from power_grid_model_ds.arrays import Branch3Array, BranchArray, NodeArray
 
 
@@ -41,15 +40,15 @@ def parse_branch3_array(branches: Branch3Array, group: Literal["transformer"]) -
     """Parse the three-winding transformer array."""
     parsed_branches = []
     columns = branches.columns
-    for branch in branches:
-        for branch_ in _get_branch3_branches(branch):
-            cyto_elements = {"data": _array_to_dict(branch_, columns)}
+    for branch3 in branches:
+        for branch1 in branch3.as_branches():
+            cyto_elements = {"data": _array_to_dict(branch1, columns)}
             cyto_elements["data"].update(
                 {
                     # IDs need to be unique, so we combine the branch ID with the from and to nodes
-                    "id": str(branch.id.item()) + f"_{branch_.from_node.item()}_{branch_.to_node.item()}",
-                    "source": str(branch_.from_node.item()),
-                    "target": str(branch_.to_node.item()),
+                    "id": str(branch3.id.item()) + f"_{branch1.from_node.item()}_{branch1.to_node.item()}",
+                    "source": str(branch1.from_node.item()),
+                    "target": str(branch1.to_node.item()),
                     "group": group,
                 }
             )

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/src/power_grid_model_ds.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-grid-model-ds
-Version: 1.4.2
+Version: 1.4.3
 Summary: Power Grid Model extension which provides a grid data structure for simulation and analysis
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0

{power_grid_model_ds-1.4.2 → power_grid_model_ds-1.4.3}/src/power_grid_model_ds.egg-info/SOURCES.txt

@@ -31,7 +31,6 @@ src/power_grid_model_ds/_core/data_source/generator/arrays/source.py
 src/power_grid_model_ds/_core/data_source/generator/arrays/transformer.py
 src/power_grid_model_ds/_core/model/__init__.py
 src/power_grid_model_ds/_core/model/constants.py
-src/power_grid_model_ds/_core/model/utils.py
 src/power_grid_model_ds/_core/model/arrays/__init__.py
 src/power_grid_model_ds/_core/model/arrays/pgm_arrays.py
 src/power_grid_model_ds/_core/model/arrays/base/__init__.py

power_grid_model_ds-1.4.2/PYPI_VERSION

@@ -1 +0,0 @@
-1.4.2

power_grid_model_ds-1.4.2/src/power_grid_model_ds/_core/model/utils.py

@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
-#
-# SPDX-License-Identifier: MPL-2.0
-from power_grid_model_ds._core.model.arrays.pgm_arrays import Branch3Array, BranchArray
-
-
-def _get_branch3_branches(branch3: Branch3Array) -> BranchArray:
-    node_1 = branch3.node_1.item()
-    node_2 = branch3.node_2.item()
-    node_3 = branch3.node_3.item()
-
-    status_1 = branch3.status_1.item()
-    status_2 = branch3.status_2.item()
-    status_3 = branch3.status_3.item()
-
-    branches = BranchArray.zeros(3)
-    branches.from_node = [node_1, node_1, node_2]
-    branches.to_node = [node_2, node_3, node_3]
-    branches.from_status = [status_1, status_1, status_2]
-    branches.to_status = [status_2, status_3, status_3]
-
-    return branches