[Distr-commits] r138 - in pkg/distrMod: . R man

[noreply at r-forge.r-project.org]

Author: stamats
Date: 2008-05-08 17:17:08 +0200 (Thu, 08 May 2008)
New Revision: 138

Modified:
   pkg/distrMod/DESCRIPTION
   pkg/distrMod/R/MCEstimator.R
   pkg/distrMod/R/MLEstimator.R
   pkg/distrMod/man/0distrMod-package.Rd
   pkg/distrMod/man/L2ParamFamily-class.Rd
Log:
now distrMod checks and installs without any error or warning under 2.7.0 Patched (2008-05-06 r45626) - but many missing keyword entries

Modified: pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION	2008-05-08 14:46:23 UTC (rev 137)
+++ pkg/distrMod/DESCRIPTION	2008-05-08 15:17:08 UTC (rev 138)
@@ -1,6 +1,6 @@
 Package: distrMod
 Version: 2.0
-Date: 2008-04-04
+Date: 2008-05-08
 Title: Object orientated implementation of probability models
 Description: Object orientated implementation of probability models based on packages 'distr' and 'distrEx'
 Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla

Modified: pkg/distrMod/R/MCEstimator.R
===================================================================
--- pkg/distrMod/R/MCEstimator.R	2008-05-08 14:46:23 UTC (rev 137)
+++ pkg/distrMod/R/MCEstimator.R	2008-05-08 15:17:08 UTC (rev 138)
@@ -19,6 +19,7 @@
         crit <- res$objectiv
     }else{
         if(missing(par)) par <- main(ParamFamily)
+	if(inherits(par,"Estimate")) par <- par$estimate
         res <- optim(par = par, fn = fun, Data = x, ParamFamily = ParamFamily, 
                       criterion = criterion, ...)
         theta <- res$par

Modified: pkg/distrMod/R/MLEstimator.R
===================================================================
--- pkg/distrMod/R/MLEstimator.R	2008-05-08 14:46:23 UTC (rev 137)
+++ pkg/distrMod/R/MLEstimator.R	2008-05-08 15:17:08 UTC (rev 138)
@@ -28,7 +28,6 @@
         return(res)
     }
 
-    if(inherits(par,"Estimate")) par <- par$estimate
     res <- MCEstimator(x = x, ParamFamily = ParamFamily, criterion = negLoglikelihood,
                 interval = interval, par = par, ...)
     names(res$criterion) <- "negative log-likelihood"

Modified: pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- pkg/distrMod/man/0distrMod-package.Rd	2008-05-08 14:46:23 UTC (rev 137)
+++ pkg/distrMod/man/0distrMod-package.Rd	2008-05-08 15:17:08 UTC (rev 138)
@@ -16,12 +16,11 @@
 \tabular{ll}{
 Package: \tab distrMod\cr
 Version: \tab 2.0 \cr
-Date: \tab 2008-01-17 \cr
-Depends: \tab R(>= 2.6.1), methods, graphics, startupmsg, distr(>= 1.9), distrEx(>= 1.9)\cr
-SaveImage: \tab no\cr
+Date: \tab 2008-05-08 \cr
+Depends: \tab R(>= 2.6.0), methods, startupmsg, distr(>= 2.0), distrEx(>= 2.0), RandVar(>= 0.6.2)\cr
 LazyLoad: \tab yes\cr
 License: \tab GPL (version 2 or later)\cr
-URL: \tab https://r-forge.r-project.org/projects/distrmod/\cr
+URL: \tab http://distr.r-forge.r-project.org/\cr
 }}
 
 \section{Classes}{

Modified: pkg/distrMod/man/L2ParamFamily-class.Rd
===================================================================
--- pkg/distrMod/man/L2ParamFamily-class.Rd	2008-05-08 14:46:23 UTC (rev 137)
+++ pkg/distrMod/man/L2ParamFamily-class.Rd	2008-05-08 15:17:08 UTC (rev 138)
@@ -2,9 +2,11 @@
 \docType{class}
 \alias{L2ParamFamily-class}
 \alias{FisherInfo}
-\alias{FisherInfo,L2ParamFamily-method}
+\alias{FisherInfo,L2ParamFamily,missing-method}
+\alias{FisherInfo,L2ParamFamily,ParamFamParameter-method}
 \alias{L2deriv}
-\alias{L2deriv,L2ParamFamily-method}
+\alias{L2deriv,L2ParamFamily,missing-method}
+\alias{L2deriv,L2ParamFamily,ParamFamParameter-method}
 \alias{L2derivSymm}
 \alias{L2derivSymm,L2ParamFamily-method}
 \alias{L2derivDistr}
@@ -78,7 +80,7 @@
     \item{L2deriv}{\code{signature(object = "L2ParamFamily", 
                                    param = "ParamFamParameter")}: 
       returns the L2derivative at \code{param}, i.e.
-      evaluates slot functoin  \code{L2deriv.fct} at \code{param}. }
+      evaluates slot function \code{L2deriv.fct} at \code{param}. }
 
     \item{L2derivSymm}{\code{signature(object = "L2ParamFamily")}: 
       accessor function for \code{L2derivSymm}. }
@@ -95,7 +97,7 @@
     \item{FisherInfo}{\code{signature(object = "L2ParamFamily", 
                                    param = "ParamFamParameter")}: 
       returns the Fisher Information at \code{param}, i.e.
-      evaluates slot functoin  \code{FisherInfo.fct} at \code{param}. }
+      evaluates slot function \code{FisherInfo.fct} at \code{param}. }
 
     \item{checkL2deriv}{\code{signature(object = "L2ParamFamily")}: 
       check centering of \code{L2deriv} and compute precision