[Robast-commits] r1027 - in branches/robast-1.1/pkg/ROptEst: R man

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

Author: ruckdeschel
Date: 2018-07-23 21:41:52 +0200 (Mon, 23 Jul 2018)
New Revision: 1027

Modified:
   branches/robast-1.1/pkg/ROptEst/R/getRiskIC.R
   branches/robast-1.1/pkg/ROptEst/R/roptest.new.R
   branches/robast-1.1/pkg/ROptEst/man/getRiskIC.Rd
Log:
[ROptEst] branch 1.1 
+ getRiskIC and getBiasIC gain argument withCheck to speed up things if one does not want to call checkIC 
+ bugfix: argument withMakeIC was not correctly used in roptest.new 


Modified: branches/robast-1.1/pkg/ROptEst/R/getRiskIC.R
===================================================================
--- branches/robast-1.1/pkg/ROptEst/R/getRiskIC.R	2018-07-23 19:15:16 UTC (rev 1026)
+++ branches/robast-1.1/pkg/ROptEst/R/getRiskIC.R	2018-07-23 19:41:52 UTC (rev 1027)
@@ -5,16 +5,16 @@
                                  risk = "asCov",
                                  neighbor = "missing",
                                  L2Fam = "missing"),
-    function(IC, risk){
+    function(IC, risk, withCheck= TRUE){
         L2Fam <- force(eval(IC at CallL2Fam))
-        getRiskIC(IC = IC, risk = risk, L2Fam = L2Fam)
+        getRiskIC(IC = IC, risk = risk, L2Fam = L2Fam, withCheck= withCheck)
     })
 
 setMethod("getRiskIC", signature(IC = "HampIC", 
                                  risk = "asCov",
                                  neighbor = "missing",
                                  L2Fam = "L2ParamFamily"),
-    function(IC, risk, L2Fam){
+    function(IC, risk, L2Fam, withCheck= TRUE){
         Cov <- eval(IC at Risks[["asCov"]])
         if(is.null(Cov)){
            if(numberOfMaps(L2Fam at L2deriv)==1){ ## L2derivDim <- L2Fam at L2deriv
@@ -28,7 +28,7 @@
               return(list(asCov = list(distribution = .getDistr(L2Fam),
                           value = Cov)))
             }
-            return(getRiskIC(as(IC, "IC"), risk = risk, L2Fam = L2Fam))
+            return(getRiskIC(as(IC, "IC"), risk = risk, L2Fam = L2Fam, withCheck= withCheck))
         }else
             return(list(asCov = list(distribution = .getDistr(L2Fam), value = Cov)))
     })

Modified: branches/robast-1.1/pkg/ROptEst/R/roptest.new.R
===================================================================
--- branches/robast-1.1/pkg/ROptEst/R/roptest.new.R	2018-07-23 19:15:16 UTC (rev 1026)
+++ branches/robast-1.1/pkg/ROptEst/R/roptest.new.R	2018-07-23 19:41:52 UTC (rev 1027)
@@ -170,7 +170,7 @@
 
     withEvalAsVar <- kStepCtrl$withEvalAsVar
     if(is.null(withEvalAsVar)) withEvalAsVar <- L2Fam at .withEvalAsVar
-    withMakeIC <- kStepCtrl$MakeIC
+    withMakeIC <- kStepCtrl$withMakeIC
     if(is.null(withMakeIC)) withMakeIC <- FALSE
 
 

Modified: branches/robast-1.1/pkg/ROptEst/man/getRiskIC.Rd
===================================================================
--- branches/robast-1.1/pkg/ROptEst/man/getRiskIC.Rd	2018-07-23 19:15:16 UTC (rev 1026)
+++ branches/robast-1.1/pkg/ROptEst/man/getRiskIC.Rd	2018-07-23 19:41:52 UTC (rev 1027)
@@ -13,9 +13,9 @@
 \usage{
 getRiskIC(IC, risk, neighbor, L2Fam, ...)
 
-\S4method{getRiskIC}{HampIC,asCov,missing,missing}(IC, risk)
+\S4method{getRiskIC}{HampIC,asCov,missing,missing}(IC, risk, withCheck= TRUE)
 
-\S4method{getRiskIC}{HampIC,asCov,missing,L2ParamFamily}(IC, risk, L2Fam)
+\S4method{getRiskIC}{HampIC,asCov,missing,L2ParamFamily}(IC, risk, L2Fam, withCheck= TRUE)
 \S4method{getRiskIC}{TotalVarIC,asCov,missing,L2ParamFamily}(IC, risk, L2Fam)
 
 }
@@ -25,6 +25,8 @@
   \item{neighbor}{ object of class \code{"Neighborhood"}; missing in the methods described here. }
   \item{\dots}{ additional parameters }
   \item{L2Fam}{ object of class \code{"L2ParamFamily"}. }
+  \item{withCheck}{logical: should a call to \code{checkIC} be done to
+                   check accuracy (defaults to \code{TRUE}).}
 }
 \details{To make sure that the results are valid, it is recommended
   to include an additional check of the IC properties of \code{IC}