Skip to content

Commit

Permalink
Correct bug in scoring introduced at v1.13.0
Browse files Browse the repository at this point in the history
On branch master
	modified:   README.md
	modified:   recentrifuge/__init__.py
	modified:   recentrifuge/test/TEST.rcf.html
	modified:   recentrifuge/test/TEST.rcf.xlsx
	modified:   recentrifuge/trees.py
	modified:   setup.py
  • Loading branch information
khyox committed Jan 17, 2024
1 parent 01a06e2 commit f5a7e96
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


____
[![Retest](https://github.com/khyox/Recentrifuge/actions/workflows/retest.yaml/badge.svg?branch=v1.13.1)](https://github.com/khyox/recentrifuge/actions/workflows/retest.yaml)
[![Retest](https://github.com/khyox/Recentrifuge/actions/workflows/retest.yaml/badge.svg?branch=v1.13.2)](https://github.com/khyox/recentrifuge/actions/workflows/retest.yaml)
[![](https://img.shields.io/maintenance/yes/2024.svg)](http://www.recentrifuge.org)
[![](https://img.shields.io/github/languages/top/khyox/recentrifuge.svg)](https://pypi.org/project/recentrifuge/)
[![](https://img.shields.io/pypi/pyversions/recentrifuge.svg)](https://pypi.org/project/recentrifuge/)
Expand Down
2 changes: 1 addition & 1 deletion recentrifuge/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
__maintainer__ = 'Jose Manuel Marti'
__status__ = 'Production/Stable'
__date__ = 'Jan 2024'
__version__ = '1.13.1'
__version__ = '1.13.2'

import sys
from Bio import SeqIO
Expand Down
4 changes: 2 additions & 2 deletions recentrifuge/test/TEST.rcf.html

Large diffs are not rendered by default.

Binary file modified recentrifuge/test/TEST.rcf.xlsx
Binary file not shown.
2 changes: 1 addition & 1 deletion recentrifuge/trees.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def swmean(cnt1: int, sco1: Score, cnt2: int,
return sco2
elif sco2 == NO_SCORE:
return sco1
if True: ###log_scores:
if log_scores:
return Score(log10(
(cnt1 * 10**sco1 + cnt2 * 10**sco2) / (cnt1 + cnt2)
))
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='recentrifuge',
version='1.13.1',
version='1.13.2',
packages=['recentrifuge'],
url='http://www.recentrifuge.org',
license='AGPL except krona.js, with its own license by BNBI',
Expand All @@ -12,7 +12,7 @@
long_description="""
**Robust comparative analysis and contamination removal for metagenomics**
[![Retest](https://github.com/khyox/Recentrifuge/actions/workflows/retest.yaml/badge.svg?branch=v1.13.1)](https://github.com/khyox/recentrifuge/actions/workflows/retest.yaml)
[![Retest](https://github.com/khyox/Recentrifuge/actions/workflows/retest.yaml/badge.svg?branch=v1.13.2)](https://github.com/khyox/recentrifuge/actions/workflows/retest.yaml)
With Recentrifuge, researchers can interactively explore what organisms are in their samples and at which level of confidence, thus enabling a robust comparative analysis of multiple samples in any metagenomic study.
Expand Down

0 comments on commit f5a7e96

Please sign in to comment.