RNApolis 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

{RNApolis-0.4.1.dist-info → RNApolis-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RNApolis
-Version: 0.4.1
+Version: 0.4.3
 Summary: A Python library containing RNA-related bioinformatics functions and classes
 Home-page: https://github.com/tzok/rnapolis-py
 Author: Tomasz Zok

{RNApolis-0.4.1.dist-info → RNApolis-0.4.3.dist-info}/RECORD

@@ -6,12 +6,12 @@ rnapolis/molecule_filter.py,sha256=hB6-nXgjmw7FAsQ3bj0cZ2FvuW2I1PXunEfcdwEUB1o,7
 rnapolis/motif_extractor.py,sha256=duHvpi9Ulcny9K60E6VBpz5RpJZw-KdTB4_Ph0iP478,774
 rnapolis/parser.py,sha256=wCA9rXqt51iLECgeBqOShFpuT8JwanNkHYD5uXYvLzU,13988
 rnapolis/rfam_folder.py,sha256=SjiiyML_T1__saruFwSMJEoQ7Y55GIU8ktS8ZUn5-fw,11111
-rnapolis/tertiary.py,sha256=qk1te8GPDuvQsnm4rTiw96VDYyNoO5x4IPf98zDzxPw,20824
+rnapolis/tertiary.py,sha256=kysCb3U93Cpxxsfq5uwFxvcI_biwMiRJgWsNZxrXcaA,20501
 rnapolis/transformer.py,sha256=V9nOQvdq4-p7yUWo0vQg0CDQMpmyxz9t4TMSRVEKHnw,1817
 rnapolis/util.py,sha256=IdquFO3PV1_KDqodjupzm0Rqvgy0CeSzxGHaGEHYXVU,543
-RNApolis-0.4.1.dist-info/LICENSE,sha256=ZGRu12MzCgbYA-Lt8MyBlmjvPZh7xfiD5u5wBx0enq4,1066
-RNApolis-0.4.1.dist-info/METADATA,sha256=EayMQbE4Y5raff-7pFMmeh4EB81JaLEEMrbvEA4mbAk,54322
-RNApolis-0.4.1.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-RNApolis-0.4.1.dist-info/entry_points.txt,sha256=foN2Pn5e-OzEz0fFmNoX6PnFSZFQntOlY8LbognP5F0,308
-RNApolis-0.4.1.dist-info/top_level.txt,sha256=LcO18koxZcWoJ21KDRRRo_tyIbmXL5z61dPitZpy8yc,9
-RNApolis-0.4.1.dist-info/RECORD,,
+RNApolis-0.4.3.dist-info/LICENSE,sha256=ZGRu12MzCgbYA-Lt8MyBlmjvPZh7xfiD5u5wBx0enq4,1066
+RNApolis-0.4.3.dist-info/METADATA,sha256=24AO4oRKx840RqJLNOF_SrT4xHNtu26s0Nx3URw0NZI,54322
+RNApolis-0.4.3.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+RNApolis-0.4.3.dist-info/entry_points.txt,sha256=foN2Pn5e-OzEz0fFmNoX6PnFSZFQntOlY8LbognP5F0,308
+RNApolis-0.4.3.dist-info/top_level.txt,sha256=LcO18koxZcWoJ21KDRRRo_tyIbmXL5z61dPitZpy8yc,9
+RNApolis-0.4.3.dist-info/RECORD,,

rnapolis/tertiary.py

@@ -497,42 +497,27 @@ class Mapping2D3D:
 
     @cached_property
     def strands_sequences(self) -> List[Tuple[str, str]]:
-        nucleotides = [
-            residue for residue in self.structure3d.residues if residue.is_nucleotide
-        ]
+        nucleotides = list(filter(lambda r: r.is_nucleotide, self.structure3d.residues))
 
-        if len(nucleotides) == 0:
+        if not nucleotides:
             return []
 
-        result = []
-        strand = [nucleotides[0]]
+        result = [(nucleotides[0].chain, [nucleotides[0].one_letter_name])]
 
         for i in range(1, len(nucleotides)):
-            previous = strand[-1]
-            current = nucleotides[i]
+            previous = nucleotides[i - 1]
+            residue = nucleotides[i]
 
-            if previous.chain == current.chain and (
-                self.find_gaps == False or previous.is_connected(current)
-            ):
-                strand.append(current)
+            if residue.chain != previous.chain:
+                result.append((residue.chain, [residue.one_letter_name]))
             else:
-                result.append(
-                    (
-                        previous.chain,
-                        "".join([residue.one_letter_name for residue in strand]),
-                    )
-                )
-                strand = [current]
-
-        if len(strand) > 0:
-            result.append(
-                (
-                    strand[0].chain,
-                    "".join([residue.one_letter_name for residue in strand]),
-                )
-            )
+                if self.find_gaps:
+                    if not previous.is_connected(residue):
+                        for k in range(residue.number - previous.number - 1):
+                            result[-1][1].append("?")
+                result[-1][1].append(residue.one_letter_name)
 
-        return result
+        return [(chain, "".join(sequence)) for chain, sequence in result]
 
     @cached_property
     def bpseq(self) -> BpSeq:
@@ -549,23 +534,23 @@ class Mapping2D3D:
         residue_map: Dict[Residue3D, int] = {}
         i = 1
 
-        for j, residue in enumerate(self.structure3d.residues):
+        for j, residue in enumerate(
+            filter(lambda r: r.is_nucleotide, self.structure3d.residues)
+        ):
             if self.find_gaps and j > 0:
                 previous = self.structure3d.residues[j - 1]
+
                 if (
-                    previous.is_nucleotide
-                    and residue.is_nucleotide
-                    and previous.label
-                    and residue.label
-                    and previous.label.chain == residue.label.chain
+                    not previous.is_connected(residue)
+                    and previous.chain == residue.chain
                 ):
-                    for k in range(residue.label.number - previous.label.number - 1):
+                    for k in range(residue.number - previous.number - 1):
                         result[i] = [i, "?", 0]
                         i += 1
-            if residue.is_nucleotide:
-                result[i] = [i, residue.one_letter_name, 0]
-                residue_map[residue] = i
-                i += 1
+
+            result[i] = [i, residue.one_letter_name, 0]
+            residue_map[residue] = i
+            i += 1
 
         for base_pair in base_pairs:
             j = residue_map.get(base_pair.nt1_3d, None)