[med-svn] [r-cran-reshape] 01/03: Imported Upstream version 0.8.5
Charles Plessy
plessy at moszumanska.debian.org
Thu May 1 02:26:47 UTC 2014
This is an automated email from the git hooks/post-receive script.
plessy pushed a commit to branch master
in repository r-cran-reshape.
commit aeffd64276a5f4282ac59a47cca831680286d43f
Author: Charles Plessy <plessy at debian.org>
Date: Thu May 1 11:21:18 2014 +0900
Imported Upstream version 0.8.5
---
DESCRIPTION | 15 +++----
LICENSE | 2 +
MD5 | 80 +++++++++++++++++++++++++++++++++++++
NAMESPACE | 2 +-
NEWS | 10 ++++-
R/melt.r | 64 ++++++++++++++---------------
load.r | 12 ------
man/all-vars-character-rs.rd | 2 +-
man/as-data-frame-cast-df-v7.rd | 2 +-
man/as-data-frame-cast-matrix-59.rd | 2 +-
man/as-matrix-cast-df-bu.rd | 2 +-
man/as-matrix-cast-matrix-2y.rd | 2 +-
man/cast-9g.rd | 4 +-
man/melt-array-e0.rd | 2 +-
man/melt-cast-df-c7.rd | 2 +-
man/melt-cast-matrix-vq.rd | 2 +-
man/melt-data-frame-da.rd | 3 +-
man/melt-default-gi.rd | 2 +-
man/melt-list-8m.rd | 2 +-
man/rescaler-data-frame-4u.rd | 2 +-
man/rescaler-default-bl.rd | 2 +-
man/rescaler-matrix-xv.rd | 2 +-
man/reshape-4u.rd | 11 ++---
man/stamp-fw.rd | 3 +-
man/str-cast-matrix-ez.rd | 2 +-
25 files changed, 158 insertions(+), 76 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 3838c8a..018d126 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,15 +1,16 @@
Package: reshape
Type: Package
Title: Flexibly reshape data.
-Version: 0.8.4
+Version: 0.8.5
Author: Hadley Wickham <h.wickham at gmail.com>
Maintainer: Hadley Wickham <h.wickham at gmail.com>
-Description: Reshape lets you flexibly restructure and aggregate data
- using just two functions: melt and cast.
+Description: Reshape lets you flexibly restructure and aggregate data using just two functions: melt and cast.
URL: http://had.co.nz/reshape
-Depends: R (>= 2.6.1), plyr
-License: MIT
+Depends: R (>= 2.6.1)
+Imports: plyr
+License: MIT + file LICENSE
LazyData: true
-Packaged: 2011-01-28 17:58:33 UTC; hadley
+Packaged: 2014-04-22 14:44:28 UTC; hadley
+NeedsCompilation: no
Repository: CRAN
-Date/Publication: 2011-01-28 20:02:12
+Date/Publication: 2014-04-23 01:52:33
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..02969bc
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,2 @@
+YEAR: 2008-2014
+COPYRIGHT HOLDER: Hadley Wickham
diff --git a/MD5 b/MD5
new file mode 100644
index 0000000..fe6e59e
--- /dev/null
+++ b/MD5
@@ -0,0 +1,80 @@
+4ec210e8ef551307ee7fc870d167fbea *CHANGELOG
+356bca7ad66b699a82543c275f40c7eb *DESCRIPTION
+c7ea166b434ab74f81ce002ea5d87b07 *LICENSE
+16b3d85a626fc9849efb8d03c1e5e0da *NAMESPACE
+1fcdf72bdc9260a644599ae31126f10c *NEWS
+d29587c851a9369450419492f344693e *R/cast.r
+0e207eeffd3dda9124769723c4d3623c *R/condense.r
+01bc93013826a532485da25ebc012a59 *R/dimnames.r
+391c244786968bc7134cf14e2ce0c02b *R/factors.r
+7fd941c6948b0c0f02073219c5e79e8b *R/formula.r
+c77bd1c6ae03b0dc4543ea5fad51f787 *R/margins.r
+6cacfe26ac5424be6775bb1a0681354e *R/melt.r
+238526badf752642575dc9e3fb2c0142 *R/pretty.r
+de4bf763e84fd4a5c72e3d40b9ea4861 *R/recast.r
+17125ccff18e80a01e1c53c1af4cefc5 *R/rescale.r
+d9802ecf746f1015a35400e208f7e821 *R/sparse-by.r
+df49a27b899e8e1171799eab7a252b00 *R/stamp.r
+551d70b3dd600c62acae0388be36012a *R/utils.r
+11d6f343f97ca34edc7cb5ad4a174d05 *data/french_fries.rda
+931bb9da3bce71ebcb25ba53c5dcd1e5 *data/smiths.rda
+6a3f0a74f813cd68547e665f42b8a3cb *data/tips.rda
+61445c2aa8064e816b981712ec2132a2 *inst/CITATION
+4bfb5681ced65b27a57357f2679e1273 *man/add-all-combinations-dk.rd
+195cb4dc67494405bfb9cbe2c2d7f3a0 *man/add-missing-levels-ko.rd
+aa1c0744c841fe83790e0b92bb4dc386 *man/all-vars-character-rs.rd
+9ee513061fbd5ab99be54bef86b27653 *man/as-data-frame-cast-df-v7.rd
+437d18a02164c48c9d9e74dcda49e9d3 *man/as-data-frame-cast-matrix-59.rd
+56c7046934b5b2b020683e9f83a4379d *man/as-matrix-cast-df-bu.rd
+0fa732227d1436d52af618d9825dfcaf *man/as-matrix-cast-matrix-2y.rd
+8f91d8bd5ce300f2e22ff561b882e711 *man/cast-9g.rd
+e76fc8435aeaad96e8d76765be6e58eb *man/cast-matrix-hj.rd
+22e7cd7353a0a1f32423f30153b31382 *man/cast-parse-formula-uw.rd
+fb9ea5ea038be7bf2dd4c82a1e365d5c *man/check-formula-20.rd
+cc2e369a5d6a3b781df4908679f63b9d *man/clean-vars-rc.rd
+f7241f73149eeba7839c9dcce848b5db *man/colsplit-9h.rd
+3db587714dd15c57d0821de927d04df6 *man/combine-factor-9x.rd
+f87fbb8190eada4e0d7de5cfd8268f11 *man/compute-margins-dh.rd
+99dbc8cd8fbef091fbc99e01d686ba14 *man/condense-df-34.rd
+e05e711a82224b66c2a2fc15ba878664 *man/condense-ss.rd
+5898aefea07ea9302e1934c75cd762e0 *man/dim-names-fi.rd
+8a0d398e2425c8742c407c5b754f93a1 *man/expand-grid-df-fl.rd
+4b9cfaf516abeb9fa0b1031cb521e04d *man/expand-kx.rd
+46f10536ede1fd678493947b020ea2d0 *man/french-fries.rd
+9dab49841aea9ea216659f61c749182b *man/funstofun-gl.rd
+8dbdc425561d10412b1ed458aaf2ff3e *man/guess-value-2f.rd
+9a3a34be7d066432d4174caec53853f7 *man/margin-vars-rw.rd
+500bd5b1e6965386c00c37df816b723a *man/melt-24.rd
+2872532c1b996f6ba3fc57c16aa5388f *man/melt-array-e0.rd
+b3aa9c8f3771baa895227107a42fd165 *man/melt-cast-df-c7.rd
+244c66feed95f09fe3ac25976fa07436 *man/melt-cast-matrix-vq.rd
+404bc3e3190b73afc4565ded32ef9643 *man/melt-check-j7.rd
+bf5d7a157be7f697c8fc35fc1c14ba7a *man/melt-data-frame-da.rd
+4d5f9b94bc02526f6cb8e1a55f25d921 *man/melt-default-gi.rd
+8d17c370057c93e34b4ec0a956ea0833 *man/melt-list-8m.rd
+d3b9e3407d3412a79a8edf1f6f79021e *man/merge-all-hc.rd
+887ae04c6b0973c0ba6fc2d0217d91ab *man/merge-recurse-2d.rd
+7c42f3fd65ffa09109e7c771d1b78b2c *man/namerows-6u.rd
+ec8df9a16be02f26032e974d10fc2119 *man/nested-by-92.rd
+5eff7ade5bbdf9b2e46d58a8da82f56a *man/nulldefault-ck.rd
+cb3325ec61a69a3c73f0afdd3e26a7e2 *man/prettyprint-hy.rd
+4b94226b6ef8c369d8e950a3914acb73 *man/rdimnames-11.rd
+cc0cc180f93f8cd60408d4c76bea9959 *man/recast-ar.rd
+51d2e107e60a474bb3bd59644795e13e *man/rename-au.rd
+1d547740c9a12863cef4f3ba5354f57c *man/rescaler-40.rd
+9596bb019342247f155826fce92b9685 *man/rescaler-data-frame-4u.rd
+07485b05390bb5cca32b618e429bdf39 *man/rescaler-default-bl.rd
+c74c91c2b8656da9a0d322e5d1fb4e45 *man/rescaler-matrix-xv.rd
+c961fc641aab549080f96b7667c7bcbd *man/reshape-4u.rd
+62da388400ca3843ba71efdcefdd988e *man/round-any-u2.rd
+2c38649f8d9c2caf40f14155aa6c0904 *man/smiths.rd
+20e95dbf023e0b3178553bb4660bc067 *man/sort-df-aw.rd
+c14371532f92b804930a4e37c09676aa *man/sparse-by.rd
+29eda48d3970206240ad55819b0d5d26 *man/stamp-fw.rd
+0b1e787301fe52793f35390850286a30 *man/str-cast-matrix-ez.rd
+f33a3e8f3f8d43075452b078ff8cba54 *man/strip-dups-7t.rd
+d4788ec858479dea199cf313b1cdb5ad *man/tidystamp-1p.rd
+24f75cf629b4d48b8e16176a04c3673c *man/tips.rd
+f42156b2fae944ec13450036aeaf11e8 *man/uniquedefault-01.rd
+e34704e716ffed7b9999e340ba0c6c1a *man/untable-1x.rd
+c58799b441eed16701f6bc99a84e7f4d *man/updatelist-50.rd
diff --git a/NAMESPACE b/NAMESPACE
index 0bea08b..f672450 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,2 +1,2 @@
exportPattern("^[^\\.]")
-
+import(plyr)
diff --git a/NEWS b/NEWS
index 677a51e..5a3480f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Reshape 0.8.5 ---------------------------------------------------
+
+* fix outstanding R CMD check problems
+
+Reshape 0.8.4 ---------------------------------------------------
+
* fix spelling mistake (indicies -> indices), thanks to Stavros Macrakis
Reshape 0.8.3 (2009-04-27) ---------------------------------------------------
@@ -14,7 +20,7 @@ Reshape 0.8.2 (2008-11-04) --------------------------
Reshape 0.8.1 (2008-05-01) --------------------------
-
+
Melt
* character dimension names are processed by type.convert
@@ -26,7 +32,7 @@ Cast
* missing values in subsetting are now correctly dropped to match behaviour of subset()
* tweaks to cast and recast to make it easier to pass in formulas created elsewhere
* allow user to specify column used for values, guessing if necessary, and giving a warning message if value column does not exist
- * improve error messages when melt or casting parameters incorrectly specified
+ * improve error messages when melt or casting parameters incorrectly specified
General
diff --git a/R/melt.r b/R/melt.r
index 7d07fee..2a2ae3e 100644
--- a/R/melt.r
+++ b/R/melt.r
@@ -25,7 +25,7 @@ melt.default <- function(data, ...) {
# Melt a list
# Melting a list recursively melts each component of the list and joins the results together
-#
+#
# @keyword internal
#X a <- as.list(1:4)
#X melt(a)
@@ -43,10 +43,10 @@ melt.list <- function(data, ..., level=1) {
var <- nulldefault(attr(data, "varname"), paste("L", level, sep=""))
names <- nulldefault(names(data), 1:length(data))
parts <- lapply(data, melt, level=level+1, ...)
-
+
namedparts <- mapply(function(x, name) {
x[[var]] <- name
- x
+ x
}, parts, names, SIMPLIFY=FALSE)
do.call(rbind.fill, namedparts)
}
@@ -76,22 +76,22 @@ melt.list <- function(data, ..., level=1) {
#X names(ChickWeight) <- tolower(names(ChickWeight))
#X melt(ChickWeight, id=2:4)
melt.data.frame <- function(data, id.vars, measure.vars, variable_name = "variable", na.rm = !preserve.na, preserve.na = TRUE, ...) {
- if (!missing(preserve.na))
+ if (!missing(preserve.na))
message("Use of preserve.na is now deprecated, please use na.rm instead")
var <- melt_check(data, id.vars, measure.vars)
-
+
if (length(var$measure) == 0) {
return(data[, var$id, drop=FALSE])
}
-
+
ids <- data[,var$id, drop=FALSE]
df <- do.call("rbind", lapply(var$measure, function(x) {
data.frame(ids, x, data[, x])
}))
names(df) <- c(names(ids), variable_name, "value")
- df[[variable_name]] <- factor(df[[variable_name]], unique(df[[variable_name]]))
+ df[[variable_name]] <- factor(df[[variable_name]], unique(df[[variable_name]]))
if (na.rm) {
df <- df[!is.na(df$value), , drop=FALSE]
@@ -104,7 +104,7 @@ melt.data.frame <- function(data, id.vars, measure.vars, variable_name = "variab
# This function melts a high-dimensional array into a form that you can use \code{\link{cast}} with.
#
# This code is conceptually similar to \code{\link{as.data.frame.table}}
-#
+#
# @arguments array to melt
# @arguments variable names to use in molten data.frame
# @keyword manip
@@ -120,13 +120,13 @@ melt.data.frame <- function(data, id.vars, measure.vars, variable_name = "variab
#X melt(a)
melt.array <- function(data, varnames = names(dimnames(data)), ...) {
values <- as.vector(data)
-
+
dn <- dimnames(data)
if (is.null(dn)) dn <- vector("list", length(dim(data)))
dn_missing <- sapply(dn, is.null)
dn[dn_missing] <- lapply(dim(data), function(x) 1:x)[dn_missing]
-
+
char <- sapply(dn, is.character)
dn[char] <- lapply(dn[char], type.convert)
indices <- do.call(expand.grid, dn)
@@ -141,20 +141,20 @@ melt.matrix <- melt.array
# Melt cast data.frames
# Melt the results of a cast
-#
+#
# This can be useful when performning complex aggregations - melting
# the result of a cast will do it's best to figure out the correct variables
# to use as id and measured.
-#
+#
# @keyword internal
melt.cast_df <- function(data, drop.margins=TRUE, ...) {
- molten <- melt.data.frame(as.data.frame(data), id=attr(data, "idvars"))
-
+ molten <- melt.data.frame(as.data.frame(data), id.vars=attr(data, "idvars"))
+
cols <- rcolnames(data)
rownames(cols) <- make.names(rownames(cols))
molten <- cbind(molten[names(molten) != "variable"], cols[molten$variable, , drop=FALSE])
-
+
if (drop.margins) {
margins <- !complete.cases(molten[,names(molten) != "value", drop=FALSE])
molten <- molten[!margins, ]
@@ -166,9 +166,9 @@ melt.cast_df <- function(data, drop.margins=TRUE, ...) {
# Melt cast matrices
# Melt the results of a cast
-#
+#
# Converts to a data frame and then uses \code{\link{melt.cast_df}}
-#
+#
# @keyword internal
melt.cast_matrix <- function(data, ...) {
melt(as.data.frame(data))
@@ -177,12 +177,12 @@ melt.cast_matrix <- function(data, ...) {
# Melt check.
# Check that input variables to melt are appropriate.
#
-# If id.vars or measure.vars are missing, \code{melt_check} will do its
-# best to impute them.If you only
-# supply one of id.vars and measure.vars, melt will assume the remainder of
-# the variables in the data set belong to the other. If you supply neither,
-# melt will assume character and factor variables are id variables,
-# and all other are measured.
+# If id.vars or measure.vars are missing, \code{melt_check} will do its
+# best to impute them.If you only
+# supply one of id.vars and measure.vars, melt will assume the remainder of
+# the variables in the data set belong to the other. If you supply neither,
+# melt will assume character and factor variables are id variables,
+# and all other are measured.
#
# @keyword internal
# @arguments data frame
@@ -194,32 +194,32 @@ melt_check <- function(data, id.vars, measure.vars) {
varnames <- names(data)
if (!missing(id.vars) && is.numeric(id.vars)) id.vars <- varnames[id.vars]
if (!missing(measure.vars) && is.numeric(measure.vars)) measure.vars <- varnames[measure.vars]
-
+
if (!missing(id.vars)) {
unknown <- setdiff(id.vars, varnames)
if (length(unknown) > 0) {
- stop("id variables not found in data: ", paste(unknown, collapse=", "),
+ stop("id variables not found in data: ", paste(unknown, collapse=", "),
call. = FALSE)
}
- }
-
+ }
+
if (!missing(measure.vars)) {
unknown <- setdiff(measure.vars, varnames)
if (length(unknown) > 0) {
- stop("measure variables not found in data: ", paste(unknown, collapse=", "),
+ stop("measure variables not found in data: ", paste(unknown, collapse=", "),
call. = FALSE)
}
- }
+ }
if (missing(id.vars) && missing(measure.vars)) {
categorical <- sapply(data, function(x) class(x)[1]) %in% c("factor", "ordered", "character")
id.vars <- varnames[categorical]
measure.vars <- varnames[!categorical]
message("Using ", paste(id.vars, collapse=", "), " as id variables")
- }
+ }
if (missing(id.vars)) id.vars <- varnames[!(varnames %in% c(measure.vars))]
if (missing(measure.vars)) measure.vars <- varnames[!(varnames %in% c(id.vars))]
-
- list(id = id.vars, measure = measure.vars)
+
+ list(id = id.vars, measure = measure.vars)
}
diff --git a/load.r b/load.r
deleted file mode 100644
index e1ece2b..0000000
--- a/load.r
+++ /dev/null
@@ -1,12 +0,0 @@
-library(reshape)
-l(plyr)
-
-FILE <- (function() {
- attr(body(sys.function()), "srcfile")
-})()$filename
-PATH <- dirname(FILE)
-
-source.with.err <- function(path) {
- tryCatch(source(path), error = function(x) {print(path); print(x)})
-}
-lapply(dir(file.path(PATH, "R"), full.name=T), source.with.err)
diff --git a/man/all-vars-character-rs.rd b/man/all-vars-character-rs.rd
index 1c755f0..6091420 100644
--- a/man/all-vars-character-rs.rd
+++ b/man/all-vars-character-rs.rd
@@ -6,7 +6,7 @@
\description{
All variables in character string of formula.
}
-\usage{all.vars.character(formula, blank.char = ".")}
+\usage{\method{all.vars}{character}(formula, blank.char = ".")}
\arguments{
\item{formula}{}
\item{blank.char}{}
diff --git a/man/as-data-frame-cast-df-v7.rd b/man/as-data-frame-cast-df-v7.rd
index a503fac..2ee4994 100644
--- a/man/as-data-frame-cast-df-v7.rd
+++ b/man/as-data-frame-cast-df-v7.rd
@@ -6,7 +6,7 @@
\description{
Convert cast data.frame into a matrix
}
-\usage{as.data.frame.cast_df(x, ...)}
+\usage{\method{as.data.frame}{cast_df}(x, ...)}
\arguments{
\item{x}{}
\item{...}{}
diff --git a/man/as-data-frame-cast-matrix-59.rd b/man/as-data-frame-cast-matrix-59.rd
index 49a87af..47d401a 100644
--- a/man/as-data-frame-cast-matrix-59.rd
+++ b/man/as-data-frame-cast-matrix-59.rd
@@ -6,7 +6,7 @@
\description{
Convert cast matrix into a data frame
}
-\usage{as.data.frame.cast_matrix(x, row.names, optional, ...)}
+\usage{\method{as.data.frame}{cast_matrix}(x, row.names, optional, ...)}
\arguments{
\item{x}{}
\item{row.names}{}
diff --git a/man/as-matrix-cast-df-bu.rd b/man/as-matrix-cast-df-bu.rd
index 55bd78b..9204ec2 100644
--- a/man/as-matrix-cast-df-bu.rd
+++ b/man/as-matrix-cast-df-bu.rd
@@ -6,7 +6,7 @@
\description{
Convert cast data.frame into a matrix
}
-\usage{as.matrix.cast_df(x, ...)}
+\usage{\method{as.matrix}{cast_df}(x, ...)}
\arguments{
\item{x}{}
\item{...}{}
diff --git a/man/as-matrix-cast-matrix-2y.rd b/man/as-matrix-cast-matrix-2y.rd
index 2662df8..ae88b9e 100644
--- a/man/as-matrix-cast-matrix-2y.rd
+++ b/man/as-matrix-cast-matrix-2y.rd
@@ -6,7 +6,7 @@
\description{
Convert cast matrix into a matrix
}
-\usage{as.matrix.cast_matrix(x, ...)}
+\usage{\method{as.matrix}{cast_matrix}(x, ...)}
\arguments{
\item{x}{}
\item{...}{}
diff --git a/man/cast-9g.rd b/man/cast-9g.rd
index 163431a..ddf4bd7 100644
--- a/man/cast-9g.rd
+++ b/man/cast-9g.rd
@@ -6,7 +6,9 @@
\description{
Cast a molten data frame into the reshaped or aggregated form you want
}
-\usage{cast(data, formula = ... ~ variable, fun.aggregate=NULL, ..., margins=FALSE, subset=TRUE, df=FALSE, fill=NULL, add.missing=FALSE, value = guess_value(data))}
+\usage{cast(data, formula = ... ~ variable, fun.aggregate=NULL, ...,
+ margins=FALSE, subset=TRUE, df=FALSE, fill=NULL, add.missing=FALSE,
+ value = guess_value(data))}
\arguments{
\item{data}{molten data frame, see \code{\link{melt}}}
\item{formula}{casting formula, see details for specifics}
diff --git a/man/melt-array-e0.rd b/man/melt-array-e0.rd
index e87254f..afab242 100644
--- a/man/melt-array-e0.rd
+++ b/man/melt-array-e0.rd
@@ -8,7 +8,7 @@
\description{
This function melts a high-dimensional array into a form that you can use \code{\link{cast}} with.
}
-\usage{melt.array(data, varnames = names(dimnames(data)), ...)}
+\usage{\method{melt}{array}(data, varnames = names(dimnames(data)), ...)}
\arguments{
\item{data}{array to melt}
\item{varnames}{variable names to use in molten data.frame}
diff --git a/man/melt-cast-df-c7.rd b/man/melt-cast-df-c7.rd
index 084c6fb..9ca88b2 100644
--- a/man/melt-cast-df-c7.rd
+++ b/man/melt-cast-df-c7.rd
@@ -6,7 +6,7 @@
\description{
Melt the results of a cast
}
-\usage{melt.cast_df(data, drop.margins=TRUE, ...)}
+\usage{\method{melt}{cast_df}(data, drop.margins=TRUE, ...)}
\arguments{
\item{data}{}
\item{drop.margins}{}
diff --git a/man/melt-cast-matrix-vq.rd b/man/melt-cast-matrix-vq.rd
index 97cc7e2..16fe8ee 100644
--- a/man/melt-cast-matrix-vq.rd
+++ b/man/melt-cast-matrix-vq.rd
@@ -6,7 +6,7 @@
\description{
Melt the results of a cast
}
-\usage{melt.cast_matrix(data, ...)}
+\usage{\method{melt}{cast_matrix}(data, ...)}
\arguments{
\item{data}{}
\item{...}{other arguments ignored}
diff --git a/man/melt-data-frame-da.rd b/man/melt-data-frame-da.rd
index 52b6e17..0d9864f 100644
--- a/man/melt-data-frame-da.rd
+++ b/man/melt-data-frame-da.rd
@@ -6,7 +6,8 @@
\description{
Melt a data frame into form suitable for easy casting.
}
-\usage{melt.data.frame(data, id.vars, measure.vars, variable_name = "variable", na.rm = !preserve.na, preserve.na = TRUE, ...)}
+\usage{\method{melt}{data.frame}(data, id.vars, measure.vars,
+ variable_name = "variable", na.rm = !preserve.na, preserve.na = TRUE, ...)}
\arguments{
\item{data}{Data set to melt}
\item{id.vars}{Id variables. If blank, will use all non measure.vars variables. Can be integer (variable position) or string (variable name)}
diff --git a/man/melt-default-gi.rd b/man/melt-default-gi.rd
index 8cba5ee..346734b 100644
--- a/man/melt-default-gi.rd
+++ b/man/melt-default-gi.rd
@@ -6,7 +6,7 @@
\description{
For vectors, make a column of a data frame
}
-\usage{melt.default(data, ...)}
+\usage{\method{melt}{default}(data, ...)}
\arguments{
\item{data}{data frame}
\item{...}{arguments}
diff --git a/man/melt-list-8m.rd b/man/melt-list-8m.rd
index 840d00b..4776a75 100644
--- a/man/melt-list-8m.rd
+++ b/man/melt-list-8m.rd
@@ -6,7 +6,7 @@
\description{
Melting a list recursively melts each component of the list and joins the results together
}
-\usage{melt.list(data, ..., level=1)}
+\usage{\method{melt}{list}(data, ..., level=1)}
\arguments{
\item{data}{}
\item{...}{other arguments passed down}
diff --git a/man/rescaler-data-frame-4u.rd b/man/rescaler-data-frame-4u.rd
index 8060b2d..45d9178 100644
--- a/man/rescaler-data-frame-4u.rd
+++ b/man/rescaler-data-frame-4u.rd
@@ -6,7 +6,7 @@
\description{
Rescales data frame by columns
}
-\usage{rescaler.data.frame(x, type="sd", ...)}
+\usage{\method{rescaler}{data.frame}(x, type="sd", ...)}
\arguments{
\item{x}{data.frame to rescale}
\item{type}{type of rescaling to apply}
diff --git a/man/rescaler-default-bl.rd b/man/rescaler-default-bl.rd
index d8fe766..edba7cf 100644
--- a/man/rescaler-default-bl.rd
+++ b/man/rescaler-default-bl.rd
@@ -6,7 +6,7 @@
\description{
See \code{\link{rescaler}} for details
}
-\usage{rescaler.default(x, type="sd", ...)}
+\usage{\method{rescaler}{default}(x, type="sd", ...)}
\arguments{
\item{x}{vector to rescale}
\item{type}{type of rescaling to apply}
diff --git a/man/rescaler-matrix-xv.rd b/man/rescaler-matrix-xv.rd
index e82cdba..6e026cd 100644
--- a/man/rescaler-matrix-xv.rd
+++ b/man/rescaler-matrix-xv.rd
@@ -6,7 +6,7 @@
\description{
Rescales matrix by columns
}
-\usage{rescaler.matrix(x, type="sd", ...)}
+\usage{\method{rescaler}{matrix}(x, type="sd", ...)}
\arguments{
\item{x}{matrix to rescale}
\item{type}{type of rescaling to apply}
diff --git a/man/reshape-4u.rd b/man/reshape-4u.rd
index 9424c2c..e6e52ee 100644
--- a/man/reshape-4u.rd
+++ b/man/reshape-4u.rd
@@ -6,7 +6,8 @@
\description{
Takes data frame and variable list and casts data.
}
-\usage{reshape1(data, vars = list(NULL, NULL), fun.aggregate=NULL, margins, df=FALSE, fill=NA, add.missing=FALSE, ...)}
+\usage{reshape1(data, vars = list(NULL, NULL), fun.aggregate=NULL, margins,
+ df=FALSE, fill=NA, add.missing=FALSE, ...)}
\arguments{
\item{data}{data frame}
\item{vars}{variables to appear in columns}
@@ -49,12 +50,12 @@ reshape1(aqm, list(c("month"), "variable"), mean, c("grand_row","grand_col"))
reshape1(aqm, list(c("variable","day"),"month"), mean,c("variable"))
reshape1(aqm, list(c("variable","day"),"month"), mean,c("variable","grand_row"))
-reshape1(aqm, list(c("month","day"), "variable"), mean, "month")
+reshape1(aqm, list(c("month","day"), "variable"), mean, "month")
# Multiple fnction returns ----------------------------
-reshape1(aqm, list(c("month", "result_variable"), NULL), range)
-reshape1(aqm, list(c("month"),"result_variable") , range)
-reshape1(aqm, list(c("result_variable", "month"), NULL), range)
+reshape1(aqm, list(c("month", "result_variable"), NULL), range)
+reshape1(aqm, list(c("month"),"result_variable") , range)
+reshape1(aqm, list(c("result_variable", "month"), NULL), range)
reshape1(aqm, list(c("month", "result_variable"), "variable"), range, "month")
reshape1(aqm, list(c("month", "result_variable"), "variable"), range, "variable")
diff --git a/man/stamp-fw.rd b/man/stamp-fw.rd
index 115da65..fe5ce23 100644
--- a/man/stamp-fw.rd
+++ b/man/stamp-fw.rd
@@ -6,7 +6,8 @@
\description{
Stamp is like reshape but the "stamping" function is passed the entire data frame, instead of just a few variables.
}
-\usage{stamp(data, formula = . ~ ., fun.aggregate, ..., margins=NULL, subset=TRUE, add.missing=FALSE)}
+\usage{stamp(data, formula = . ~ ., fun.aggregate, ..., margins=NULL,
+ subset=TRUE, add.missing=FALSE)}
\arguments{
\item{data}{data.frame (no molten)}
\item{formula}{formula that describes arrangement of result, columns ~ rows, see \code{\link{reshape}} for more information}
diff --git a/man/str-cast-matrix-ez.rd b/man/str-cast-matrix-ez.rd
index 81c7324..9233b57 100644
--- a/man/str-cast-matrix-ez.rd
+++ b/man/str-cast-matrix-ez.rd
@@ -9,7 +9,7 @@
\description{
Printing methods
}
-\usage{str.cast_matrix(object, ...)}
+\usage{\method{str}{cast_matrix}(object, ...)}
\arguments{
\item{object}{}
\item{...}{}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-reshape.git
More information about the debian-med-commit
mailing list