[Robast-commits] r1156 - in branches/robast-1.2/pkg/ROptEst: R inst man

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Thu Aug 16 20:39:46 CEST 2018


Author: ruckdeschel
Date: 2018-08-16 20:39:45 +0200 (Thu, 16 Aug 2018)
New Revision: 1156

Modified:
   branches/robast-1.2/pkg/ROptEst/R/CheckMakeContIC.R
   branches/robast-1.2/pkg/ROptEst/R/RMXEOMSEMBREOBRE.R
   branches/robast-1.2/pkg/ROptEst/R/getStartIC.R
   branches/robast-1.2/pkg/ROptEst/R/roptest.new.R
   branches/robast-1.2/pkg/ROptEst/inst/NEWS
   branches/robast-1.2/pkg/ROptEst/man/RMXEOMSEMBREOBRE.Rd
   branches/robast-1.2/pkg/ROptEst/man/checkmakeIC.Rd
   branches/robast-1.2/pkg/ROptEst/man/getStartIC-methods.Rd
   branches/robast-1.2/pkg/ROptEst/man/robest.Rd
   branches/robast-1.2/pkg/ROptEst/man/roptest.Rd
Log:
[ROptEst] branch 1.2
+ roptest _and the wrappers RMX|OBR|MBR|OMSEstimator_ gain an argument E.argList ....
+ roptest and its wrappers RMX|OBR|MBR|OMSEstimator, getStartIC for asGRisk, asBias, RMX, and
  asAnscombe, as well as the particular checkIC/makeIC methods for ContIC gain argument 
  diagnostic to be able to show diagnostic information on integrations; this information 
  (if argument "diagnostic" is TRUE) is stored in attribute "diagnostic" of the return value


Modified: branches/robast-1.2/pkg/ROptEst/R/CheckMakeContIC.R
===================================================================
--- branches/robast-1.2/pkg/ROptEst/R/CheckMakeContIC.R	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/R/CheckMakeContIC.R	2018-08-16 18:39:45 UTC (rev 1156)
@@ -48,6 +48,8 @@
         prec <- max(abs(Delta1), abs(Delta2))
         names(prec) <- "maximum deviation"
 
+        if(diagnostic) attr(prec, "diagnostic") <- c(attr(res$G1, "diagnostic"),
+           attr(res$G2, "diagnostic"), attr(res$G3, "diagnostic"))
         return(prec)
     })
 
@@ -125,6 +127,10 @@
         cIC1 at modifyIC <- IC at modifyIC
         addInfo(cIC1) <- c("IC<-",
                            "generated by affine linear trafo to enforce consistency")
+
+        if(diagnostic) attr(cIC1, "diagnostic") <- c(attr(res$G1, "diagnostic"),
+           attr(res$G2, "diagnostic"), attr(res$G3, "diagnostic"))
+
         return(cIC1)
     })
 

Modified: branches/robast-1.2/pkg/ROptEst/R/RMXEOMSEMBREOBRE.R
===================================================================
--- branches/robast-1.2/pkg/ROptEst/R/RMXEOMSEMBREOBRE.R	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/R/RMXEOMSEMBREOBRE.R	2018-08-16 18:39:45 UTC (rev 1156)
@@ -10,7 +10,8 @@
                     na.rm = TRUE, initial.est.ArgList, ..., withLogScale = TRUE,
                     ..withCheck=FALSE, withTimings = FALSE, withMDE = NULL,
                     withEvalAsVar = NULL, withMakeIC = FALSE,
-                    modifyICwarn = NULL){
+                    modifyICwarn = NULL, E.argList = NULL,
+                    diagnostic = FALSE){
 
    mc <- match.call(expand.dots=FALSE)
    dots <- mc$"..."
@@ -30,7 +31,9 @@
                        withLogScale = withLogScale, ..withCheck = ..withCheck,
                        withTimings = withTimings, withMDE = withMDE,
                        withEvalAsVar = withEvalAsVar, withMakeIC = withMakeIC,
-                       modifyICwarn = modifyICwarn)
+                       modifyICwarn = modifyICwarn, E.argList = NULL,
+                       diagnostic = FALSE, E.argList = E.argList,
+                       diagnostic = diagnostic)
 
    if(!is.null(dots)) roptestArgList <- c(roptestArgList, dots)
    if(!missing(initial.est)) roptestArgList$initial.est <- initial.est
@@ -54,7 +57,8 @@
                     na.rm = TRUE, initial.est.ArgList, ..., withLogScale = TRUE,
                     ..withCheck=FALSE, withTimings = FALSE, withMDE = NULL,
                     withEvalAsVar = NULL, withMakeIC = FALSE,
-                    modifyICwarn = NULL){
+                    modifyICwarn = NULL, E.argList = NULL,
+                    diagnostic = FALSE){
 
    if(!is.numeric(eps)||length(eps)>1||any(eps<0))
       stop("Radius 'eps' must be given, of length 1 and non-negative.")
@@ -76,7 +80,8 @@
                        withLogScale = withLogScale, ..withCheck = ..withCheck,
                        withTimings = withTimings, withMDE = withMDE,
                        withEvalAsVar = withEvalAsVar, withMakeIC = withMakeIC,
-                       modifyICwarn = modifyICwarn)
+                       modifyICwarn = modifyICwarn, E.argList = E.argList,
+                       diagnostic = diagnostic)
 
    if(!is.null(dots)) roptestArgList <- c(roptestArgList, dots)
    if(!missing(initial.est)) roptestArgList$initial.est <- initial.est
@@ -100,7 +105,8 @@
                     na.rm = TRUE, initial.est.ArgList, ..., withLogScale = TRUE,
                     ..withCheck=FALSE, withTimings = FALSE, withMDE = NULL,
                     withEvalAsVar = NULL, withMakeIC = FALSE,
-                    modifyICwarn = NULL){
+                    modifyICwarn = NULL, E.argList = NULL,
+                    diagnostic = FALSE){
 
    if(!is.numeric(eff)||length(eff)>1||any(eff<0|eff>1))
       stop("Efficiency loss (in the ideal model) 'eff' must be given, of length 1 and in [0,1].")
@@ -118,7 +124,8 @@
                        withLogScale = withLogScale, ..withCheck = ..withCheck,
                        withTimings = withTimings, withMDE = withMDE,
                        withEvalAsVar = withEvalAsVar, withMakeIC = withMakeIC,
-                       modifyICwarn = modifyICwarn)
+                       modifyICwarn = modifyICwarn, E.argList = E.argList,
+                       diagnostic = diagnostic)
 
    if(!is.null(dots)) roptestArgList <- c(roptestArgList, dots)
    if(!missing(initial.est)) roptestArgList$initial.est <- initial.est
@@ -142,7 +149,8 @@
                     na.rm = TRUE, initial.est.ArgList, ..., withLogScale = TRUE,
                     ..withCheck=FALSE, withTimings = FALSE, withMDE = NULL,
                     withEvalAsVar = NULL, withMakeIC = FALSE,
-                    modifyICwarn = NULL){
+                    modifyICwarn = NULL, E.argList = NULL,
+                    diagnostic = FALSE){
 
    mc <- match.call(expand.dots=FALSE)
    dots <- mc$"..."
@@ -162,7 +170,8 @@
                        withLogScale = withLogScale, ..withCheck = ..withCheck,
                        withTimings = withTimings, withMDE = withMDE,
                        withEvalAsVar = withEvalAsVar, withMakeIC = withMakeIC,
-                       modifyICwarn = modifyICwarn)
+                       modifyICwarn = modifyICwarn, E.argList = E.argList,
+                       diagnostic = diagnostic)
 
    if(!is.null(dots)) roptestArgList <- c(roptestArgList, dots)
    if(!missing(initial.est)) roptestArgList$initial.est <- initial.est

Modified: branches/robast-1.2/pkg/ROptEst/R/getStartIC.R
===================================================================
--- branches/robast-1.2/pkg/ROptEst/R/getStartIC.R	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/R/getStartIC.R	2018-08-16 18:39:45 UTC (rev 1156)
@@ -3,9 +3,10 @@
 
 setMethod("getStartIC",signature(model = "L2ParamFamily", risk = "asGRisk"),
            function(model, risk, ..., withEvalAsVar = TRUE, withMakeIC = FALSE,
-           ..debug=FALSE, modifyICwarn = NULL){
+           ..debug=FALSE, modifyICwarn = NULL, diagnostic = FALSE){
     mc <- match.call(expand.dots=FALSE, call = sys.call(sys.parent(1)))
     dots <- as.list(mc$"...")
+    diagn <- if(diagnostic) list() else NULL
     if(missing(..debug)||!is.logical(..debug)) ..debug <- FALSE
     if("fsCor" %in% names(dots)){
         fsCor <- eval(dots[["fsCor"]])
@@ -32,6 +33,7 @@
         dots.rmx$risk <- NULL
         dots.rmx$modifyICwarn <- modifyICwarn
         dots.rmx[["warn"]] <- FALSE
+        if(diagnostic) dots.rmx[["diagnostic"]] <- TRUE
         if(!is.null(dots[["warn"]]))if(eval(dots[["warn"]])) dots.rmx[["warn"]] <- TRUE
 
         infMod <- InfRobModel(center = model, neighbor = neighbor)
@@ -60,6 +62,7 @@
         dots.optic$withMakeIC <- withMakeIC
         dots.optic$modifyICwarn <- modifyICwarn
         dots.optic[["warn"]] <- FALSE
+        if(diagnostic) dots.optic[["diagnostic"]] <- TRUE
         if(!is.null(dots[["warn"]]))if(eval(dots[["warn"]])) dots.optic[["warn"]] <- TRUE
 
         arg.optic <- c(list(model = infMod, risk = risk),
@@ -80,7 +83,7 @@
 
 setMethod("getStartIC",signature(model = "L2ParamFamily", risk = "asBias"),
            function(model, risk, ..., withMakeIC = FALSE, ..debug=FALSE,
-           modifyICwarn = NULL){
+           modifyICwarn = NULL, diagnostic = FALSE){
     mc <- match.call(expand.dots=FALSE, call = sys.call(sys.parent(1)))
     dots <- as.list(mc$"...")
 
@@ -98,14 +101,15 @@
     #print(list(c(list(infMod, risk), dots, list(warn = FALSE,
     #            withMakeIC = withMakeIC, modifyICwarn = modifyICwarn))))
     return(do.call(optIC, c(list(infMod, risk), dots, list(warn = FALSE,
-                withMakeIC = withMakeIC, modifyICwarn = modifyICwarn)),
+                withMakeIC = withMakeIC, modifyICwarn = modifyICwarn,
+                diagnostic = diagnostic)),
                 envir=parent.frame(2)))
            })
 
 
 setMethod("getStartIC",signature(model = "L2ParamFamily", risk = "asAnscombe"),
            function(model, risk, ..., withEvalAsVar = TRUE, withMakeIC = FALSE,
-           ..debug=FALSE, modifyICwarn = NULL){
+           ..debug=FALSE, modifyICwarn = NULL, diagnostic = FALSE){
     mc <- match.call(expand.dots=FALSE, call = sys.call(sys.parent(1)))
     dots <- as.list(mc$"...")
     if(missing(..debug)||!is.logical(..debug)) ..debug <- FALSE
@@ -124,6 +128,7 @@
     dots.optic$withMakeIC <- withMakeIC
     dots.optic$modifyICwarn <- modifyICwarn
     dots.optic[["warn"]] <- FALSE
+    if(diagnostic) dots.optic[["diagnostic"]] <- TRUE
     if(!is.null(dots[["warn"]]))if(eval(dots[["warn"]])) dots.optic[["warn"]] <- TRUE
 
     arg.optic <- c(list(model = infMod, risk = risk), dots.optic)

Modified: branches/robast-1.2/pkg/ROptEst/R/roptest.new.R
===================================================================
--- branches/robast-1.2/pkg/ROptEst/R/roptest.new.R	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/R/roptest.new.R	2018-08-16 18:39:45 UTC (rev 1156)
@@ -92,7 +92,7 @@
                     withLogScale = TRUE,..withCheck=FALSE,
                     withTimings = FALSE, withMDE = NULL,
                     withEvalAsVar = NULL, withMakeIC = FALSE,
-                    modifyICwarn = NULL, E.argList = NULL){
+                    modifyICwarn = NULL, E.argList = NULL, diagnostic = FALSE){
     mc <- match.call(expand.dots=FALSE)
     dots <- mc[["..."]]
     scalename <- dots[["scalename"]]
@@ -102,13 +102,14 @@
     if(!missing(eps.lower)) nbCtrl[["eps.lower"]] <- eps.lower
     if(!missing(eps.upper)) nbCtrl[["eps.upper"]] <- eps.upper
 
+    if(diagnostic) if(!missing(E.argList)&&!is.null(E.argList)) E.argList[["diagnostic"]] <- TRUE
+
     startICCtrl <- list()
     startICCtrl[["withMakeIC"]] <- if(!missing(withMakeIC)) withMakeIC else FALSE
     startICCtrl[["withEvalAsVar"]] <- if(!missing(withEvalAsVar)) withEvalAsVar else NULL
     startICCtrl[["modifyICwarn"]] <- if(!missing(modifyICwarn)) modifyICwarn else FALSE
     startICCtrl[["E.argList"]] <- if(!missing(E.argList)) E.argList else NULL
 
-
     startCtrl <- list()
     if(!missing(initial.est)) startCtrl[["initial.est"]] <- initial.est
     if(!missing(initial.est.ArgList))
@@ -136,16 +137,20 @@
            startCtrl = startCtrl, startICCtrl = startICCtrl,
            kStepCtrl = kStepCtrl, na.rm = na.rm, ...,
            debug = ..withCheck,
-           withTimings = withTimings)
+           withTimings = withTimings, diagnostic = diagnostic)
     retV at robestCall <- quote(retV at estimate.call)
     retV at estimate.call <- mc
     tim <- attr(retV,"timings")
     timK <- attr(retV,"kStepTimings")
+    diagn <-  attr(retV,"diagnostic")
+    kStpDiagn <- attr(retV,"kStepDiagnostic")
 
     retV <- as(as(retV,"kStepEstimate"), "ORobEstimate")
     retV <- .checkEstClassForParamFamily(L2Fam,retV)
     attr(retV,"timings") <- tim
     attr(retV,"kStepTimings") <- timK
+    attr(retV,"diagnostic") <- diagn
+    attr(retV,"kStepDiagnostic") <- kStpDiagn
     retV at roptestCall <- mc
     return(retV)
 }
@@ -162,7 +167,7 @@
                     startICCtrl = genstartICCtrl(),
                     kStepCtrl = genkStepCtrl(),
                     na.rm = TRUE, ..., debug = FALSE,
-                    withTimings = FALSE){
+                    withTimings = FALSE, diagnostic = FALSE){
 
 
 #### TOBEDONE: set default for risk depending on L2Fam,
@@ -205,6 +210,7 @@
     withMakeICkStep <- kStepCtrl$withMakeIC
     if(is.null(withMakeICkStep)) withMakeICkStep <- FALSE
 
+    diagn <- if(diagnostic) list() else NULL
 
     es.list <- as.list(es.call0[-1])
     es.list <- c(es.list,nbCtrl)
@@ -253,7 +259,8 @@
                   nms <- names(startCtrl$E.arglist)
                   for(nmi in nms) argListMDE[[nmi]] <- startCtrl$E.arglist[[nmi]]
                }
-               startCtrl$initial.est <- do.call(MDEstimator, argListMDE)
+               startCtrl$initial.est <- buf <- do.call(MDEstimator, argListMDE)
+               if(diagnostic) diagn[["startEst"]] <- attr(buf,"diagnostic")
          }
       }
     }
@@ -301,6 +308,7 @@
     if(!debug){
        main(newParam)[] <- as.numeric(initial.est)
        L2FamStart <- modifyModel(L2Fam, newParam)
+       if(diagnostic) diagn[["modifyModel"]] <- attr(L2FamStart,"diagnostic")
     }
     if(debug) print(risk)
 
@@ -343,6 +351,7 @@
            for(nmi in nms) getStartICArgList[[nmi]] <- startICCtrl$E.arglist[[nmi]]
        }
        ICstart <- do.call(getStartIC, args=getStartICArgList)
+       if(diagnostic) diagn[["ICstart"]] <- attr(ICstart,"diagnostic")
      })
      if (withTimings) print(sy.getStartIC)
      }
@@ -380,6 +389,7 @@
          res <- do.call(kStepEstimator, kStepArgList)
                             })
        sy.OnlykStep <- attr(res,"timings")
+       kStpDiagn <- attr(res,"diagnostic")
        if (withTimings) print(sy.kStep)
        if (withTimings && !is.null(sy.OnlykStep)) print(sy.OnlykStep)
     if(!debug){
@@ -413,5 +423,7 @@
     res at start <- initial.est
     attr(res, "timings") <- sy
     attr(res, "kStepTimings") <- sy.OnlykStep
+    if(diagnostic) attr(res,"kStepDiagnostic") <- kStpDiagn
+    if(diagnostic) attr(res,"diagnostic") <- diagn
     return(res)
 }

Modified: branches/robast-1.2/pkg/ROptEst/inst/NEWS
===================================================================
--- branches/robast-1.2/pkg/ROptEst/inst/NEWS	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/inst/NEWS	2018-08-16 18:39:45 UTC (rev 1156)
@@ -24,12 +24,16 @@
   and start.Par and the different steps done in roptest 
 + the input generators genkStepCtrl, genstartCtrl, genstartICCtrl gain argument
   E.argList to pass on arguments to E()
-+ roptest gains an argument E.argList for arguments to be passed to E() from (a) 
-  \code{MDEstimator} (here this additional argument is only used if \code{initial.est}  
-   is missing), (b) \code{getStartIC}, and (c) \code{kStepEstimator}. Potential clashes with
-   arguments of the same name in \code{\dots} are resolved by inserting the items of argument 
-   list \code{E.argList} as named items, so in case of collisions the item of \code{E.argList} 
-   overwrites the existing one from \code{\dots}.
++ roptest and the wrappers RMX|OBR|MBR|OMSEstimator gain an argument E.argList for arguments 
+  to be passed to E() from (a) \code{MDEstimator} (here this additional argument is only 
+   used if \code{initial.est}  is missing), (b) \code{getStartIC}, and (c) \code{kStepEstimator}. 
+   Potential clashes with arguments of the same name in \code{\dots} are resolved by inserting 
+   the items of argument list \code{E.argList} as named items, so in case of collisions the 
+   item of \code{E.argList} overwrites the existing one from \code{\dots}.
++ roptest and its wrappers RMX|OBR|MBR|OMSEstimator, getStartIC for asGRisk, asBias, RMX, and
+  asAnscombe, as well as the particular checkIC/makeIC methods for ContIC gain argument 
+  diagnostic to be able to show diagnostic information on integrations; this information 
+  (if argument "diagnostic" is TRUE) is stored in attribute "diagnostic" of the return value
 
 bug fixes
 
@@ -65,8 +69,8 @@
   geInfGamma, getInfRad, getInfClip, getInfCent, getInfStand, getInfV, getAsRisk, getReq,
   (at least as far as multivariate ICs are concerned), .LowerCaseMultivariate, getMaxIneff, 
   getInfRad, getLagrangeMultByIter and getLagrangeMultByOptim
-+ new internal helper function .filterEarg by means of constant ..IntegrateArgs (exported 
-  from package RobAStBase) is used to filter out arguments from dots which are meant for E() 
++ new internal helper function .filterEargWEargList is used to filter out arguments 
+  from dots which are meant for E() 
 + the local .modifyIC0 functions only used to produce the new IC but not for filling
   slot modifyIC loose argument withMakeIC (and dots) -- this is now done in the outer
   modifyIC function
@@ -77,6 +81,7 @@
   than in the default method. This can be overriden by argument forceContICMethod. 
 + the particular checkIC and makeIC methods gain argument diagnostic to be able to 
   show diagnostic information on integrations
+  
 
 #######################################
 version 1.1

Modified: branches/robast-1.2/pkg/ROptEst/man/RMXEOMSEMBREOBRE.Rd
===================================================================
--- branches/robast-1.2/pkg/ROptEst/man/RMXEOMSEMBREOBRE.Rd	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/man/RMXEOMSEMBREOBRE.Rd	2018-08-16 18:39:45 UTC (rev 1156)
@@ -19,7 +19,8 @@
              withPICList = getRobAStBaseOption("withPICList"), na.rm = TRUE,
              initial.est.ArgList, ..., withLogScale = TRUE, ..withCheck=FALSE,
              withTimings = FALSE, withMDE = NULL, withEvalAsVar = NULL,
-             withMakeIC = FALSE, modifyICwarn = NULL)
+             withMakeIC = FALSE, modifyICwarn = NULL, E.argList = NULL,
+             diagnostic = FALSE)
 OMSEstimator(x, L2Fam, eps=0.5, fsCor = 1, initial.est, neighbor = ContNeighborhood(),
              steps = 1L, distance = CvMDist, startPar = NULL, verbose = NULL,
              OptOrIter = "iterate", useLast = getRobAStBaseOption("kStepUseLast"),
@@ -29,7 +30,8 @@
              withPICList = getRobAStBaseOption("withPICList"), na.rm = TRUE,
              initial.est.ArgList, ..., withLogScale = TRUE, ..withCheck=FALSE,
              withTimings = FALSE, withMDE = NULL, withEvalAsVar = NULL,
-             withMakeIC = FALSE, modifyICwarn = NULL)
+             withMakeIC = FALSE, modifyICwarn = NULL, E.argList = NULL,
+             diagnostic = FALSE)
 OBREstimator(x, L2Fam, eff=0.95, fsCor = 1, initial.est, neighbor = ContNeighborhood(),
              steps = 1L, distance = CvMDist, startPar = NULL, verbose = NULL,
              OptOrIter = "iterate", useLast = getRobAStBaseOption("kStepUseLast"),
@@ -39,7 +41,8 @@
              withPICList = getRobAStBaseOption("withPICList"), na.rm = TRUE,
              initial.est.ArgList, ..., withLogScale = TRUE, ..withCheck=FALSE,
              withTimings = FALSE, withMDE = NULL, withEvalAsVar = NULL,
-             withMakeIC = FALSE, modifyICwarn = NULL)
+             withMakeIC = FALSE, modifyICwarn = NULL, E.argList = NULL,
+             diagnostic = FALSE)
 MBREstimator(x, L2Fam, fsCor = 1, initial.est, neighbor = ContNeighborhood(),
              steps = 1L, distance = CvMDist, startPar = NULL, verbose = NULL,
              OptOrIter = "iterate", useLast = getRobAStBaseOption("kStepUseLast"),
@@ -49,7 +52,8 @@
              withPICList = getRobAStBaseOption("withPICList"), na.rm = TRUE,
              initial.est.ArgList, ..., withLogScale = TRUE, ..withCheck=FALSE,
              withTimings = FALSE, withMDE = NULL, withEvalAsVar = NULL,
-             withMakeIC = FALSE, modifyICwarn = NULL)
+             withMakeIC = FALSE, modifyICwarn = NULL, E.argList = NULL,
+             diagnostic = FALSE)
 }
 \arguments{
   \item{x}{ sample }
@@ -123,6 +127,19 @@
      \code{modifyIC} is applied and hence some optimality information could
      no longer be valid? Defaults to \code{NULL} in which case this value
      is taken from \code{RobAStBaseOptions}.}
+  \item{E.argList}{\code{NULL} (default) or a list of arguments to be passed
+                   to calls to \code{E} from (a) \code{MDEstimator}
+                   (here this additional argument is only used if
+                   \code{initial.est} is missing), (b) \code{getStartIC},
+                   and (c) \code{kStepEstimator}. Potential clashes with
+        arguments of the same name in \code{\dots} are resolved by inserting
+        the items of argument list \code{E.argList} as named items, so
+        in case of collisions the item of \code{E.argList} overwrites the
+        existing one from \code{\dots}.}
+  \item{diagnostic}{ logical; if \code{TRUE},
+    diagnostic information on the performed integrations is gathered and
+    shipped out as an attribute \code{diagnostic} of the return value
+    of the estimators. }
 }
 \details{
   The functions compute optimally robust estimator for a given L2 differentiable

Modified: branches/robast-1.2/pkg/ROptEst/man/checkmakeIC.Rd
===================================================================
--- branches/robast-1.2/pkg/ROptEst/man/checkmakeIC.Rd	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/man/checkmakeIC.Rd	2018-08-16 18:39:45 UTC (rev 1156)
@@ -41,7 +41,8 @@
   \code{E}. }
   \item{diagnostic}{ logical; if \code{TRUE} (and in case \code{checkIC} if
       argument \code{out==TRUE}), diagnostic information on the integration
-      is printed. }
+      is printed and returned as attribute \code{diagnostic} of the return value. }
+
 }
 \details{ 
   In \code{checkIC}, the precisions of the centering and the Fisher consistency

Modified: branches/robast-1.2/pkg/ROptEst/man/getStartIC-methods.Rd
===================================================================
--- branches/robast-1.2/pkg/ROptEst/man/getStartIC-methods.Rd	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/man/getStartIC-methods.Rd	2018-08-16 18:39:45 UTC (rev 1156)
@@ -21,16 +21,16 @@
 \S4method{getStartIC}{ANY,ANY}(model, risk, ...)
 \S4method{getStartIC}{L2ParamFamily,asGRisk}(model, risk, ...,
                       withEvalAsVar = TRUE, withMakeIC = FALSE, ..debug=FALSE,
-                      modifyICwarn = NULL)
+                      modifyICwarn = NULL, diagnostic = FALSE)
 \S4method{getStartIC}{L2ParamFamily,asBias}(model, risk, ..., withMakeIC = FALSE,
-        ..debug=FALSE, modifyICwarn = NULL)
+        ..debug=FALSE, modifyICwarn = NULL, diagnostic = FALSE)
 \S4method{getStartIC}{L2ParamFamily,asCov}(model, risk, ..., withMakeIC = FALSE,
     ..debug=FALSE)
 \S4method{getStartIC}{L2ParamFamily,trAsCov}(model, risk, ..., withMakeIC = FALSE,
     ..debug=FALSE)
 \S4method{getStartIC}{L2ParamFamily,asAnscombe}(model, risk, ...,
                       withEvalAsVar = TRUE, withMakeIC = FALSE, ..debug=FALSE,
-                      modifyICwarn = NULL)
+                      modifyICwarn = NULL, diagnostic = FALSE)
 \S4method{getStartIC}{L2LocationFamily,interpolRisk}(model, risk, ...)
 \S4method{getStartIC}{L2ScaleFamily,interpolRisk}(model, risk, ...)
 \S4method{getStartIC}{L2LocationScaleFamily,interpolRisk}(model, risk, ...)
@@ -50,6 +50,10 @@
      \code{modifyIC} is applied and hence some optimality information could
      no longer be valid? Defaults to \code{NULL} in which case this value
      is taken from \code{RobAStBaseOptions}.}
+  \item{diagnostic}{ logical; if \code{TRUE},
+    diagnostic information on the performed integrations is gathered and
+    shipped out as an attribute \code{diagnostic} of the return value
+    of the estimators. }
 }
 \section{Methods}{\describe{
 \item{getStartIC}{\code{signature(model = "ANY", risk = "ANY")}:

Modified: branches/robast-1.2/pkg/ROptEst/man/robest.Rd
===================================================================
--- branches/robast-1.2/pkg/ROptEst/man/robest.Rd	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/man/robest.Rd	2018-08-16 18:39:45 UTC (rev 1156)
@@ -10,7 +10,7 @@
         verbose = NULL, OptOrIter = "iterate", nbCtrl = gennbCtrl(),
         startCtrl = genstartCtrl(), startICCtrl = genstartICCtrl(),
         kStepCtrl = genkStepCtrl(), na.rm = TRUE, ..., debug = FALSE,
-        withTimings = FALSE)
+        withTimings = FALSE, diagnostic = FALSE)
 }
 \arguments{
   \item{x}{ sample }
@@ -47,6 +47,11 @@
    timings for the three steps evaluating the starting value, finding
    the starting influence curve, and evaluating the k-step estimator is
    issued.}
+  \item{diagnostic}{ logical; if \code{TRUE},
+    diagnostic information on the performed integrations is gathered and
+    shipped out as attributes \code{kStepDiagnostic} (for the kStepEstimator-step)
+    and \code{diagnostic} for the remaining steps of the return value
+    of \code{robest}. }
 }
 \details{
   A new, more structured interface to the former function \code{\link{roptest}}.

Modified: branches/robast-1.2/pkg/ROptEst/man/roptest.Rd
===================================================================
--- branches/robast-1.2/pkg/ROptEst/man/roptest.Rd	2018-08-16 18:20:34 UTC (rev 1155)
+++ branches/robast-1.2/pkg/ROptEst/man/roptest.Rd	2018-08-16 18:39:45 UTC (rev 1156)
@@ -19,7 +19,7 @@
         na.rm = TRUE, initial.est.ArgList, ...,
         withLogScale = TRUE, ..withCheck = FALSE, withTimings = FALSE,
         withMDE = NULL, withEvalAsVar = NULL, withMakeIC = FALSE,
-        modifyICwarn = NULL, E.argList = NULL)
+        modifyICwarn = NULL, E.argList = NULL, diagnostic = FALSE)
 roptest.old(x, L2Fam, eps, eps.lower, eps.upper, fsCor = 1, initial.est,
         neighbor = ContNeighborhood(), risk = asMSE(), steps = 1L,
         distance = CvMDist, startPar = NULL, verbose = NULL,
@@ -116,6 +116,11 @@
         the items of argument list \code{E.argList} as named items, so
         in case of collisions the item of \code{E.argList} overwrites the
         existing one from \code{\dots}.}
+  \item{diagnostic}{ logical; if \code{TRUE},
+    diagnostic information on the performed integrations is gathered and
+    shipped out as attributes \code{kStepDiagnostic} (for the kStepEstimator-step)
+    and \code{diagnostic} for the remaining steps of the return value
+    of \code{roptest}. }
 }
 \details{
   Computes the optimally robust estimator for a given L2 differentiable
@@ -198,6 +203,7 @@
   Timings for the steps run through in \code{roptest} are available
   in attributes \code{timings}, and for the step of the
   \code{kStepEstimator} in \code{kStepTimings}.
+
 }
 \value{Object of class \code{"kStepEstimate"}.  In addition, it has
        an attribute \code{"timings"} where computation time is stored.}



More information about the Robast-commits mailing list