Skip to content

Commit

Permalink
Updated version number in configure.ac and updated reference
Browse files Browse the repository at this point in the history
  • Loading branch information
jfmrod committed Oct 30, 2017
1 parent 8c31279 commit b6ff22c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

# MAPseq v1.2 (23 Oct 2017)
# MAPseq v1.2.2 (30 Oct 2017)
by Joao F. Matias Rodrigues, Thomas S.B. Schmidt, Janko Tackmann, and Christian von Mering
Institute of Molecular Life Sciences, University of Zurich, Switzerland

Reference:
Matias Rodrigues JF, Schmidt TSB, Tackmann J, Mering C von. MAPseq: bringing speed, accuracy and consistency to metagenomic ribosomal RNA analysis. submitted.
Matias Rodrigues JF, Schmidt TSB, Tackmann J & von Mering C (2017) MAPseq: highly efficient k-mer search with confidence estimates, for rRNA sequence analysis. Bioinformatics. http://doi.org/10.1093/bioinformatics/btx517

---
## Table of contents
Expand Down Expand Up @@ -142,6 +142,9 @@ query1 FJ560320:1..876 301 0.7369985 301 0 0 0 301 305 606 + Archaea Archaea;F


## 4. HISTORY
1.2.2 (30 Oct 2017)
- Fixed multithreaded race condition causing issues on some systems.

1.2.1 (23 Oct 2017)
- Updated mapref to v2.2. Fixed several issues with v2.0.
- Dropped LTP taxonomy due to low coverage.
Expand All @@ -156,4 +159,3 @@ query1 FJ560320:1..876 301 0.7369985 301 0 0 0 301 305 606 + Archaea Archaea;F
1.0 (14 October 2016)
- First release of MAPseq.


2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([mapseq],[1.2.1])
AC_INIT([mapseq],[1.2.2])

: ${CXXFLAGS=-O3}

Expand Down
2 changes: 1 addition & 1 deletion make-bin-package.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

./configure --prefix=`pwd`/mapseq-1.2-linux --bindir=`pwd`/mapseq-1.2-linux --enable-makestatic LIBS="-lgpm -ltermcap" CXXFLAGS="-O2"
./configure --prefix=`pwd`/mapseq-1.2.2-linux --bindir=`pwd`/mapseq-1.2.2-linux --enable-makestatic LIBS="-lgpm -ltermcap" CXXFLAGS="-O2"
#make install
#cp README mapseq-1.0-bin/
#rm -rf mapseq-1.0-bin/{esh,eutils-config,include,lib}
Expand Down
2 changes: 1 addition & 1 deletion man/mapseq.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" Process this file with
.\" groff -man -Tascii hpc-clust.1
.\" groff -man -Tascii mapseq.1
.\"
.TH MAPSEQ 1.2.1 "OCT 2017" Linux "User Manuals"
.SH NAME
Expand Down
7 changes: 4 additions & 3 deletions mapseq.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class esearchws
{
public:
// eintarray best;
ernd rng;
ealignws alignws;
eintarray otukmerpos;
uint64_t *kmerbitmask;
Expand Down Expand Up @@ -2983,10 +2984,10 @@ void otukmeradd(ebasicarray<deque<int> >& otukmers,int i,eseq& s,eintarray& tmpk
}
}

void randomize(eintarray& seqids)
void randomize(ernd& prnd,eintarray& seqids)
{
for (int i=seqids.size()-1; i>0; --i){
int r=int(rnd.uniform()*(i+1));
int r=int(prnd.uniform()*(i+1));
if (r!=i) seqids.swap(r,i);
}
}
Expand Down Expand Up @@ -3232,7 +3233,7 @@ void seqsearch(const estr& str2id,eseqdb& db,eseq& s,earray<epredinfo>& pinfoarr

// cout << "# 2nd counting" << endl;

randomize(seqids);
randomize(sws.rng,seqids);
sws.idcount.init(seqids.size(),0);

if (sws.maskid+1u<sws.maskid){
Expand Down

0 comments on commit b6ff22c

Please sign in to comment.