[med-svn] [libbpp-popgen] 01/03: New upstream version 2.3.2

[Julien Dutheil]

This is an automated email from the git hooks/post-receive script.

jdutheil-guest pushed a commit to branch master
in repository libbpp-popgen.

commit f058b0c674135761953ba06f30b44e7191c798ff
Author: Julien Y. Dutheil <dutheil at evolbio.mpg.de>
Date:   Tue Feb 6 13:44:18 2018 +0100

    New upstream version 2.3.2
---
 ChangeLog                             | 3 +++
 src/Bpp/PopGen/SequenceStatistics.cpp | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbf640e..b910c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+24/11/17 Julien Dutheil
+* Fixed error in tajima83.
+
 10/05/17 -*- Version 2.3.0 -*-
 
 17/12/16 Julien Dutheil
diff --git a/src/Bpp/PopGen/SequenceStatistics.cpp b/src/Bpp/PopGen/SequenceStatistics.cpp
index 5aa3b19..20271e9 100644
--- a/src/Bpp/PopGen/SequenceStatistics.cpp
+++ b/src/Bpp/PopGen/SequenceStatistics.cpp
@@ -323,9 +323,9 @@ double SequenceStatistics::tajima83(const PolymorphismSequenceContainer& psc, bo
   while (si->hasMoreSites())
   {
     site = si->nextSite();
+    l++;
     if (!SiteTools::isConstant(*site, ignoreUnknown))
     {
-      l++;
       double value = 0.;
       map<int, size_t> count;
       SymbolListTools::getCounts(*site, count);
@@ -731,7 +731,7 @@ unsigned int SequenceStatistics::numberOfSynonymousSubstitutions(const Polymorph
   while (si->hasMoreSites())
   {
     site = si->nextSite();
-    st  += CodonSiteTools::numberOfSubsitutions(*site, gc, freqmin);
+    st  += CodonSiteTools::numberOfSubstitutions(*site, gc, freqmin);
     sns += CodonSiteTools::numberOfNonSynonymousSubstitutions(*site, gc, freqmin);
   }
   return static_cast<unsigned int>(st - sns);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-popgen.git