[Robast-commits] r240 - branches/robast-0.7/pkg/RobAStBase/R branches/robast-0.7/pkg/RobAStBase/man pkg/ROptEst/chm pkg/RandVar/chm pkg/RandVar/inst/doc pkg/RobAStBase pkg/RobAStBase/R pkg/RobAStBase/chm pkg/RobAStBase/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Dec 8 13:45:16 CET 2008
Author: ruckdeschel
Date: 2008-12-08 13:45:16 +0100 (Mon, 08 Dec 2008)
New Revision: 240
Modified:
branches/robast-0.7/pkg/RobAStBase/R/AllPlot.R
branches/robast-0.7/pkg/RobAStBase/R/comparePlot.R
branches/robast-0.7/pkg/RobAStBase/R/ddPlot.R
branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R
branches/robast-0.7/pkg/RobAStBase/man/infoPlot.Rd
branches/robast-0.7/pkg/RobAStBase/man/plot-methods.Rd
pkg/ROptEst/chm/00Index.html
pkg/ROptEst/chm/ROptEst.chm
pkg/RandVar/chm/00Index.html
pkg/RandVar/chm/RandVar.chm
pkg/RandVar/inst/doc/RandVar.pdf
pkg/RobAStBase/DESCRIPTION
pkg/RobAStBase/R/ddPlot.R
pkg/RobAStBase/chm/00Index.html
pkg/RobAStBase/chm/0RobAStBase-package.html
pkg/RobAStBase/chm/RobAStBase.chm
pkg/RobAStBase/man/0RobAStBase-package.Rd
pkg/RobAStBase/man/infoPlot.Rd
pkg/RobAStBase/man/plot-methods.Rd
Log:
trunc:
+patch for Brian Ripley's
Re: [Rd] Warning: missing text for item ... in \describe?
branch 0.7
+some small fixes/enhancements for plotting methods in RobAstBase
+patch for Brian Ripley's
Re: [Rd] Warning: missing text for item ... in \describe?
Modified: branches/robast-0.7/pkg/RobAStBase/R/AllPlot.R
===================================================================
--- branches/robast-0.7/pkg/RobAStBase/R/AllPlot.R 2008-11-29 17:54:47 UTC (rev 239)
+++ branches/robast-0.7/pkg/RobAStBase/R/AllPlot.R 2008-12-08 12:45:16 UTC (rev 240)
@@ -10,8 +10,10 @@
expand.dots = FALSE)$"..."
if(!is.logical(inner)){
- if(!is.list(inner)||length(inner) != 4)
- stop("Argument 'inner' must either be 'logical' or a 'list' vector of length 4")
+ if(!is.list(inner))
+ inner <- as.list(inner)
+ #stop("Argument 'inner' must either be 'logical' or a 'list'")
+ inner <- distr:::.fillList(inner,4)
innerD <- inner[1:3]
innerL <- inner[4]
}else{innerD <- innerL <- inner}
@@ -108,7 +110,7 @@
")",
sep="" )
}else{
- innerT <- rep(sapply(inner, .mpresubs), length.out=dims)
+ innerT <- lapply(inner, .mpresubs)
}
Modified: branches/robast-0.7/pkg/RobAStBase/R/comparePlot.R
===================================================================
--- branches/robast-0.7/pkg/RobAStBase/R/comparePlot.R 2008-11-29 17:54:47 UTC (rev 239)
+++ branches/robast-0.7/pkg/RobAStBase/R/comparePlot.R 2008-12-08 12:45:16 UTC (rev 240)
@@ -146,16 +146,18 @@
")", sep ="")
if(!is.logical(inner)){
- if(!is.character(inner))
- stop("Argument 'inner' must either be 'logical' or a character vector")
- innerT <- rep(inner,length.out=dims)
+# if(!is.character(inner))
+# stop("Argument 'inner' must either be 'logical' or a character vector")
+ if(!is.list(inner))
+ inner <- as.list(inner)
+ innerT <- distr:::.fillList(inner,dims)
innerL <- TRUE
}else{if(any(is.na(inner))||any(!inner)) {
- innerT <- ""; innerL <- FALSE
+ innerT <- as.list(rep("",dims)); innerL <- FALSE
}else{innerL <- TRUE
- innerT <- paste(paste(gettext("Component "), 1:dims,
+ innerT <- as.list(paste(paste(gettext("Component "), 1:dims,
gettext(" of (partial) IC\nfor "),
- name(L2Fam)[1], sep =""), innerParam)
+ name(L2Fam)[1], sep =""), innerParam))
}
}
@@ -198,7 +200,7 @@
}
if(innerL)
- do.call(title, args=c(list(main = innerT[i]), dotsT,
+ do.call(title, args=c(list(main = innerT[[i]]), dotsT,
line = lineT, cex.main = cex.inner, col.main = col.inner))
}
Modified: branches/robast-0.7/pkg/RobAStBase/R/ddPlot.R
===================================================================
--- branches/robast-0.7/pkg/RobAStBase/R/ddPlot.R 2008-11-29 17:54:47 UTC (rev 239)
+++ branches/robast-0.7/pkg/RobAStBase/R/ddPlot.R 2008-12-08 12:45:16 UTC (rev 240)
@@ -5,16 +5,10 @@
transform.x, transform.y = transform.x,
id.n, lab.pts, adj, cex.idn,
col.idn, lty.cutoff, lwd.cutoff, col.cutoff){
- mc <- match.call(expand.dots = FALSE, call = sys.call(sys.parent(1)))
- dots <- mc$"..."
-
-do.call(.ddPlot.MatNtNtCoCo, args = c(list(data=data), dots, list(dist.x = mc$dist.x,
- dist.y = mc$dist.y, cutoff.x = mc$cutoff.x, cutoff.y = mc$cutoff.y,
- cutoff.quantile.x = mc$cutoff.quantile.x, cutoff.quantile.y = mc$cutoff.quantile.y,
- transform.x = mc$transform.x, transform.y = mc$transform.y,
- id.n = mc$id.n, lab.pts = mc$lab.pts, adj = mc$adj, cex.idn = mc$cex.idn,
- col.idn = mc$col.idn, lty.cutoff = mc$lty.cutoff,
- lwd.cutoff = mc$lwd.cutoff, col.cutoff = mc$col.cutoff)))
+ mc <- as.list(match.call(expand.dots = TRUE,
+ call = sys.call(sys.parent(1)))[-1])
+ mc$data <- data
+ do.call(.ddPlot.MatNtNtCoCo, args = mc)
})
setMethod("ddPlot", signature = signature(data = "data.frame"),
Modified: branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R
===================================================================
--- branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R 2008-11-29 17:54:47 UTC (rev 239)
+++ branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R 2008-12-08 12:45:16 UTC (rev 240)
@@ -102,19 +102,21 @@
")", sep ="")
if(!is.logical(inner)){
- if(!is.character(inner))
- stop("Argument 'inner' must either be 'logical' or a character vector")
- innerT <- rep(inner,length.out=1+dims)
+ #if(!is.character(inner))
+ #stop("Argument 'inner' must either be 'logical' or a 'list'")
+ if(!is.list(inner))
+ inner <- as.list(inner)
+ innerT <- distr:::.fillList(inner,1+dims)
innerL <- TRUE
}else{if(any(is.na(inner))||any(!inner)) {
- innerT <- rep("",1+dims); innerL <- FALSE
+ innerT <- as.list(rep("",1+dims)); innerL <- FALSE
}else{innerL <- TRUE
- innerT <- paste(c( paste(gettext("Absolute information of (partial) IC for"),
+ innerT <- as.list(paste(c( paste(gettext("Absolute information of (partial) IC for"),
name(L2Fam)[1], sep =""),
paste(gettext("Relative information of \ncomponent "),
1:dims,
gettext("of (partial) IC\nfor "),
- name(L2Fam)[1], sep ="")), innerParam)
+ name(L2Fam)[1], sep ="")), innerParam))
}
}
@@ -176,7 +178,7 @@
dotsT["col.main"] <- NULL
dotsT["line"] <- NULL
if(innerL)
- do.call(title, args=c(list(main = innerT[1]), dotsT,
+ do.call(title, args=c(list(main = innerT[[1]]), dotsT,
line = lineT, cex.main = cex.inner, col.main = col.inner))
if(dims > 1){
@@ -210,7 +212,7 @@
col = c(colI, col), lwd=c(lwdI, lwd),
cex = 0.6)
if(innerL)
- do.call(title, args=c(list(main = innerT[1+i]), dotsT,
+ do.call(title, args=c(list(main = innerT[[1+i]]), dotsT,
line = lineT, cex.main = cex.inner, col.main = col.inner))
}
}
Modified: branches/robast-0.7/pkg/RobAStBase/man/infoPlot.Rd
===================================================================
--- branches/robast-0.7/pkg/RobAStBase/man/infoPlot.Rd 2008-11-29 17:54:47 UTC (rev 239)
+++ branches/robast-0.7/pkg/RobAStBase/man/infoPlot.Rd 2008-12-08 12:45:16 UTC (rev 240)
@@ -17,7 +17,7 @@
mfColRow = TRUE)
}
\arguments{
- \item{object}{ object of class \code{"InfluenceCurve"} }
+ \item{object}{object of class \code{"InfluenceCurve"} }
\item{withSweave}{logical: if \code{TRUE} (for working with \command{Sweave})
no extra device is opened}
\item{main}{logical: is a main title to be used? or \cr
@@ -36,7 +36,7 @@
\code{\link[stats]{par}}}
\item{col.inner}{character or integer code; color for the inner title}
\item{mfColRow}{shall default partition in panels be used --- defaults to \code{TRUE}}
- \item{\dots} {further parameters for \code{plot}}
+ \item{\dots}{further parameters for \code{plot}}
}
\details{
Absolute information is defined as the square of the length
Modified: branches/robast-0.7/pkg/RobAStBase/man/plot-methods.Rd
===================================================================
--- branches/robast-0.7/pkg/RobAStBase/man/plot-methods.Rd 2008-11-29 17:54:47 UTC (rev 239)
+++ branches/robast-0.7/pkg/RobAStBase/man/plot-methods.Rd 2008-12-08 12:45:16 UTC (rev 240)
@@ -31,7 +31,7 @@
\code{\link[stats]{par}}}
\item{col.inner}{character or integer code; color for the inner title}
\item{mfColRow}{shall default partition in panels be used --- defaults to \code{TRUE}}
- \item{\dots} {further parameters for \code{plot}}
+ \item{\dots}{further parameters for \code{plot}}
}
\details{
Any parameters of \code{plot.default} may be passed on to this particular
Modified: pkg/ROptEst/chm/00Index.html
===================================================================
--- pkg/ROptEst/chm/00Index.html 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/ROptEst/chm/00Index.html 2008-12-08 12:45:16 UTC (rev 240)
@@ -10,7 +10,7 @@
<param name="keyword" value=".. contents">
</object>
-<h2>Help pages for package ‘ROptEst’ version 0.6.1</h2>
+<h2>Help pages for package ‘ROptEst’ version 0.6.2</h2>
<p align="center">
<a href="# "> </a>
Modified: pkg/ROptEst/chm/ROptEst.chm
===================================================================
(Binary files differ)
Modified: pkg/RandVar/chm/00Index.html
===================================================================
--- pkg/RandVar/chm/00Index.html 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RandVar/chm/00Index.html 2008-12-08 12:45:16 UTC (rev 240)
@@ -10,7 +10,7 @@
<param name="keyword" value=".. contents">
</object>
-<h2>Help pages for package ‘RandVar’ version 0.6.5</h2>
+<h2>Help pages for package ‘RandVar’ version 0.6.6</h2>
<p align="center">
<a href="#"></a>
Modified: pkg/RandVar/chm/RandVar.chm
===================================================================
(Binary files differ)
Modified: pkg/RandVar/inst/doc/RandVar.pdf
===================================================================
(Binary files differ)
Modified: pkg/RobAStBase/DESCRIPTION
===================================================================
--- pkg/RobAStBase/DESCRIPTION 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RobAStBase/DESCRIPTION 2008-12-08 12:45:16 UTC (rev 240)
@@ -1,6 +1,6 @@
Package: RobAStBase
-Version: 0.1.3
-Date: 2008-11-27
+Version: 0.1.4
+Date: 2008-12-08
Title: Robust Asymptotic Statistics
Description: Base S4-classes and functions for robust asymptotic
statistics.
Modified: pkg/RobAStBase/R/ddPlot.R
===================================================================
--- pkg/RobAStBase/R/ddPlot.R 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RobAStBase/R/ddPlot.R 2008-12-08 12:45:16 UTC (rev 240)
@@ -5,16 +5,10 @@
transform.x, transform.y = transform.x,
id.n, lab.pts, adj, cex.idn,
col.idn, lty.cutoff, lwd.cutoff, col.cutoff){
- mc <- match.call(expand.dots = FALSE, call = sys.call(sys.parent(1)))
- dots <- mc$"..."
-
-do.call(.ddPlot.MatNtNtCoCo, args = c(list(data=data), dots, list(dist.x = mc$dist.x,
- dist.y = mc$dist.y, cutoff.x = mc$cutoff.x, cutoff.y = mc$cutoff.y,
- cutoff.quantile.x = mc$cutoff.quantile.x, cutoff.quantile.y = mc$cutoff.quantile.y,
- transform.x = mc$transform.x, transform.y = mc$transform.y,
- id.n = mc$id.n, lab.pts = mc$lab.pts, adj = mc$adj, cex.idn = mc$cex.idn,
- col.idn = mc$col.idn, lty.cutoff = mc$lty.cutoff,
- lwd.cutoff = mc$lwd.cutoff, col.cutoff = mc$col.cutoff)))
+ mc <- as.list(match.call(expand.dots = TRUE,
+ call = sys.call(sys.parent(1)))[-1])
+ mc$data <- data
+ do.call(.ddPlot.MatNtNtCoCo, args = mc)
})
setMethod("ddPlot", signature = signature(data = "data.frame"),
Modified: pkg/RobAStBase/chm/00Index.html
===================================================================
--- pkg/RobAStBase/chm/00Index.html 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RobAStBase/chm/00Index.html 2008-12-08 12:45:16 UTC (rev 240)
@@ -10,7 +10,7 @@
<param name="keyword" value=".. contents">
</object>
-<h2>Help pages for package ‘RobAStBase’ version 0.1.2</h2>
+<h2>Help pages for package ‘RobAStBase’ version 0.1.3</h2>
<p align="center">
<a href="# "> </a>
Modified: pkg/RobAStBase/chm/0RobAStBase-package.html
===================================================================
--- pkg/RobAStBase/chm/0RobAStBase-package.html 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RobAStBase/chm/0RobAStBase-package.html 2008-12-08 12:45:16 UTC (rev 240)
@@ -29,10 +29,10 @@
<td align="left">Package: </td> <td align="left"> RobAStBase</td>
</tr>
<tr>
- <td align="left"> Version: </td> <td align="left"> 0.1.2</td>
+ <td align="left"> Version: </td> <td align="left"> 0.1.3 </td>
</tr>
<tr>
- <td align="left"> Date: </td> <td align="left"> 2008-11-24</td>
+ <td align="left"> Date: </td> <td align="left"> 2008-11-27 </td>
</tr>
<tr>
<td align="left"> Depends: </td> <td align="left"> R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0),distrMod(>= 2.0), RandVar(>= 0.6.3)</td>
@@ -101,6 +101,6 @@
</script>
-<hr><div align="center">[Package <em>RobAStBase</em> version 0.1.2 <a href="00Index.html">Index]</a></div>
+<hr><div align="center">[Package <em>RobAStBase</em> version 0.1.3 <a href="00Index.html">Index]</a></div>
</body></html>
Modified: pkg/RobAStBase/chm/RobAStBase.chm
===================================================================
(Binary files differ)
Modified: pkg/RobAStBase/man/0RobAStBase-package.Rd
===================================================================
--- pkg/RobAStBase/man/0RobAStBase-package.Rd 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RobAStBase/man/0RobAStBase-package.Rd 2008-12-08 12:45:16 UTC (rev 240)
@@ -11,9 +11,10 @@
\details{
\tabular{ll}{
Package: \tab RobAStBase\cr
-Version: \tab 0.1.3 \cr
-Date: \tab 2008-11-27 \cr
-Depends: \tab R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0),distrMod(>= 2.0), RandVar(>= 0.6.3)\cr
+Version: \tab 0.1.4\cr
+Date: \tab 2008-12-08\cr
+Depends: \tab R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0),
+distrMod(>= 2.0), RandVar(>= 0.6.3)\cr
LazyLoad: \tab yes\cr
License: \tab LGPL-3\cr
URL: \tab http://robast.r-forge.r-project.org/\cr
Modified: pkg/RobAStBase/man/infoPlot.Rd
===================================================================
--- pkg/RobAStBase/man/infoPlot.Rd 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RobAStBase/man/infoPlot.Rd 2008-12-08 12:45:16 UTC (rev 240)
@@ -17,7 +17,7 @@
mfColRow = TRUE)
}
\arguments{
- \item{object}{ object of class \code{"InfluenceCurve"} }
+ \item{object}{object of class \code{"InfluenceCurve"} }
\item{withSweave}{logical: if \code{TRUE} (for working with \command{Sweave})
no extra device is opened}
\item{main}{logical: is a main title to be used? or \cr
@@ -36,7 +36,7 @@
\code{\link[stats]{par}}}
\item{col.inner}{character or integer code; color for the inner title}
\item{mfColRow}{shall default partition in panels be used --- defaults to \code{TRUE}}
- \item{\dots} {further parameters for \code{plot}}
+ \item{\dots}{further parameters for \code{plot}}
}
\details{
Absolute information is defined as the square of the length
Modified: pkg/RobAStBase/man/plot-methods.Rd
===================================================================
--- pkg/RobAStBase/man/plot-methods.Rd 2008-11-29 17:54:47 UTC (rev 239)
+++ pkg/RobAStBase/man/plot-methods.Rd 2008-12-08 12:45:16 UTC (rev 240)
@@ -31,7 +31,7 @@
\code{\link[stats]{par}}}
\item{col.inner}{character or integer code; color for the inner title}
\item{mfColRow}{shall default partition in panels be used --- defaults to \code{TRUE}}
- \item{\dots} {further parameters for \code{plot}}
+ \item{\dots}{further parameters for \code{plot}}
}
\details{
Any parameters of \code{plot.default} may be passed on to this particular
More information about the Robast-commits
mailing list