Commit ff0ad8f4 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 0.2.3

parent 00b45602
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@
All notable changes to `mptp` will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.2.3] - 2017-07-25
### Fixed
 - Replaced hsearch which was causing problems on APPLE with custom hashtable
 - Corrected file name in error messages when failing to open files

## [0.2.2] - 2017-01-31
### Fixed
 - Regular expressions now allow scientific notation when parsing branch lengths
+40 −27
Original line number Diff line number Diff line
# Species Delimitation
# Species delimitation using the multi-rate Poisson Tree Processes (mPTP)

[![License](https://img.shields.io/badge/license-AGPL-blue.svg)](http://www.gnu.org/licenses/agpl-3.0.en.html)
[![Build Status](https://travis-ci.org/Pas-Kapli/mptp.svg?branch=master)](https://travis-ci.com/Pas-Kapli/mptp)
[![Build Status](https://travis-ci.org/Pas-Kapli/mptp.svg?branch=master)](https://travis-ci.org/Pas-Kapli/mptp)

## Introduction

@@ -59,7 +59,7 @@ On a Debian-based Linux system, the four packages can be installed
using the command

```bash
sudo apt-get install libgsl0-dev flex bison autotools-dev
sudo apt-get install libgsl0-dev flex bison autotools-dev autoconf
```

Optionally, you can install the bash auto-completion for mptp. To do that,
@@ -121,6 +121,13 @@ and `doc`. We recommend making a copy or a symbolic link to the mptp binary
to the mptp man page `man/mptp.1` in a folder included in your `$MANPATH`. The
PDF version of the manual is available in `doc/mptp_manual.pdf`.

## Implementation details and method description

Please see the manuscript for details:

Kapli T, Lutteropp S, Zhang J, Kobert K, Pavlidis P, Stamatakis A, Flouri T. (2016) Multi-rate Poisson tree processes for single-locus species delimitation under maximum likelihood and Markov chain Monte Carlo. Bioinformatics 33(11):1630-1638. doi:[10.1093/bioinformatics/btx025](https://doi.org/10.1093/bioinformatics/btx025)




## Command-line options
@@ -193,30 +200,30 @@ The code is currently licensed under the [GNU Affero General Public License vers

## Code

    File            | Description
--------------------|----------------
**arch.c**          | Architecture specific code (Mac/Linux).
**auto.c**          | Code for auto-detecting minimum branch length.
**aic.c**           | Code for Bayesian Single- and multi-rate PTP.
**mptp.c**          | Main file handling command-line parameters and executing corresponding parts.
**mptp.h**          | MPTP Header file.
**dp.c**            | Single- and multi-rate DP heuristics for solving the PTP problem.
**fasta.c**         | Code for reading FASTA files.
**lex_rtree.l**     | Lexical analyzer parsing newick rooted trees.
**lex_utree.l**     | Lexical analyzer parsing newick unrooted trees.
**likelihood.c**    | Likelihood rated functions.
**Makefile.am**     | Automake file for generating Makefile.in.
**maps.c**          | Character mapping arrays for converting sequences to the internal representation.
**multirun.c**      | Functions to execute multiple MCMC runs and compute ASD of support values.
**output.c**        | Output related files.
**parse_rtree.y**   | Functions for parsing rooted trees in newick format.
**parse_utree.y**   | Functions for parsing unrooted trees in newick format.
**random.c**        | Functions for creating a random delimitation.
**rtree.c**         | Rooted tree manipulation functions.
**svg.c**           | SVG visualization of delimited tree.
**svg_landscape.c** | SVG visualization of likelihood landscape.
**util.c**          | Various common utility functions.
**utree.c**         | Unrooted tree manipulation functions.
|     File            | Description                                                                       |
| --------------------| --------------------------------------------------------------------------------- |
| **arch.c**          | Architecture specific code (Mac/Linux).                                           |
| **auto.c**          | Code for auto-detecting minimum branch length.                                    |
| **aic.c**           | Code for Bayesian Single- and multi-rate PTP.                                     |
| **mptp.c**          | Main file handling command-line parameters and executing corresponding parts.     |
| **mptp.h**          | MPTP Header file.                                                                 |
| **dp.c**            | Single- and multi-rate DP heuristics for solving the PTP problem.                 |
| **fasta.c**         | Code for reading FASTA files.                                                     |
| **lex_rtree.l**     | Lexical analyzer parsing newick rooted trees.                                     |
| **lex_utree.l**     | Lexical analyzer parsing newick unrooted trees.                                   |
| **likelihood.c**    | Likelihood rated functions.                                                       |
| **Makefile.am**     | Automake file for generating Makefile.in.                                         |
| **maps.c**          | Character mapping arrays for converting sequences to the internal representation. |
| **multirun.c**      | Functions to execute multiple MCMC runs and compute ASD of support values.        |
| **output.c**        | Output related files.                                                             |
| **parse_rtree.y**   | Functions for parsing rooted trees in newick format.                              |
| **parse_utree.y**   | Functions for parsing unrooted trees in newick format.                            |
| **random.c**        | Functions for creating a random delimitation.                                     |
| **rtree.c**         | Rooted tree manipulation functions.                                               |
| **svg.c**           | SVG visualization of delimited tree.                                              |
| **svg_landscape.c** | SVG visualization of likelihood landscape.                                        |
| **util.c**          | Various common utility functions.                                                 |
| **utree.c**         | Unrooted tree manipulation functions.                                             |

## The team

@@ -228,6 +235,12 @@ The code is currently licensed under the [GNU Affero General Public License vers
* Alexandros Stamatakis
* Tomáš Flouri

## Citing mPTP

Please cite the following publication if you use mPTP:

Kapli T, Lutteropp S, Zhang J, Kobert K, Pavlidis P, Stamatakis A, Flouri T. (2016) Multi-rate Poisson tree processes for single-locus species delimitation under maximum likelihood and Markov chain Monte Carlo. Bioinformatics 33(11):1630-1638. doi:[10.1093/bioinformatics/btx025](https://doi.org/10.1093/bioinformatics/btx025)

# References

* Zhang J., Kapli P., Pavlidis P., Stamatakis A. (2013)
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.63])
AC_INIT([mptp], [0.2.2], [Tomas.Flouri@h-its.org])
AC_INIT([mptp], [0.2.3], [Tomas.Flouri@h-its.org])
AM_INIT_AUTOMAKE([subdir-objects])
AC_LANG([C])
AC_CONFIG_SRCDIR([src/mptp.c])
+3 −0
Original line number Diff line number Diff line
@@ -351,5 +351,8 @@ Fixed regular expressions to allow scientific notation for branch lengths when
parsing trees.  Improved the accuracy of ASV score by also taking into account
tips forming coalescent roots.  Fixed memory leaks that occur when parsing
incorrectly formatted trees.
.TP
.BR v0.2.3\~ "released July 25th, 2017"
Replaced hsearch() with custom hashtable. Fixed minor output error messages.
.RE
.LP
+3 −1
Original line number Diff line number Diff line
@@ -26,4 +26,6 @@ rtree.c \
svg.c \
svg_landscape.c \
util.c \
utree.c
utree.c \
hash.c \
list.c
Loading