[Robast-commits] r1107 - in branches/robast-1.2/pkg/RobExtremes: . R inst man

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Mon Aug 6 20:39:39 CEST 2018


Author: ruckdeschel
Date: 2018-08-06 20:39:39 +0200 (Mon, 06 Aug 2018)
New Revision: 1107

Modified:
   branches/robast-1.2/pkg/RobExtremes/DESCRIPTION
   branches/robast-1.2/pkg/RobExtremes/NAMESPACE
   branches/robast-1.2/pkg/RobExtremes/R/AllClass.R
   branches/robast-1.2/pkg/RobExtremes/R/AllShow.R
   branches/robast-1.2/pkg/RobExtremes/R/Expectation.R
   branches/robast-1.2/pkg/RobExtremes/R/checkEstClassForParamFamiliyMethods.R
   branches/robast-1.2/pkg/RobExtremes/R/getStartIC.R
   branches/robast-1.2/pkg/RobExtremes/R/getStartICPareto.R
   branches/robast-1.2/pkg/RobExtremes/inst/NEWS
   branches/robast-1.2/pkg/RobExtremes/man/E.Rd
   branches/robast-1.2/pkg/RobExtremes/man/internal-methods.Rd
   branches/robast-1.2/pkg/RobExtremes/man/internalEstimatorReturnClasses-class.Rd
Log:
[RobExtremes] branch 1.2

under the hood
+ moved quantile integration methods for expectation for Weibull and
  Gamma distribution to pkg distrEx (>= 2.8.0)
+ made a helper function .qtlIntegrate out of existing code in 
  RobExtremes 1.1.0  and moved it to distrEx where it is exported
  from version 2.8.0; it is reused in RobExtremes for the GEV methods 
+ adopted new MCALEestimate return type for extreme value distributions
  (and further coercion methods...) 
+ slot function modifyIC of the different IC classes gains
  an argument withMakeIC to be able to adjust this to a
  higher granularity (and to gain speed again)


Modified: branches/robast-1.2/pkg/RobExtremes/DESCRIPTION
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/DESCRIPTION	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/DESCRIPTION	2018-08-06 18:39:39 UTC (rev 1107)
@@ -5,9 +5,9 @@
 Description: Optimally robust estimation for extreme value distributions using S4 classes and
         methods (based on packages 'distr', 'distrEx', 'distrMod', 'RobAStBase', and
         'ROptEst').
-Depends: R (>= 2.14.0), methods, distrMod(>= 2.7.0), ROptEst(>= 1.1.0), robustbase, evd
-Suggests: RUnit (>= 0.4.26), ismev (>= 1.39)
-Imports: RobAStRDA, distr, distrEx, RandVar, RobAStBase, startupmsg, actuar
+Depends: R(>= 2.14.0), methods, distrMod(>= 2.8.0), ROptEst(>= 1.1.0), robustbase, evd
+Suggests: RUnit(>= 0.4.26), ismev(>= 1.39)
+Imports: RobAStRDA, distr, distrEx(>= 2.8.0), RandVar, RobAStBase(>= 1.2.0), startupmsg, actuar
 Authors at R: c(person("Nataliya", "Horbenko", role=c("aut","cph")), person("Bernhard", "Spangl",
         role="ctb", comment="contributed smoothed grid values of the Lagrange multipliers"),
         person("Sascha", "Desmettre", role="ctb", comment="contributed smoothed grid values of

Modified: branches/robast-1.2/pkg/RobExtremes/NAMESPACE
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/NAMESPACE	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/NAMESPACE	2018-08-06 18:39:39 UTC (rev 1107)
@@ -29,9 +29,9 @@
 exportClasses("DistributionsIntegratingByQuantiles")
 exportClasses("ParamWithLocAndScaleAndShapeFamParameter")
 exportClasses("L2LocScaleShapeUnion")
-exportClasses("GPDEstimate","GPDMCEstimate","GPDLDEstimate",
+exportClasses("GPDEstimate","GPDMCEstimate","GPDMCALEstimate","GPDLDEstimate",
               "GPDkStepEstimate","GEVEstimate","GEVLDEstimate",
-			  "GEVkStepEstimate","GEVMCEstimate",
+			  "GEVkStepEstimate","GEVMCEstimate", "GEVMCALEstimate",
 			  "GPDORobEstimate","GEVORobEstimate")			  
 exportMethods("initialize", "show", "rescaleFunction") 
 exportMethods("loc", "loc<-", "kMAD", "Sn", "Qn")
@@ -45,7 +45,7 @@
 exportMethods(".checkEstClassForParamFamily")
 exportMethods("locscaleshapename","locscalename","scaleshapename",
               "locationname","scalename","shapename","locscaleshapename<-")
-exportMethods("modifyModel", "getStartIC")
+exportMethods("modifyModel", "getStartIC", "coerce")
 exportMethods("moveL2Fam2RefParam",
 			  "moveICBackFromRefParam")			  
 exportMethods("checkIC", "makeIC")

Modified: branches/robast-1.2/pkg/RobExtremes/R/AllClass.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/R/AllClass.R	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/R/AllClass.R	2018-08-06 18:39:39 UTC (rev 1107)
@@ -286,6 +286,7 @@
 setOldClass("gpd.fit")
 setClass("GPDEstimate", contains="Estimate")
 setClass("GPDMCEstimate", contains=c("MCEstimate", "GPDEstimate"))
+setClass("GPDMCALEstimate", contains=c("MCALEstimate", "GPDEstimate"))
 setClass("GPDLDEstimate", contains=c("LDEstimate", "GPDEstimate"))
 setClass("GPDkStepEstimate", contains=c("kStepEstimate", "GPDEstimate"))
 setClass("GPDORobEstimate", contains=c("ORobEstimate", "GPDkStepEstimate"))
@@ -294,3 +295,4 @@
 setClass("GEVkStepEstimate", contains=c("kStepEstimate", "GEVEstimate"))
 setClass("GEVORobEstimate", contains=c("ORobEstimate", "GEVkStepEstimate"))
 setClass("GEVMCEstimate", contains=c("MCEstimate", "GEVEstimate"))
+setClass("GEVMCALEstimate", contains=c("MCALEstimate", "GEVEstimate"))

Modified: branches/robast-1.2/pkg/RobExtremes/R/AllShow.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/R/AllShow.R	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/R/AllShow.R	2018-08-06 18:39:39 UTC (rev 1107)
@@ -2,7 +2,7 @@
 setMethod("show", "LDEstimate",
     function(object){
        digits <- getOption("digits")
-       show(as(object,"Estimate"))
+       getMethod("show","Estimate")(object)
        if(getdistrModOption("show.details")!="minimal"){
         cat("Location:", object at location, "\n")
         cat("Dispersion:", object at dispersion, "\n")

Modified: branches/robast-1.2/pkg/RobExtremes/R/Expectation.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/R/Expectation.R	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/R/Expectation.R	2018-08-06 18:39:39 UTC (rev 1107)
@@ -1,4 +1,9 @@
+## copied form distrEx from distrEx 2.8.0 and branch 1.2.0 on
 
+## .qtlIntegrate is moved from RobExtremes (slightly modified) to distrEx
+#   as of versions distrEx 2.8.0 and RobExtremes 1.2.0
+
+
 setMethod("E", signature(object = "Pareto", 
                          fun = "missing", 
                          cond = "missing"),
@@ -52,56 +57,11 @@
              upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
              IQR.fac = max(1e4,getdistrExOption("IQR.fac")), ...
              ){
-
-        dots <- list(...)
-        dots.withoutUseApply <- dots
-        useApply <- TRUE
-        if(!is.null(dots$useApply)) useApply <- dots$useApply
-
-        dots.withoutUseApply$useApply <- NULL
-        dots.withoutUseApply$stop.on.error <- NULL
-
-        integrand <- function(x, dfun, ...){   di <- dim(x)
-                                               y <- q.l(object)(x)##quantile transformation
-                                               if(useApply){
-                                                    funy <- sapply(y,fun, ...)
-                                                    dim(y) <- di
-                                                    dim(funy) <- di
-                                               }else funy <- fun(y,...)
-                                        return(funy) }
-
-         if(is.null(low)) low <- -Inf
-         if(is.null(upp)) upp <- Inf
-
-         Ib <- .getIntbounds(object, low, upp, lowerTruncQuantile,
-               upperTruncQuantile, IQR.fac)
-         low <- p(object)(Ib["low"])
-         upp <- p(object)(Ib["upp"])
-         if(is.nan(low)) low <- 0
-         if(is.nan(upp)) upp <- 1
-
-         if(upp < 0.98){
-           int <- do.call(distrExIntegrate, c(list(f = integrand,
-                    lower = low,
-                    upper = upp,
-                    rel.tol = rel.tol, stop.on.error = FALSE,
-                    distr = object, dfun = dunif), dots.withoutUseApply))
-         }else{
-           int1 <- do.call(distrExIntegrate, c(list(f = integrand,
-                    lower = low,
-                    upper = 0.98,
-                    rel.tol = rel.tol, stop.on.error = FALSE,
-                    distr = object, dfun = dunif), dots.withoutUseApply))
-           int2 <- do.call(distrExIntegrate, c(list(f = integrand,
-                    lower = 0.98,
-                    upper = upp,
-                    rel.tol = rel.tol, stop.on.error = FALSE,
-                    distr = object, dfun = dunif), dots.withoutUseApply))
-           int <- int1+int2
-         }
-
-         return(int)
-
+    .qtlIntegrate(object = object, fun = fun, low = low, upp = upp,
+             rel.tol= rel.tol, lowerTruncQuantile = lowerTruncQuantile,
+             upperTruncQuantile = upperTruncQuantile,
+             IQR.fac = IQR.fac, ...,
+             .withLeftTail = FALSE, .withRightTail = TRUE)
     })
 
 setMethod("E", signature(object = "GPareto",
@@ -165,12 +125,15 @@
            signature(object = "DistributionsIntegratingByQuantiles",
                      fun = "function", cond = "missing")))
 
-setMethod("E", signature(object = "Weibull", fun = "function", cond = "missing"),
-           getMethod("E",
-           signature(object = "DistributionsIntegratingByQuantiles",
-                     fun = "function", cond = "missing")))
+## these routines are moved back to package distrEx from distrEx 2.8.0 / RobExtremes 1.2.0 on
 
-setMethod("E", signature(object = "Gammad", fun = "function", cond = "missing"),
-           getMethod("E",
-           signature(object = "DistributionsIntegratingByQuantiles",
-                     fun = "function", cond = "missing")))
+#setMethod("E", signature(object = "Weibull", fun = "function", cond = "missing"),
+#           getMethod("E",
+#           signature(object = "DistributionsIntegratingByQuantiles",
+#                     fun = "function", cond = "missing")))
+
+#setMethod("E", signature(object = "Gammad", fun = "function", cond = "missing"),
+#           getMethod("E",
+#           signature(object = "DistributionsIntegratingByQuantiles",
+#                     fun = "function", cond = "missing")))
+#
\ No newline at end of file

Modified: branches/robast-1.2/pkg/RobExtremes/R/checkEstClassForParamFamiliyMethods.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/R/checkEstClassForParamFamiliyMethods.R	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/R/checkEstClassForParamFamiliyMethods.R	2018-08-06 18:39:39 UTC (rev 1107)
@@ -12,8 +12,31 @@
               function(PFam, estimator) as(estimator,"GPDORobEstimate"))
 setMethod(".checkEstClassForParamFamily",
               signature=signature(PFam="GParetoFamily",estimator="MCEstimate"),
-              function(PFam, estimator) as(estimator,"GPDMCEstimate"))
+              function(PFam, estimator){# ret0 <- as(estimator,"GPDMCEstimate")
+                 fromSlotNames <- slotNames(class(estimator))
+                 to <- new("GPDMCALEstimate")
+                 for(item in fromSlotNames) slot(to, item) <- slot(estimator,item)
+                 to at pIC <- substitute(getPIC(estimator0), list(estimator0=estimator))
+                 return(to)
+              })
 setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GParetoFamily",estimator="MLEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GParetoFamily",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GParetoFamily",estimator="MDEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GParetoFamily",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GParetoFamily",estimator="CvMMDEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GParetoFamily",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GParetoFamily",estimator="MCALEstimate"),
+              function(PFam, estimator) as(estimator,"GPDMCALEstimate"))
+
+
+setMethod(".checkEstClassForParamFamily",
               signature=signature(PFam="GEVFamily",estimator="Estimate"),
               function(PFam, estimator) as(estimator,"GEVEstimate"))
 setMethod(".checkEstClassForParamFamily",
@@ -27,8 +50,31 @@
               function(PFam, estimator) as(estimator,"GEVORobEstimate"))
 setMethod(".checkEstClassForParamFamily",
               signature=signature(PFam="GEVFamily",estimator="MCEstimate"),
-              function(PFam, estimator) as(estimator,"GEVMCEstimate"))
+              function(PFam, estimator){ #ret0 <- as(estimator,"GEVMCEstimate")
+                 fromSlotNames <- slotNames(class(estimator))
+                 to <- new("GEVMCALEstimate")
+                 for(item in fromSlotNames) slot(to, item) <- slot(estimator,item)
+                 to at pIC <- substitute(getPIC(estimator0), list(estimator0=estimator))
+                 return(to)
+              })
 setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamily",estimator="MLEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamily",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamily",estimator="MDEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamily",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamily",estimator="CvMMDEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamily",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamily",estimator="MCALEstimate"),
+              function(PFam, estimator) as(estimator,"GEVMCALEstimate"))
+
+
+setMethod(".checkEstClassForParamFamily",
               signature=signature(PFam="GEVFamilyMuUnknown",estimator="Estimate"),
               function(PFam, estimator) as(estimator,"GEVEstimate"))
 setMethod(".checkEstClassForParamFamily",
@@ -42,4 +88,25 @@
               function(PFam, estimator) as(estimator,"GEVORobEstimate"))
 setMethod(".checkEstClassForParamFamily",
               signature=signature(PFam="GEVFamilyMuUnknown",estimator="MCEstimate"),
-              function(PFam, estimator) as(estimator,"GEVMCEstimate"))
+              function(PFam, estimator){ #ret0 <- as(estimator,"GEVMCEstimate")
+                 fromSlotNames <- slotNames(class(estimator))
+                 to <- new("GEVMCALEstimate")
+                 for(item in fromSlotNames) slot(to, item) <- slot(estimator,item)
+                 to at pIC <- substitute(getPIC(estimator0), list(estimator0=estimator))
+                 return(to)
+              })
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamilyMuUnknown",estimator="MLEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamilyMuUnknown",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamilyMuUnknown",estimator="MDEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamilyMuUnknown",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamilyMuUnknown",estimator="CvMMDEstimate"),
+              getMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamilyMuUnknown",estimator="MCEstimate")))
+setMethod(".checkEstClassForParamFamily",
+              signature=signature(PFam="GEVFamilyMuUnknown",estimator="MCALEstimate"),
+              function(PFam, estimator) as(estimator,"GEVMCALEstimate"))

Modified: branches/robast-1.2/pkg/RobExtremes/R/getStartIC.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/R/getStartIC.R	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/R/getStartIC.R	2018-08-06 18:39:39 UTC (rev 1107)
@@ -26,38 +26,22 @@
     if(length(nsng)){
        if(gridn %in% nsng){
           interpolfct <- famg[[gridn]][[.versionSuff("fun")]]
-          if(withMakeIC){
-            .modifyIC0 <- function(L2Fam, IC){
+          .modifyIC0 <- function(L2Fam, IC, withMakeIC){
                     para <- param(L2Fam)
                     if(!.is.na.Psi(para, interpolfct, shnam))
                        return(.getPsi(para, interpolfct, L2Fam, type(risk), withMakeIC))
                     else{
                        IC0 <- do.call(getStartIC, as.list(mc[-1]),
                               envir=parent.frame(2))
-                       IC0 <- makeIC(IC0, L2Fam)
+                       if(withMakeIC) IC0 <- makeIC(IC0, L2Fam)
                        return(IC0)
                     }
-            }
-          }else{
-            .modifyIC0 <- function(L2Fam, IC){
-                    para <- param(L2Fam)
-                    if(!.is.na.Psi(para, interpolfct, shnam))
-                       return(.getPsi(para, interpolfct, L2Fam, type(risk), withMakeIC))
-                    else{
-                       IC0 <- do.call(getStartIC, as.list(mc[-1]),
-                              envir=parent.frame(2))
-                       return(IC0)
-                    }
-            }
           }
-          if(withMakeIC) attr(.modifyIC0,"hasMakeICin.modifyIC") <- TRUE
-
-          .modifyIC <- function(L2Fam,IC){
-               psi.0 <- .modifyIC0(L2Fam,IC)
-               psi.0 at modifyIC <- .modifyIC
+          .modifyIC <- function(L2Fam,IC, withMakeIC){
+               psi.0 <- .modifyIC0(L2Fam,IC, withMakeIC)
+               psi.0 at modifyIC <- .modifyIC0
                return(psi.0)
           }
-          if(withMakeIC) attr(.modifyIC,"hasMakeICin.modifyIC") <- TRUE
 
           if(!.is.na.Psi(param1, interpolfct, shnam)){
              IC0 <- .getPsi(param1, interpolfct, model, type(risk), withMakeIC)

Modified: branches/robast-1.2/pkg/RobExtremes/R/getStartICPareto.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/R/getStartICPareto.R	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/R/getStartICPareto.R	2018-08-06 18:39:39 UTC (rev 1107)
@@ -3,14 +3,14 @@
 
     param1 <- param(model)
     xi <- main(param1)
-    .modifyIC0 <- function(L2Fam, IC){
+    .modifyIC0 <- function(L2Fam, IC, withMakeIC){
               xi0 <- main(param(L2Fam))
               return(.getPsi.P(xi0, L2Fam, type(risk), withMakeIC))
     }
     attr(.modifyIC0,"hasMakeICin.modifyIC") <- TRUE
-    .modifyIC <- function(L2Fam,IC){
-         psi.0 <- .modifyIC0(L2Fam,IC)
-         psi.0 at modifyIC <- .modifyIC
+    .modifyIC <- function(L2Fam,IC, withMakeIC){
+         psi.0 <- .modifyIC0(L2Fam,IC, withMakeIC)
+         psi.0 at modifyIC <- .modifyIC0
          return(psi.0)
     }
     attr(.modifyIC,"hasMakeICin.modifyIC") <- TRUE

Modified: branches/robast-1.2/pkg/RobExtremes/inst/NEWS
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/inst/NEWS	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/inst/NEWS	2018-08-06 18:39:39 UTC (rev 1107)
@@ -8,6 +8,17 @@
  information) 
 
 #######################################
+version 1.2
+#######################################
+
+under the hood
++ moved quantile integration methods for expectation for Weibull and
+  Gamma distribution to pkg distrEx (>= 2.8.0)
++ made a helper function .qtlIntegrate out of existing code in 
+  RobExtremes 1.1.0  and moved it to distrEx where it is exported
+  from version 2.8.0; it is reused in RobExtremes for the GEV methods 
+
+#######################################
 version 1.1
 #######################################
 

Modified: branches/robast-1.2/pkg/RobExtremes/man/E.Rd
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/man/E.Rd	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/man/E.Rd	2018-08-06 18:39:39 UTC (rev 1107)
@@ -7,10 +7,10 @@
 \alias{E,GPareto,missing,missing-method}
 \alias{E,GPareto,function,missing-method}
 \alias{E,GEV,function,missing-method}
-\alias{E,Weibull,function,missing-method}
+%\alias{E,Weibull,function,missing-method} % moved to distrEx
 \alias{E,GEV,missing,missing-method}
 \alias{E,Pareto,missing,missing-method}
-\alias{E,Gammad,function,missing-method}
+%\alias{E,Gammad,function,missing-method} % moved to distrEx
 \alias{E,Pareto,function,missing-method}
 
 \title{Generic Function for the Computation of (Conditional) Expectations}
@@ -84,7 +84,7 @@
   \item{object = "Pareto", fun = "missing", cond = "missing":}{
     exact evaluation using explicit expressions.}
 }}
-\author{Matthias Kohl \email{Matthias.Kohl at stamats.de} and Peter Ruckdeschel \email{peter.ruckdeschel at uni-bayreuth.de}}
+\author{Matthias Kohl \email{Matthias.Kohl at stamats.de} and Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
 \seealso{\code{\link{distrExIntegrate}}, \code{\link{m1df}}, \code{\link{m2df}},
     \code{\link[distr]{Distribution-class}}}
 \examples{

Modified: branches/robast-1.2/pkg/RobExtremes/man/internal-methods.Rd
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/man/internal-methods.Rd	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/man/internal-methods.Rd	2018-08-06 18:39:39 UTC (rev 1107)
@@ -7,16 +7,28 @@
 \alias{.checkEstClassForParamFamily,GParetoFamily,MCEstimate-method}
 \alias{.checkEstClassForParamFamily,GParetoFamily,kStepEstimate-method}
 \alias{.checkEstClassForParamFamily,GParetoFamily,ORobEstimate-method}
+\alias{.checkEstClassForParamFamily,GParetoFamily,MCALEstimate-method}
+\alias{.checkEstClassForParamFamily,GParetoFamily,MLEstimate-method}
+\alias{.checkEstClassForParamFamily,GParetoFamily,MDEstimate-method}
+\alias{.checkEstClassForParamFamily,GParetoFamily,CvMMDEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamily,Estimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamily,MCEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamily,LDEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamily,kStepEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamily,ORobEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamily,MCALEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamily,MLEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamily,MDEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamily,CvMMDEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,Estimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,MCEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,LDEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,kStepEstimate-method}
 \alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,ORobEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,MCALEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,MLEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,MDEstimate-method}
+\alias{.checkEstClassForParamFamily,GEVFamilyMuUnknown,CvMMDEstimate-method}
 \title{ Methods for Function .checkEstClassForParamFamily in Package `RobExtremes' }
 \description{.checkEstClassForParamFamily-methods}
 %\usage{.checkEstClassForParamFamily(PFam, estimator)
@@ -48,7 +60,7 @@
 the \code{GParetoFamily,LDEstimate}-method cast to
 S4 class  \code{GPDLDEstimate},\cr
 the \code{GParetoFamily,MCEstimate}-method cast to
-S4 class  \code{GPDMCEstimate},\cr
+S4 class  \code{GPDMCALEstimate},\cr
 the \code{GParetoFamily,kStepEstimate}-method cast to
 S4 class  \code{GPDkStepstimate},\cr
 the \code{GEVFamily,Estimate}-method cast to
@@ -56,7 +68,7 @@
 the \code{GEVFamily,LDEstimate}-method cast to
 S4 class  \code{GEVLDEstimate},\cr
 the \code{GEVFamily,MCEstimate}-method cast to
-S4 class  \code{GEVMCEstimate},\cr
+S4 class  \code{GEVMCALEstimate},\cr
 the \code{GEVFamily,kStepEstimate}-method cast to
 S4 class  \code{GEVkStepstimate},\cr
 the \code{GEVFamilyMuUnknown,Estimate}-method cast to
@@ -64,7 +76,7 @@
 the \code{GEVFamilyMuUnknown,LDEstimate}-method cast to
 S4 class  \code{GEVLDEstimate},\cr
 the \code{GEVFamilyMuUnknown,MCEstimate}-method cast to
-S4 class  \code{GEVMCEstimate},\cr
+S4 class  \code{GEVMCALEstimate},\cr
 the \code{GEVFamilyMuUnknown,kStepEstimate}-method cast to
 S4 class  \code{GEVkStepstimate}.\cr
 }

Modified: branches/robast-1.2/pkg/RobExtremes/man/internalEstimatorReturnClasses-class.Rd
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/man/internalEstimatorReturnClasses-class.Rd	2018-08-06 18:37:21 UTC (rev 1106)
+++ branches/robast-1.2/pkg/RobExtremes/man/internalEstimatorReturnClasses-class.Rd	2018-08-06 18:39:39 UTC (rev 1107)
@@ -5,6 +5,8 @@
 \alias{GEVEstimate-class}
 \alias{GPDMCEstimate-class}
 \alias{GEVMCEstimate-class}
+\alias{GPDMCALEstimate-class}
+\alias{GEVMCALEstimate-class}
 \alias{GPDLDEstimate-class}
 \alias{GEVLDEstimate-class}
 \alias{GPDkStepEstimate-class}
@@ -19,6 +21,7 @@
  \section{Described classes}{
 The S4 classes described here are \code{GPDEstimate}, \code{GEVEstimate},
  \code{GPDMCEstimate}, \code{GEVMCEstimate},
+ \code{GPDMCALEstimate}, \code{GEVMCALEstimate},
  \code{GPDLDEstimate}, \code{GEVLDEstimate},
  \code{GPDkStepEstimate}, \code{GEVkStepEstimate}
  \code{GPDORobEstimate}, \code{GEVORobEstimate}.}
@@ -36,6 +39,10 @@
 \code{MCEstimate}, directly.\cr
 Class \code{GEVMCEstimate} extends classes \code{GEVEstimate},
 \code{MCEstimate}, directly.\cr
+Class \code{GPDMCALEstimate} extends classes \code{GPDEstimate},
+\code{MCALEstimate}, directly.\cr
+Class \code{GEVMCALEstimate} extends classes \code{GEVEstimate},
+\code{MCALEstimate}, directly.\cr
 Class \code{GPDLDEstimate} extends classes \code{GPDEstimate},
 \code{LDEstimate}, directly.\cr
 Class \code{GEVLDEstimate} extends classes \code{GEVEstimate},



More information about the Robast-commits mailing list