bug corrected in del.gaps + small change in man page of theta.s

git-svn-id: https://svn.mpl.ird.fr/ape/dev/ape@51 6e262413-ae40-0410-9e79-b911bd7a66b7

diff --git a/Changes b/Changes
index 0ca803e625cf2c19cdcc255bfb30f5a2cc1a3a95..854ae1949d3b84ed1ca5e8ade91a4cf660ef94a2 100644 (file)
--- a/Changes
+++ b/Changes
@@ -19,6 +19,9 @@ BUG FIXES
    o read.nexus() failed to read a file with a single tree with line
      breaks in the Newick string.
 
+   o del.gaps() returned a list of empty sequences when there were no
+     gaps.
+
 
 OTHER CHANGES
 

diff --git a/DESCRIPTION b/DESCRIPTION
index 1b4f9b925daec943abfe31ce6a24190e5c10f112..6debdb3851bff3919098acd2ff7edc2ae2841022 100644 (file)
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ape
 Version: 2.2-2
-Date: 2008-09-17
+Date: 2008-10-02
 Title: Analyses of Phylogenetics and Evolution
 Author: Emmanuel Paradis, Ben Bolker, Julien Claude, Hoa Sien Cuong,
   Richard Desper, Benoit Durand, Julien Dutheil, Olivier Gascuel,

diff --git a/R/DNA.R b/R/DNA.R
index 90e841badb278b4aed61031d6df4f4a50cfe14d2..6704bbe2310fa14b0ff14742d8a394be3f28f5fb 100644 (file)
--- a/R/DNA.R
+++ b/R/DNA.R
@@ -1,4 +1,4 @@
-## DNA.R (2008-08-07)
+## DNA.R (2008-10-02)
 
 ##   Manipulations and Comparisons of DNA Sequences
 
@@ -11,7 +11,7 @@ del.gaps <- function(x)
 {
     deleteGaps <- function(x) {
         i <- which(x == 4)
-        x[-i]
+        if (length(i)) x[-i] else x
     }
 
     if (class(x) != "DNAbin") x <- as.DNAbin(x)

diff --git a/man/theta.s.Rd b/man/theta.s.Rd
index 70115d0d5658ad6c1c55b66307a04d89ee8475e3..bd7a3789340814a584e56d1c030101ed902e2480 100644 (file)
--- a/man/theta.s.Rd
+++ b/man/theta.s.Rd
@@ -40,9 +40,8 @@ theta.s(s, n, variance = FALSE)
 }
 \examples{
 data(woodmouse)
-y <- seg.sites(woodmouse)
-s <- length(y)
-n <- length(woodmouse)
+s <- length(seg.sites(woodmouse))
+n <- nrow(woodmouse)
 theta.s(s, n)
 theta.s(s, n, variance = TRUE)
 }