[Distr-commits] r546 - branches/distr-2.2/pkg/distrMod/chm pkg/SweaveListingUtils/chm pkg/distrMod/R pkg/distrMod/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Aug 25 15:03:33 CEST 2009
Author: ruckdeschel
Date: 2009-08-25 15:03:33 +0200 (Tue, 25 Aug 2009)
New Revision: 546
Modified:
branches/distr-2.2/pkg/distrMod/chm/EvenSymmetric.html
branches/distr-2.2/pkg/distrMod/chm/OddSymmetric.html
branches/distr-2.2/pkg/distrMod/chm/distrMod.chm
pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp
pkg/distrMod/R/Estimator.R
pkg/distrMod/R/MCEstimator.R
pkg/distrMod/R/MDEstimator.R
pkg/distrMod/R/MLEstimator.R
pkg/distrMod/man/Estimator.Rd
pkg/distrMod/man/MCEstimator.Rd
pkg/distrMod/man/MDEstimator.Rd
pkg/distrMod/man/MLEstimator.Rd
Log:
+distrMod: Estimator(), MCEstimator(), MLEstimator(), MDEstimator() gain argument na.rm; if true estimators are evaluated at complete.cases(x)
+some html, chm files updated
Modified: branches/distr-2.2/pkg/distrMod/chm/EvenSymmetric.html
===================================================================
--- branches/distr-2.2/pkg/distrMod/chm/EvenSymmetric.html 2009-08-21 13:05:02 UTC (rev 545)
+++ branches/distr-2.2/pkg/distrMod/chm/EvenSymmetric.html 2009-08-25 13:03:33 UTC (rev 546)
@@ -1,10 +1,10 @@
<html><head><title>Generating function for EvenSymmetric-class</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="Rchm.css">
-</head>
-<body>
+</head><body>
-<table width="100%"><tr><td>EvenSymmetric(distrMod)</td><td align="right">R Documentation</td></tr></table><object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<table width="100%"><tr><td>EvenSymmetric(distrMod)</td><td align="right">R Documentation</td></tr></table>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="R: EvenSymmetric">
<param name="keyword" value=" Generating function for EvenSymmetric-class">
</object>
@@ -15,9 +15,7 @@
<h3>Description</h3>
-<p>
-Generates an object of class <code>"EvenSymmetric"</code>.
-</p>
+<p>Generates an object of class <code>"EvenSymmetric"</code>.</p>
<h3>Usage</h3>
@@ -30,26 +28,23 @@
<table summary="R argblock">
<tr valign="top"><td><code>SymmCenter</code></td>
<td>
-numeric: center of symmetry </td></tr>
+ numeric: center of symmetry </td></tr>
</table>
+
<h3>Value</h3>
-<p>
-Object of class <code>"EvenSymmetric"</code></p>
+<p>Object of class <code>"EvenSymmetric"</code></p>
+
<h3>Author(s)</h3>
-<p>
-Matthias Kohl <a href="mailto:Matthias.Kohl at stamats.de">Matthias.Kohl at stamats.de</a>
-</p>
+<p>Matthias Kohl <a href="mailto:Matthias.Kohl at stamats.de">Matthias.Kohl at stamats.de</a></p>
<h3>See Also</h3>
-<p>
-<code><a href="EvenSymmetric-class.html">EvenSymmetric-class</a></code>, <code><a onclick="findlink('distr', 'DistributionSymmetry-class.html')" style="text-decoration: underline; color: blue; cursor: hand">DistributionSymmetry-class</a></code>
-</p>
+<p><code></code>, <code></code></p>
<h3>Examples</h3>
@@ -73,7 +68,5 @@
}
</script>
-
<hr><div align="center">[Package <em>distrMod</em> version 2.2 <a href="00Index.html">Index</a>]</div>
-
</body></html>
Modified: branches/distr-2.2/pkg/distrMod/chm/OddSymmetric.html
===================================================================
--- branches/distr-2.2/pkg/distrMod/chm/OddSymmetric.html 2009-08-21 13:05:02 UTC (rev 545)
+++ branches/distr-2.2/pkg/distrMod/chm/OddSymmetric.html 2009-08-25 13:03:33 UTC (rev 546)
@@ -1,10 +1,10 @@
<html><head><title>Generating function for OddSymmetric-class</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="Rchm.css">
-</head>
-<body>
+</head><body>
-<table width="100%"><tr><td>OddSymmetric(distrMod)</td><td align="right">R Documentation</td></tr></table><object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<table width="100%"><tr><td>OddSymmetric(distrMod)</td><td align="right">R Documentation</td></tr></table>
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
<param name="keyword" value="R: OddSymmetric">
<param name="keyword" value=" Generating function for OddSymmetric-class">
</object>
@@ -15,9 +15,7 @@
<h3>Description</h3>
-<p>
-Generates an object of class <code>"OddSymmetric"</code>.
-</p>
+<p>Generates an object of class <code>"OddSymmetric"</code>.</p>
<h3>Usage</h3>
@@ -30,26 +28,23 @@
<table summary="R argblock">
<tr valign="top"><td><code>SymmCenter</code></td>
<td>
-numeric: center of symmetry </td></tr>
+ numeric: center of symmetry </td></tr>
</table>
+
<h3>Value</h3>
-<p>
-Object of class <code>"OddSymmetric"</code></p>
+<p>Object of class <code>"OddSymmetric"</code></p>
+
<h3>Author(s)</h3>
-<p>
-Matthias Kohl <a href="mailto:Matthias.Kohl at stamats.de">Matthias.Kohl at stamats.de</a>
-</p>
+<p>Matthias Kohl <a href="mailto:Matthias.Kohl at stamats.de">Matthias.Kohl at stamats.de</a></p>
<h3>See Also</h3>
-<p>
-<code><a href="OddSymmetric-class.html">OddSymmetric-class</a></code>, <code><a onclick="findlink('distr', 'DistributionSymmetry-class.html')" style="text-decoration: underline; color: blue; cursor: hand">DistributionSymmetry-class</a></code>
-</p>
+<p><code></code>, <code></code></p>
<h3>Examples</h3>
@@ -73,7 +68,5 @@
}
</script>
-
<hr><div align="center">[Package <em>distrMod</em> version 2.2 <a href="00Index.html">Index</a>]</div>
-
</body></html>
Modified: branches/distr-2.2/pkg/distrMod/chm/distrMod.chm
===================================================================
(Binary files differ)
Modified: pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)
Modified: pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp
===================================================================
--- pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/SweaveListingUtils/chm/SweaveListingUtils.hhp 2009-08-25 13:03:33 UTC (rev 546)
@@ -12,19 +12,6 @@
[FILES]
00Index.html
-0SweaveListingUtils-package.html
-SweaveListingMASK.html
-SweaveListingOptions.html
-SweaveListingPreparations.html
-changeKeywordstyles.html
-copySourceFromRForge.html
+
isBaseOrRecommended.html
-library.html
-lstinputSourceFromRForge.html
-lstset.html
-lstsetLanguage.html
-readPackageVersion.html
-readSourceFromRForge.html
setBaseOrRecommended.html
-setToBeDefinedPkgs.html
-taglist.html
Modified: pkg/distrMod/R/Estimator.R
===================================================================
--- pkg/distrMod/R/Estimator.R 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/R/Estimator.R 2009-08-25 13:03:33 UTC (rev 546)
@@ -2,7 +2,7 @@
## Function to compute estimates
###############################################################################
Estimator <- function(x, estimator, name, Infos, asvar = NULL, nuis.idx,
- trafo = NULL, fixed = NULL, asvar.fct, ...){
+ trafo = NULL, fixed = NULL, asvar.fct, na.rm = TRUE, ...){
name.est <- paste(deparse(substitute(estimator)),sep="",collapse="")
es.call <- match.call()
@@ -20,6 +20,7 @@
samplesize <- if(is.null(dim(x))) length(x) else dim(x)[2]
+ if(na.rm) x <- complete.cases(x)
estimate <- estimator(x, ...)
l.e <- length(estimate)
Modified: pkg/distrMod/R/MCEstimator.R
===================================================================
--- pkg/distrMod/R/MCEstimator.R 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/R/MCEstimator.R 2009-08-25 13:03:33 UTC (rev 546)
@@ -4,7 +4,7 @@
MCEstimator <- function(x, ParamFamily, criterion, crit.name,
startPar = NULL,
Infos, trafo = NULL, penalty = 0, validity.check = TRUE,
- asvar.fct, ...){
+ asvar.fct, na.rm =TRUE, ...){
## preparation: getting the matched call
es.call <- match.call()
@@ -19,6 +19,9 @@
if(!is.function(criterion))
stop(gettext("'criterion' has to be a function"))
+ if(na.rm) x <- complete.cases(x)
+
+
## manipulation of the arg list to method mceCalc
argList <- c(list(x = x, PFam = ParamFamily, criterion = criterion,
startPar = startPar, penalty = penalty))
Modified: pkg/distrMod/R/MDEstimator.R
===================================================================
--- pkg/distrMod/R/MDEstimator.R 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/R/MDEstimator.R 2009-08-25 13:03:33 UTC (rev 546)
@@ -3,7 +3,8 @@
###############################################################################
MDEstimator <- function(x, ParamFamily, distance = KolmogorovDist, dist.name,
startPar = NULL, Infos,
- trafo = NULL, penalty = 0, asvar.fct, ...){
+ trafo = NULL, penalty = 0, asvar.fct,
+ na.rm = TRUE, ...){
## preparation: getting the matched call
es.call <- match.call()
@@ -17,6 +18,7 @@
if(missing(dist.name))
dist.name <- names(distance(x, ParamFamily at distribution))
+ if(na.rm) x <- complete.cases(x)
## manipulation of the arg list to method mceCalc
Modified: pkg/distrMod/R/MLEstimator.R
===================================================================
--- pkg/distrMod/R/MLEstimator.R 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/R/MLEstimator.R 2009-08-25 13:03:33 UTC (rev 546)
@@ -5,7 +5,7 @@
## Maximum-Likelihood estimator
MLEstimator <- function(x, ParamFamily, startPar = NULL,
- Infos, trafo = NULL, penalty = 0, ...){
+ Infos, trafo = NULL, penalty = 0, na.rm = TRUE, ...){
## preparation: getting the matched call
es.call <- match.call()
@@ -18,6 +18,8 @@
if(is.null(startPar)) startPar <- startPar(ParamFamily)(x,...)
+ if(na.rm) x <- complete.cases(x)
+
## manipulation of the arg list to method mceCalc
argList <- c(list(x = x, PFam = ParamFamily, startPar = startPar,
penalty = penalty))
Modified: pkg/distrMod/man/Estimator.Rd
===================================================================
--- pkg/distrMod/man/Estimator.Rd 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/man/Estimator.Rd 2009-08-25 13:03:33 UTC (rev 546)
@@ -8,7 +8,8 @@
}
\usage{
Estimator(x, estimator, name, Infos, asvar = NULL, nuis.idx,
- trafo = NULL, fixed = NULL, asvar.fct, ...)
+ trafo = NULL, fixed = NULL,
+ asvar.fct, na.rm = TRUE, ...)
}
\arguments{
\item{x}{ (empirical) data }
@@ -27,6 +28,7 @@
and \code{param} (the parameter value as object of class
\code{ParamFamParameter}); arguments are called by name; \code{asvar.fct}
may also process further arguments passed through the \code{\dots} argument}
+ \item{na.rm}{logical: if \code{TRUE}, the estimator is evaluated at \code{complete.cases(x)}.}
\item{\dots}{ further arguments to \code{estimator}. }
}
\details{
Modified: pkg/distrMod/man/MCEstimator.Rd
===================================================================
--- pkg/distrMod/man/MCEstimator.Rd 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/man/MCEstimator.Rd 2009-08-25 13:03:33 UTC (rev 546)
@@ -13,7 +13,8 @@
\usage{
MCEstimator(x, ParamFamily, criterion, crit.name,
startPar = NULL, Infos, trafo = NULL,
- penalty = 0, validity.check = TRUE, asvar.fct, ...)
+ penalty = 0, validity.check = TRUE,
+ asvar.fct, na.rm = TRUE, ...)
}
\arguments{
\item{x}{ (empirical) data }
@@ -38,7 +39,8 @@
and \code{param} (the parameter value as object of class
\code{ParamFamParameter}); arguments are called by name; \code{asvar.fct}
may also process further arguments passed through the \code{\dots} argument}
- \item{\dots}{ further arguments to \code{criterion} or \code{optimize}
+ \item{na.rm}{logical: if \code{TRUE}, the estimator is evaluated at \code{complete.cases(x)}.}
+ \item{\dots}{ further arguments to \code{criterion} or \code{optimize}
or \code{optim}, respectively. }
}
\details{
Modified: pkg/distrMod/man/MDEstimator.Rd
===================================================================
--- pkg/distrMod/man/MDEstimator.Rd 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/man/MDEstimator.Rd 2009-08-25 13:03:33 UTC (rev 546)
@@ -9,7 +9,7 @@
\usage{
MDEstimator(x, ParamFamily, distance = KolmogorovDist, dist.name,
startPar = NULL, Infos, trafo = NULL,
- penalty = 0, asvar.fct, ...)
+ penalty = 0, asvar.fct, na.rm = TRUE, ...)
}
%- maybe also 'usage' for other objects documented here.
\arguments{
@@ -34,6 +34,7 @@
and \code{param} (the parameter value as object of class
\code{ParamFamParameter}); arguments are called by name; \code{asvar.fct}
may also process further arguments passed through the \code{\dots} argument}
+ \item{na.rm}{logical: if \code{TRUE}, the estimator is evaluated at \code{complete.cases(x)}.}
\item{\dots}{ further arguments to \code{criterion} or \code{optimize}
or \code{optim}, respectively. }
}
Modified: pkg/distrMod/man/MLEstimator.Rd
===================================================================
--- pkg/distrMod/man/MLEstimator.Rd 2009-08-21 13:05:02 UTC (rev 545)
+++ pkg/distrMod/man/MLEstimator.Rd 2009-08-25 13:03:33 UTC (rev 546)
@@ -10,7 +10,7 @@
}
\usage{
MLEstimator(x, ParamFamily, startPar = NULL,
- Infos, trafo = NULL, penalty = 0, ...)
+ Infos, trafo = NULL, penalty = 0, na.rm = TRUE, ...)
}
%- maybe also 'usage' for other objects documented here.
\arguments{
@@ -26,7 +26,8 @@
\item{trafo}{ an object of class \code{MatrixorFunction} -- a transformation
for the main parameter}
\item{penalty}{(non-negative) numeric: penalizes non valid parameter-values}
- \item{\dots}{ further arguments to \code{criterion} or \code{optimize}
+ \item{na.rm}{logical: if \code{TRUE}, the estimator is evaluated at \code{complete.cases(x)}.}
+ \item{\dots}{ further arguments to \code{criterion} or \code{optimize}
or \code{optim}, respectively. }
}
\details{
More information about the Distr-commits
mailing list