diff --git a/README.md b/README.md index 4c52cde4..23dc7757 100644 --- a/README.md +++ b/README.md @@ -32,13 +32,13 @@ If you can't find an answer in the VSEARCH documentation, please visit the [VSEA In the example below, VSEARCH will identify sequences in the file database.fsa that are at least 90% identical on the plus strand to the query sequences in the file queries.fsa and write the results to the file alnout.txt. -`./vsearch-1.0.11-linux-x86_64 --usearch_global queries.fsa --db database.fsa --id 0.9 --alnout alnout.txt` +`./vsearch-1.0.13-linux-x86_64 --usearch_global queries.fsa --db database.fsa --id 0.9 --alnout alnout.txt` ## Download and install The latest releases of VSEARCH are available [here](https://github.com/torognes/vsearch/releases). -Binary executables of VSEARCH are available in the `bin` folder for [GNU/Linux on x86-64 systems](https://github.com/torognes/vsearch/blob/master/bin/vsearch-1.0.11-linux-x86_64) and [Apple Mac OS X on x86-64 systems](https://github.com/torognes/vsearch/blob/master/bin/vsearch-1.0.11-osx-x86_64). These executables include support for input files compressed by zlib and bzip2 (with files usually ending in .gz or .bz2). +Binary executables of VSEARCH are available in the `bin` folder for [GNU/Linux on x86-64 systems](https://github.com/torognes/vsearch/blob/master/bin/vsearch-1.0.13-linux-x86_64) and [Apple Mac OS X on x86-64 systems](https://github.com/torognes/vsearch/blob/master/bin/vsearch-1.0.13-osx-x86_64). These executables include support for input files compressed by zlib and bzip2 (with files usually ending in .gz or .bz2). Download the appropriate executable and make a symbolic link in a folder included in your `$PATH` from `vsearch` to the appropriate binary. You may use the following commands (assuming `~/bin` is in your `$PATH`): @@ -46,8 +46,8 @@ Download the appropriate executable and make a symbolic link in a folder include cd ~ mkdir -p bin cd bin -wget https://github.com/torognes/vsearch/releases/download/v1.0.11/vsearch-1.0.11-linux-x86_64 -ln -s vsearch-1.0.11-linux-x86_64 vsearch +wget https://github.com/torognes/vsearch/releases/download/v1.0.13/vsearch-1.0.13-linux-x86_64 +ln -s vsearch-1.0.13-linux-x86_64 vsearch ``` Substitute `linux` with `osx` in those lines if you're on a Mac. diff --git a/doc/vsearch.1 b/doc/vsearch.1 index 63532a92..b938bed3 100644 --- a/doc/vsearch.1 +++ b/doc/vsearch.1 @@ -1,5 +1,5 @@ .\" ============================================================================ -.TH vsearch 1 "February 6, 2015" "version 1.0.12" "USER COMMANDS" +.TH vsearch 1 "February 17, 2015" "version 1.0.13" "USER COMMANDS" .\" ============================================================================ .SH NAME vsearch \(em chimera detection, clustering, dereplication, masking, pairwise alignment, searching, shuffling and sorting of amplicons from metagenomic projects. @@ -1523,6 +1523,11 @@ clustering, pairwise alignment and searching). .TP .BR v1.0.12\~ "released February 6th, 2015" Temporarily fixes a problem with long headers in FASTA files. +.TP +.BR v1.0.13\~ "released February 6th, 2015" +Fix a memory allocation problem when computing multiple sequence alignments +with the --msaout and --consout options, as well as a memory leak. +Also increased line buffer for reading FASTA files to 4MB. .LP .\" ============================================================================ .\" TODO: diff --git a/doc/vsearch_manual.pdf b/doc/vsearch_manual.pdf index dddde953..8675da52 100644 Binary files a/doc/vsearch_manual.pdf and b/doc/vsearch_manual.pdf differ diff --git a/src/cluster.cc b/src/cluster.cc index 707b5002..59c933c7 100644 --- a/src/cluster.cc +++ b/src/cluster.cc @@ -1110,8 +1110,6 @@ void cluster(char * dbname, int msa_target_count = 0; struct msa_target_s * msa_target_list = (struct msa_target_s *) xmalloc(sizeof(struct msa_target_s) * size_max); - //memset(msa_target_list, 0, sizeof(struct msa_target_s)*size_max); - progress_init("Multiple alignments", seqcount); FILE * fp_msaout = 0; @@ -1168,11 +1166,11 @@ void cluster(char * dbname, } /* free cigar strings for all aligned sequences */ - /* + for(int i=0; i