Skip to content

Commit

Permalink
Output in the order of number of datasets in which fusion gene is found
Browse files Browse the repository at this point in the history
  • Loading branch information
yhoogstrate committed Apr 5, 2016
1 parent f8e9bc1 commit 99f4fbf
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
9 changes: 9 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2016-04-05 Youri Hoogstrate

* Version 3.0.1: Added a simple break statement ensures that the output is
in the order of the number of datasets in which a fusion gene is being
found.

The logging function now does not skip the 100.0% which was caused in some
cases occured due to a rounding artefact.

2016-04-01 Youri Hoogstrate

* Version 3.0.0: The core has been rewritte because it needed to use much
Expand Down
6 changes: 3 additions & 3 deletions fuma/ComparisonTriangle.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ def overlay_fusions_recursive(self,fh,merged_fusions):
export_fusions = [tmp for tmp in merged_fusions]
merged_fusions_new = []

for y,fusion_y in self:
for x in range(len(merged_fusions)):
for x in range(len(merged_fusions)):
for y,fusion_y in self:
merged_fusion_x = merged_fusions[x]
n_total, passed, previous_percentage = self.log_progress(n_total, passed, previous_percentage)

Expand All @@ -122,9 +122,9 @@ def overlay_fusions_recursive(self,fh,merged_fusions):
if comparison != False:
export_fusions[x] = None
merged_fusions_new.append(comparison)
break

passed += 1

n_total, passed, previous_percentage = self.log_progress(n_total, passed, previous_percentage)

merged_fusions_new = self.prune_duplicates(merged_fusions_new)
Expand Down
2 changes: 1 addition & 1 deletion fuma/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<http://epydoc.sourceforge.net/manual-fields.html#fields-synonyms>
"""

__version_info__ = ('3', '0', '0')
__version_info__ = ('3', '0', '1')
__version__ = '.'.join(__version_info__) if (len(__version_info__) == 3) else '.'.join(__version_info__[0:3])+"-"+__version_info__[3]
__author__ = 'Youri Hoogstrate'
__homepage__ = 'https://github.com/yhoogstrate/fuma'
Expand Down

0 comments on commit 99f4fbf

Please sign in to comment.