fix bug in seg.sites + improved Damien's man pages

[ape.git] / R / DNA.R

diff --git a/R/DNA.R b/R/DNA.R
index e8e2260486503f666486be1791a084a5961f3e3e..2482511079bbb47748730709306285784997abbc 100644 (file)
--- a/R/DNA.R
+++ b/R/DNA.R
@@ -1,4 +1,4 @@
-## DNA.R (2008-03-10)
+## DNA.R (2008-04-24)
 
 ##   Manipulations and Comparisons of DNA Sequences
 
@@ -215,14 +215,11 @@ base.freq <- function(x)
     BF
 }
 
-GC.content <- function(x)
-{
-    BF <- base.freq(x)
-    sum(BF[2:3])
-}
+GC.content <- function(x) sum(base.freq(x)[2:3])
 
 seg.sites <- function(x)
 {
+    if (is.list(x)) x <- as.matrix(x)
     n <- dim(x)
     s <- n[2]
     n <- n[1]