Sequence -> list in some type hints/declarations for simplicity

Bitbol-Lab · May 10, 2024 · 321b623 · 321b623
1 parent ebb160c
commit 321b623
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git a/diffpass/base.py b/diffpass/base.py
@@ -37,10 +37,8 @@
 GroupByGroupList = list  # List indexed by group index
 
 IndexPair = tuple[int, int]  # Pair of indices
-IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences
-IndexPairsInGroups = Sequence[
-    IndexPairsInGroup
-]  # Pairs of indices in groups of sequences
+IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences
+IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences
 
 # %% ../nbs/base.ipynb 6
 def dccn(x: torch.Tensor) -> np.ndarray:

diff --git a/diffpass/model.py b/diffpass/model.py
@@ -40,10 +40,8 @@
 
 # Type aliases
 IndexPair = tuple[int, int]  # Pair of indices
-IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences
-IndexPairsInGroups = Sequence[
-    IndexPairsInGroup
-]  # Pairs of indices in groups of sequences
+IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences
+IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences
 
 # %% ../nbs/model.ipynb 6
 def _consecutive_slices_from_sizes(group_sizes: Optional[Sequence[int]]) -> list[slice]:

diff --git a/diffpass/train.py b/diffpass/train.py
@@ -29,10 +29,8 @@
 
 # Type aliases
 IndexPair = tuple[int, int]  # Pair of indices
-IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences
-IndexPairsInGroups = Sequence[
-    IndexPairsInGroup
-]  # Pairs of indices in groups of sequences
+IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences
+IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences
 
 # %% ../nbs/train.ipynb 6
 class InformationPairing(DiffPaSSModel):

diff --git a/nbs/base.ipynb b/nbs/base.ipynb
@@ -81,10 +81,8 @@
     "GroupByGroupList = list  # List indexed by group index\n",
     "\n",
     "IndexPair = tuple[int, int]  # Pair of indices\n",
-    "IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences\n",
-    "IndexPairsInGroups = Sequence[\n",
-    "    IndexPairsInGroup\n",
-    "]  # Pairs of indices in groups of sequences"
+    "IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences\n",
+    "IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences"
    ]
   },
   {
@@ -98,8 +96,8 @@
     "GroupByGroupList = list  # List indexed by group index\n",
     "\n",
     "IndexPair = tuple[int, int]  # Pair of indices\n",
-    "IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences\n",
-    "IndexPairsInGroups = Sequence[IndexPairsInGroup]  # Pairs of indices in groups of sequences\n",
+    "IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences\n",
+    "IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences\n",
     "```"
    ]
   },

diff --git a/nbs/model.ipynb b/nbs/model.ipynb
@@ -82,10 +82,8 @@
     "\n",
     "# Type aliases\n",
     "IndexPair = tuple[int, int]  # Pair of indices\n",
-    "IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences\n",
-    "IndexPairsInGroups = Sequence[\n",
-    "    IndexPairsInGroup\n",
-    "]  # Pairs of indices in groups of sequences"
+    "IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences\n",
+    "IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences"
    ]
   },
   {
@@ -95,8 +93,8 @@
     "## Type aliases\n",
     "```python\n",
     "IndexPair = tuple[int, int]  # Pair of indices\n",
-    "IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences\n",
-    "IndexPairsInGroups = Sequence[IndexPairsInGroup]  # Pairs of indices in groups of sequences\n",
+    "IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences\n",
+    "IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences\n",
     "```"
    ]
   },

diff --git a/nbs/train.ipynb b/nbs/train.ipynb
@@ -73,10 +73,8 @@
     "\n",
     "# Type aliases\n",
     "IndexPair = tuple[int, int]  # Pair of indices\n",
-    "IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences\n",
-    "IndexPairsInGroups = Sequence[\n",
-    "    IndexPairsInGroup\n",
-    "]  # Pairs of indices in groups of sequences"
+    "IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences\n",
+    "IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences"
    ]
   },
   {
@@ -87,8 +85,8 @@
     "\n",
     "```python\n",
     "IndexPair = tuple[int, int]  # Pair of indices\n",
-    "IndexPairsInGroup = Sequence[IndexPair]  # Pairs of indices in a group of sequences\n",
-    "IndexPairsInGroups = Sequence[IndexPairsInGroup]  # Pairs of indices in groups of sequences\n",
+    "IndexPairsInGroup = list[IndexPair]  # Pairs of indices in a group of sequences\n",
+    "IndexPairsInGroups = list[IndexPairsInGroup]  # Pairs of indices in groups of sequences\n",
     "```"
    ]
   },