pyrbd 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

pyrbd/block.py

@@ -1,7 +1,6 @@
 """Module containing Block, Series and Group class definitions."""
 
-from typing import Optional
-from itertools import combinations
+from typing import Optional, Generator
 from copy import deepcopy
 from collections import namedtuple
 
@@ -137,6 +136,11 @@ class Block:
         )
         return node
 
+    def get_blocks(self) -> Generator["Block", None, None]:
+        """Yield child `Block` istances."""
+
+        yield self
+
     def __add__(self, block: "Block") -> "Series":
         """Add two `Block` instances to make a `Series` instance.
 
@@ -321,6 +325,11 @@ class Series(Block):
         )
         return series_node
 
+    def get_blocks(self) -> Generator[Block, None, None]:
+        yield from [
+            children for block in self.blocks for children in block.get_blocks()
+        ]
+
 
 class Group(Block):
     """Group of `Block` instances for vertical stacking.
@@ -449,16 +458,28 @@ class Group(Block):
 
         scaling = 0.75
 
+        series_blocks = [block for block in self.blocks if isinstance(block, Series)]
+        series_blocks.sort(
+            key=lambda block: len(list(block.get_blocks())), reverse=True
+        )
+
+        if len(series_blocks) > 0:
+            longest_series_index = self.blocks.index(series_blocks[0])
+        else:
+            longest_series_index = 0
+        blocks = deepcopy(self.blocks)
+        longest_series = blocks.pop(longest_series_index)
+
         return "\n".join(
             [
                 " ".join(
                     [
                         f"\\draw[{self.arrow_options},",
                         f"rectangle line={scaling * self.internal_arrow_length}cm]",
-                        f"({block1.id}.east) to ({block2.id}.east);\n",
+                        f"({longest_series.id}.east) to ({block.id}.east);\n",
                     ]
                 )
-                for (block1, block2) in combinations(self.blocks, 2)
+                for block in blocks
             ]
         )
 
@@ -500,3 +521,6 @@ class Group(Block):
         )
 
         return group_node
+
+    def get_blocks(self) -> Generator[Block, None, None]:
+        yield from self.blocks

{pyrbd-0.3.1.dist-info → pyrbd-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrbd
-Version: 0.3.1
+Version: 0.3.2
 Summary: Package for creating simple reliability block diagrams (RBDs) using LaTeX and TikZ.
 Project-URL: Repository, https://github.com/hghugdal/pyrbd
 Project-URL: Issues, https://github.com/hghugdal/pyrbd/issues

pyrbd-0.3.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+pyrbd/__init__.py,sha256=mpsb022BX9eDGSBhuYIr2gOr4sg_M9sYbPGHLPIdvl0,219
+pyrbd/block.py,sha256=xRb4FnPTCA6CEAax2q3GRsngtzJvXlg9wCqr5q3nkEQ,14576
+pyrbd/diagram.py,sha256=YiU2tslUh4HbtuVP2dXSsVQFKpOjLl_ArSYjCSiQoks,6806
+pyrbd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyrbd-0.3.2.dist-info/METADATA,sha256=3JIMvqVdxlQq-30y4omd_yipT8YfgxZOmZxq5SopBBU,2402
+pyrbd-0.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pyrbd-0.3.2.dist-info/licenses/LICENSE,sha256=mxXMgWpFgk71JpEEElFrb9FJxeoaDgvrU8gjUUU9LzA,1069
+pyrbd-0.3.2.dist-info/RECORD,,

pyrbd-0.3.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-pyrbd/__init__.py,sha256=mpsb022BX9eDGSBhuYIr2gOr4sg_M9sYbPGHLPIdvl0,219
-pyrbd/block.py,sha256=l44FYLS9zQbyblDsVUb9GwvsFm_sU1IamlpbrjryVbw,13786
-pyrbd/diagram.py,sha256=YiU2tslUh4HbtuVP2dXSsVQFKpOjLl_ArSYjCSiQoks,6806
-pyrbd/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyrbd-0.3.1.dist-info/METADATA,sha256=_IHhEyyaEaLB7lg1iicfWM4lZWg97I4wskgq3OuDqjc,2402
-pyrbd-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pyrbd-0.3.1.dist-info/licenses/LICENSE,sha256=mxXMgWpFgk71JpEEElFrb9FJxeoaDgvrU8gjUUU9LzA,1069
-pyrbd-0.3.1.dist-info/RECORD,,