add regex

Signed-off-by: Nitish Bharambe <[email protected]>

Author: nitbharambe

src/power_grid_model_io/utils/parsing.py

@@ -8,7 +8,7 @@
 import re
 from typing import Dict
 
-_TRAFO_CONNECTION_RE = re.compile(r"^(Y|YN|D|Z|ZN)(y|yn|d|z|zn)(\d|1[0-2])?$")
+_TRAFO_CONNECTION_RE = re.compile(r"^(Y|YN|D|Z|ZN)(y|yn|d|z|zn)(-?\d|1[0-2]|-1[0-2])?$")
 
 
 def parse_trafo_connection(string: str) -> Dict[str, str]:
@@ -17,11 +17,11 @@ def parse_trafo_connection(string: str) -> Dict[str, str]:
     Matches the following regular expression to the winding_from and winding_to codes.
     Optionally checks the clock number:
 
-    ^               Start of the string
-    (Y|YN|D|Z|ZN)   From winding type
-    (y|yn|d|z|zn)   To winding type
-    (\d|1[0-2])?    Optional clock number (0-12)
-    $               End of the string
+    ^                         Start of the string
+    (Y|YN|D|Z|ZN)             From winding type
+    (y|yn|d|z|zn)             To winding type
+    (-?\d|1[0-2]|-1[0-2])?    Optional clock number (-12-12)
+    $                         End of the string
 
     Args:
         string (str): The input string.
@@ -39,7 +39,9 @@ def parse_trafo_connection(string: str) -> Dict[str, str]:
     return {"winding_from": match.group(1), "winding_to": match.group(2), "clock": match.group(3)}
 
 
-_TRAFO3_CONNECTION_RE = re.compile(r"^(Y|YN|D|Z|ZN)(y|yn|d|z|zn)(\d|1[0-2])?(y|yn|d|z|zn)(\d|1[0-2])?$")
+_TRAFO3_CONNECTION_RE = re.compile(
+    r"^(Y|YN|D|Z|ZN)(y|yn|d|z|zn)(-?\d|1[0-2]|-1[0-2])?(y|yn|d|z|zn)(-?\d|1[0-2]|-1[0-2])?$"
+)
 
 
 def parse_trafo3_connection(string: str) -> Dict[str, str]:
@@ -48,13 +50,13 @@ def parse_trafo3_connection(string: str) -> Dict[str, str]:
     Matches the following regular expression to the winding_1, winding_2 and winding_3 codes.
     Optionally checks the clock numbers:
 
-    ^               Start of the string
-    (Y|YN|D|Z|ZN)   First winding type
-    (y|yn|d|z|zn)   Second winding type
-    (\d|1[0-2])     Clock number (0-12)
-    (y|yn|d|z|zn)   Third winding type
-    (\d|1[0-2])     Clock number (0-12)
-    $               End of the string
+    ^                         Start of the string
+    (Y|YN|D|Z|ZN)             First winding type
+    (y|yn|d|z|zn)             Second winding type
+    (-?\d|1[0-2]|-1[0-2])     Clock number (-12-12)
+    (y|yn|d|z|zn)             Third winding type
+    (-?\d|1[0-2]|-1[0-2])     Clock number (-12-12)
+    $                         End of the string
 
     Args:
         string (str): The input string.

tests/unit/functions/test_phase_to_phase.py

@@ -179,14 +179,16 @@ def test_get_winding_to__exception():
     [
         ("YNd0", 0),
         ("YNyn5", 5),
-        ("YNd12", 12),
+        ("YNd12", 0),
+        ("Dyn-1", 11),
+        ("Dd-4", 8),
     ],
 )
 def test_get_clock(code: str, clock: int):
     assert get_clock(code) == clock
 
 
-@mark.parametrize("code", ["YNd-1", "YNd13"])
+@mark.parametrize("code", ["YNd-15", "YNd13"])
 def test_get_clock__exception(code):
     with raises(ValueError):
         get_clock(code)
@@ -344,7 +346,8 @@ def test_get_winding_3__exception():
     [
         ("YNd0y4", 0),
         ("YNyn5d3", 5),
-        ("YNd12d1", 12),
+        ("YNd12d1", 0),
+        ("YNd-5d1", 7),
     ],
 )
 def test_get_clock_12(code: str, clock: int):
@@ -363,6 +366,7 @@ def test_get_clock_12__exception(code):
         ("YNd0y4", 4),
         ("YNyn5d3", 3),
         ("YNd12d1", 1),
+        ("YNd12d-1", 11),
     ],
 )
 def test_get_clock_13(code: str, clock: int):

tests/unit/utils/test_parsing.py

@@ -34,8 +34,6 @@ def test_parse_trafo_connection__neg():
         parse_trafo_connection("YNx")
     with pytest.raises(ValueError, match="Invalid transformer connection string: 'Dy13'"):
         parse_trafo_connection("Dy13")
-    with pytest.raises(ValueError, match="Invalid transformer connection string: 'Dy-1'"):
-        parse_trafo_connection("Dy-1")
 
 
 def test_parse_trafo3_connection__pos():
@@ -96,8 +94,6 @@ def test_parse_trafo3_connection__neg():
         parse_trafo3_connection("Dyd13")
     with pytest.raises(ValueError, match="Invalid three winding transformer connection string: 'DyD10'"):
         parse_trafo3_connection("DyD10")
-    with pytest.raises(ValueError, match="Invalid three winding transformer connection string: 'Dynd-1'"):
-        parse_trafo3_connection("Dynd-1")
     with pytest.raises(ValueError, match=re.escape("Invalid three winding transformer connection string: 'Dyn+5d-1'")):
         parse_trafo3_connection("Dyn+5d-1")
     with pytest.raises(ValueError, match="Invalid three winding transformer connection string: 'Dy1d13'"):