diff --git a/DESCRIPTION b/DESCRIPTION index bf975c4f1..7e4f1436f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rtables Title: Reporting Tables -Version: 0.1.0.1 +Version: 0.1.0.5 Authors@R: c( person("Adrian", "Waddell", email = "adrian.waddell@roche.com", role = c("aut", "cre")) ) diff --git a/NEWS.md b/NEWS.md index f34649988..7d544020a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,7 @@ -## rtable 0.1.1 +## rtable 0.1.0.5 -* added `sprintf_format` for formatting rcells (thanks to Doug Kelkhoff for the -suggestion) +* added `sprintf_format` for formatting rcells (thanks to Doug Kelkhoff for the suggestion) * added `"(N=xx)"` and `">999.9"` format labels * `rtabulate` has now an argument `col_total` and shows by default the numbers of elements associated with a column diff --git a/R/rtable.R b/R/rtable.R index 64de2b8bb..30c70c122 100644 --- a/R/rtable.R +++ b/R/rtable.R @@ -281,8 +281,8 @@ rheader <- function(..., format = "xx") { #' rrowl("a", c(1,2,3), c(4,5,6), format = "xx") #' #' -#' rrowl("N", tapply(iris$Species, iris$Species, length)) -#' rrowl("N", tapply(iris$Species, iris$Species, length), format = "xx") +#' rrowl("N", table(iris$Species)) +#' rrowl("N", table(iris$Species), format = "xx") #' #' x <- tapply(iris$Sepal.Length, iris$Species, mean, simplify = FALSE) #' diff --git a/R/rtabulate.R b/R/rtabulate.R index 2350e52ad..4e4b2c6c9 100644 --- a/R/rtabulate.R +++ b/R/rtabulate.R @@ -58,7 +58,7 @@ rtabulate_header <- function(col_by, Ntot, N=NULL, format="(N=xx)") { rheader(lvls) } else { if (is.null(N)) { - N <- if (is.no_by(col_by)) Ntot else tapply(col_by, col_by, length) + N <- if (is.no_by(col_by)) Ntot else table(col_by) } rheader( rrowl("", lvls), diff --git a/docs/dev/ISSUE_TEMPLATE.html b/docs/dev/ISSUE_TEMPLATE.html index f2005a029..a12db9a08 100644 --- a/docs/dev/ISSUE_TEMPLATE.html +++ b/docs/dev/ISSUE_TEMPLATE.html @@ -58,7 +58,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/LICENSE-text.html b/docs/dev/LICENSE-text.html index 5a134b966..438b0e4da 100644 --- a/docs/dev/LICENSE-text.html +++ b/docs/dev/LICENSE-text.html @@ -58,7 +58,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/articles/index.html b/docs/dev/articles/index.html index 69682b057..f0f011711 100644 --- a/docs/dev/articles/index.html +++ b/docs/dev/articles/index.html @@ -58,7 +58,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/articles/rtables.html b/docs/dev/articles/rtables.html index ab1542043..1842acddc 100644 --- a/docs/dev/articles/rtables.html +++ b/docs/dev/articles/rtables.html @@ -30,7 +30,7 @@ rtables - 0.1.0.1 + 0.1.0.5 @@ -86,7 +86,7 @@

Introduction to rtables

Adrian Waddell

-

2018-06-09

+

2018-09-21

Source: vignettes/rtables.Rmd diff --git a/docs/dev/articles/rtabulate.html b/docs/dev/articles/rtabulate.html index a4fdfa0c4..da60de6e6 100644 --- a/docs/dev/articles/rtabulate.html +++ b/docs/dev/articles/rtabulate.html @@ -30,7 +30,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/authors.html b/docs/dev/authors.html index d27726b9b..b2d02f596 100644 --- a/docs/dev/authors.html +++ b/docs/dev/authors.html @@ -58,7 +58,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/index.html b/docs/dev/index.html index 6bac0b0b4..63294a7f0 100644 --- a/docs/dev/index.html +++ b/docs/dev/index.html @@ -32,7 +32,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/news/index.html b/docs/dev/news/index.html index 85a009b5a..eb40ec04f 100644 --- a/docs/dev/news/index.html +++ b/docs/dev/news/index.html @@ -58,7 +58,7 @@ rtables - 0.1.0.1 + 0.1.0.5 @@ -116,9 +116,9 @@

Changelog

Source: NEWS.md -
+

-rtable 0.1.1

+rtable 0.1.0.5
diff --git a/docs/dev/reference/as.rtable.table.html b/docs/dev/reference/as.rtable.table.html index 51126ca3b..e8e8000d6 100644 --- a/docs/dev/reference/as.rtable.table.html +++ b/docs/dev/reference/as.rtable.table.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5
diff --git a/docs/dev/reference/as_html.default.html b/docs/dev/reference/as_html.default.html index bbe7bed9e..0129fcdda 100644 --- a/docs/dev/reference/as_html.default.html +++ b/docs/dev/reference/as_html.default.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/as_html.html b/docs/dev/reference/as_html.html index 98d6f955c..8e0f13210 100644 --- a/docs/dev/reference/as_html.html +++ b/docs/dev/reference/as_html.html @@ -63,7 +63,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/compare_rtables.html b/docs/dev/reference/compare_rtables.html index 52db7a4bf..598b071df 100644 --- a/docs/dev/reference/compare_rtables.html +++ b/docs/dev/reference/compare_rtables.html @@ -63,7 +63,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/dim.rheader.html b/docs/dev/reference/dim.rheader.html index 5e1a7b490..4d63c338e 100644 --- a/docs/dev/reference/dim.rheader.html +++ b/docs/dev/reference/dim.rheader.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/dim.rtable.html b/docs/dev/reference/dim.rtable.html index 7f0823d66..167d2044a 100644 --- a/docs/dev/reference/dim.rtable.html +++ b/docs/dev/reference/dim.rtable.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/format_rcell.html b/docs/dev/reference/format_rcell.html index dc8b0d342..d6d78c4b3 100644 --- a/docs/dev/reference/format_rcell.html +++ b/docs/dev/reference/format_rcell.html @@ -64,7 +64,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/header-set.html b/docs/dev/reference/header-set.html index 12eb09b1c..fb9ef8f29 100644 --- a/docs/dev/reference/header-set.html +++ b/docs/dev/reference/header-set.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/header.html b/docs/dev/reference/header.html index de505990f..abdf7dce1 100644 --- a/docs/dev/reference/header.html +++ b/docs/dev/reference/header.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/indented_row.names.html b/docs/dev/reference/indented_row.names.html index 9254e0266..2c74f43b6 100644 --- a/docs/dev/reference/indented_row.names.html +++ b/docs/dev/reference/indented_row.names.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/index.html b/docs/dev/reference/index.html index 763a524d4..d0e507d43 100644 --- a/docs/dev/reference/index.html +++ b/docs/dev/reference/index.html @@ -58,7 +58,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/is.no_by.html b/docs/dev/reference/is.no_by.html index 8c18e8187..1fa75b4bf 100644 --- a/docs/dev/reference/is.no_by.html +++ b/docs/dev/reference/is.no_by.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/list_rcell_format_labels.html b/docs/dev/reference/list_rcell_format_labels.html index 72b0e73c9..c275477e2 100644 --- a/docs/dev/reference/list_rcell_format_labels.html +++ b/docs/dev/reference/list_rcell_format_labels.html @@ -62,7 +62,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/names.rtable.html b/docs/dev/reference/names.rtable.html index b846926c8..0b04f8996 100644 --- a/docs/dev/reference/names.rtable.html +++ b/docs/dev/reference/names.rtable.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/no_by.html b/docs/dev/reference/no_by.html index ef61722f6..f7a904457 100644 --- a/docs/dev/reference/no_by.html +++ b/docs/dev/reference/no_by.html @@ -63,7 +63,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/rbind.rtable.html b/docs/dev/reference/rbind.rtable.html index 412bc602b..1118e4916 100644 --- a/docs/dev/reference/rbind.rtable.html +++ b/docs/dev/reference/rbind.rtable.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/rcell.html b/docs/dev/reference/rcell.html index c6567e0f4..8866fb14d 100644 --- a/docs/dev/reference/rcell.html +++ b/docs/dev/reference/rcell.html @@ -62,7 +62,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/rheader.html b/docs/dev/reference/rheader.html index a5c7ce602..a6364d9cf 100644 --- a/docs/dev/reference/rheader.html +++ b/docs/dev/reference/rheader.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/row.names-set-.rtable.html b/docs/dev/reference/row.names-set-.rtable.html index 8c7b93f07..91cdc4924 100644 --- a/docs/dev/reference/row.names-set-.rtable.html +++ b/docs/dev/reference/row.names-set-.rtable.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/row.names.rheader.html b/docs/dev/reference/row.names.rheader.html index c0a2601df..db7bfeabb 100644 --- a/docs/dev/reference/row.names.rheader.html +++ b/docs/dev/reference/row.names.rheader.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/row.names.rtable.html b/docs/dev/reference/row.names.rtable.html index e17183cc0..2d6aa3f58 100644 --- a/docs/dev/reference/row.names.rtable.html +++ b/docs/dev/reference/row.names.rtable.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/rrow.html b/docs/dev/reference/rrow.html index e9ef4fcc4..b1d3f1e24 100644 --- a/docs/dev/reference/rrow.html +++ b/docs/dev/reference/rrow.html @@ -61,7 +61,7 @@ rtables - 0.1.0.1 + 0.1.0.5 diff --git a/docs/dev/reference/rrowl.html b/docs/dev/reference/rrowl.html index 050695024..104627145 100644 --- a/docs/dev/reference/rrowl.html +++ b/docs/dev/reference/rrowl.html @@ -62,7 +62,7 @@ rtables - 0.1.0.1 + 0.1.0.5 @@ -161,7 +161,7 @@

Examp 

 rrowl("a", c(1,2,3), format = "xx")
#> a        1        2        3
rrowl("a", c(1,2,3), c(4,5,6), format = "xx")
#> a        1        2        3        4        5        6

 
-rrowl("N", tapply(iris$Species, iris$Species, length))
#> N        50        50        50
rrowl("N", tapply(iris$Species, iris$Species, length), format = "xx")
#> N        50        50        50

+rrowl("N", table(iris$Species))
#> N        50        50        50
rrowl("N", table(iris$Species), format = "xx")
#> N        50        50        50

 x <- tapply(iris$Sepal.Length, iris$Species, mean, simplify = FALSE)
 
 rrow(row.name = "row 1", x)
#> row 1        5.006, 5.936, 6.588
rrow("ABC", 2, 3)
#> ABC        2        3

diff --git a/docs/dev/reference/rtable.html b/docs/dev/reference/rtable.html
index 29fbd457a..1246305f4 100644
--- a/docs/dev/reference/rtable.html
+++ b/docs/dev/reference/rtable.html
@@ -62,7 +62,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     

 
diff --git a/docs/dev/reference/rtablel.html b/docs/dev/reference/rtablel.html
index 724b17fc0..f393af095 100644
--- a/docs/dev/reference/rtablel.html
+++ b/docs/dev/reference/rtablel.html
@@ -62,7 +62,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/rtabulate.data.frame.html b/docs/dev/reference/rtabulate.data.frame.html
index d1be5eed3..13408a860 100644
--- a/docs/dev/reference/rtabulate.data.frame.html
+++ b/docs/dev/reference/rtabulate.data.frame.html
@@ -61,7 +61,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/rtabulate.factor.html b/docs/dev/reference/rtabulate.factor.html
index 3d894be9d..c6e13fe67 100644
--- a/docs/dev/reference/rtabulate.factor.html
+++ b/docs/dev/reference/rtabulate.factor.html
@@ -61,7 +61,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/rtabulate.html b/docs/dev/reference/rtabulate.html
index c5bd105a2..90215c589 100644
--- a/docs/dev/reference/rtabulate.html
+++ b/docs/dev/reference/rtabulate.html
@@ -63,7 +63,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/rtabulate.logical.html b/docs/dev/reference/rtabulate.logical.html
index d0e5534e8..41e53236f 100644
--- a/docs/dev/reference/rtabulate.logical.html
+++ b/docs/dev/reference/rtabulate.logical.html
@@ -61,7 +61,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/rtabulate.numeric.html b/docs/dev/reference/rtabulate.numeric.html
index 0c44ccc8e..1e78e63dd 100644
--- a/docs/dev/reference/rtabulate.numeric.html
+++ b/docs/dev/reference/rtabulate.numeric.html
@@ -62,7 +62,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/sprintf_format.html b/docs/dev/reference/sprintf_format.html
index 889f58cb2..c651a7e84 100644
--- a/docs/dev/reference/sprintf_format.html
+++ b/docs/dev/reference/sprintf_format.html
@@ -61,7 +61,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/sub-.rheader.html b/docs/dev/reference/sub-.rheader.html
index 2cd4942c0..0cd10a589 100644
--- a/docs/dev/reference/sub-.rheader.html
+++ b/docs/dev/reference/sub-.rheader.html
@@ -61,7 +61,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/sub-.rtable.html b/docs/dev/reference/sub-.rtable.html
index 92c9c11c3..924abb128 100644
--- a/docs/dev/reference/sub-.rtable.html
+++ b/docs/dev/reference/sub-.rtable.html
@@ -61,7 +61,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/docs/dev/reference/toString.rtable.html b/docs/dev/reference/toString.rtable.html
index 7606abe50..018bb3f87 100644
--- a/docs/dev/reference/toString.rtable.html
+++ b/docs/dev/reference/toString.rtable.html
@@ -61,7 +61,7 @@
       
       
         rtables
-        0.1.0.1
+        0.1.0.5
       
     
 
diff --git a/man/rrowl.Rd b/man/rrowl.Rd
index 6eb14ee8a..18c4bf396 100644
--- a/man/rrowl.Rd
+++ b/man/rrowl.Rd
@@ -30,8 +30,8 @@ rrowl("a", c(1,2,3), format = "xx")
 rrowl("a", c(1,2,3), c(4,5,6), format = "xx")
 
 
-rrowl("N", tapply(iris$Species, iris$Species, length))
-rrowl("N", tapply(iris$Species, iris$Species, length), format = "xx")
+rrowl("N", table(iris$Species))
+rrowl("N", table(iris$Species), format = "xx")
 
 x <- tapply(iris$Sepal.Length, iris$Species, mean, simplify = FALSE)