This is an automated email from the git hooks/post-receive script. kloetzl-guest pushed a commit to branch master in repository andi.
commit 8ce73df99e9a2536cf2dc1889455ba82389aa6b8 Author: Fabian Klötzl <[email protected]> Date: Fri Feb 5 19:08:18 2016 +0000 Imported Upstream version 0.9.6.1 --- configure.ac | 2 +- src/io.c | 2 +- test/test_join.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 718131f..1d55963 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([andi], [0.9.6]) +AC_INIT([andi], [0.9.6.1]) AM_INIT_AUTOMAKE([-Wall foreign ]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/io.c b/src/io.c index 9175f89..9bc7664 100644 --- a/src/io.c +++ b/src/io.c @@ -145,7 +145,7 @@ void print_distances(const struct model *D, const seq_t *sequences, size_t n, datum = model_average(&D(i, j), &D(j, i)); } - double dist = DD(i, j) = estimate(&datum); + double dist = DD(i, j) = i == j ? 0.0 : estimate(&datum); double coverage = model_coverage(&datum); if (isnan(dist) && warnings) { diff --git a/test/test_join.sh b/test/test_join.sh index b47a11b..58eb952 100755 --- a/test/test_join.sh +++ b/test/test_join.sh @@ -59,7 +59,7 @@ tail -qn 2 p1.fasta p2.fasta p3.fasta > S1.fasta rm p1.fasta p2.fasta p3.fasta; -RES=$(./src/andi -mRAW t 1 -j S0.fasta S1.fasta | +RES=$(./src/andi -mRAW -t 1 -j S0.fasta S1.fasta | tail -n 1 | awk '{print ($2 - 0.1)}' | awk 'function abs(x){return ((x < 0.0) ? -x : x)} {print abs($1-$2) < 0.01}' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/andi.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
