[Robast-commits] r1164 - branches/robast-1.2/pkg/RobAStBase/R

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

Author: ruckdeschel
Date: 2018-08-19 01:35:03 +0200 (Sun, 19 Aug 2018)
New Revision: 1164

Modified:
   branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R
   branches/robast-1.2/pkg/RobAStBase/R/kStepEstimator.R
Log:
[RobAStBase] branch 1.2
+ some unwanted attributes deleted in checkIC
+ some cleaning in prints there
+ in kStepEstimator.R we now call getRiskIC makeIC and getboundedIC with explicit argument diagnostics

Modified: branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R	2018-08-18 21:32:10 UTC (rev 1163)
+++ branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R	2018-08-18 23:35:03 UTC (rev 1164)
@@ -66,11 +66,13 @@
         res <- .preparedirectCheckMakeIC(L2Fam, IC, ..., diagnostic = diagnostic)
 
         cent <- res$E.IC
+        attr(cent,"diagnostic") <- NULL
         if(out)
             cat("precision of centering:\t", cent, "\n")
 
 
         consist <- res$E.IC.L - trafo
+        attr(consist,"diagnostic") <- NULL
 
         if(out){
             cat("precision of Fisher consistency:\n")
@@ -83,8 +85,8 @@
         names(prec) <- "maximum deviation"
 
         if(diagnostic && out){
-           print(attr(res$E.IC,"diagnostic"))
-           print(attr(res$E.IC.L,"diagnostic"))
+           print(attr(res$E.IC,"diagnostic"),xname="E.IC")
+           print(attr(res$E.IC.L,"diagnostic"),xname="E.IC.L")
         }
 
         if(diagnostic){
@@ -114,8 +116,8 @@
         res <- .preparedirectCheckMakeIC(L2Fam, IC, ..., diagnostic = diagnostic)
 
         if(diagnostic){
-           print(attr(res$E.IC,"diagnostic"))
-           print(attr(res$E.IC.L,"diagnostic"))
+           print(attr(res$E.IC,"diagnostic"), xname="E.IC")
+           print(attr(res$E.IC.L,"diagnostic"), xname="E.IC.L")
         }
 
         IC1 <- as(diag(dimension(IC at Curve)) %*% IC at Curve, "EuclRandVariable")
@@ -195,10 +197,10 @@
         mc0$Curve <- EuclRandVarList(RealRandVariable(Map = list(IC.1),
                          Domain = Reals()))
         mc0$CallL2Fam <- substitute(L2Fam at fam.call)
-        print(mc0)
+#        print(mc0)
 
         IC.0 <- do.call(.IC,mc0)
-        print(IC.0)
+#        print(IC.0)
         if(forceIC) IC.0 <- makeIC(IC.0, L2Fam,...)
         return(IC.0)
     })

Modified: branches/robast-1.2/pkg/RobAStBase/R/kStepEstimator.R
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/R/kStepEstimator.R	2018-08-18 21:32:10 UTC (rev 1163)
+++ branches/robast-1.2/pkg/RobAStBase/R/kStepEstimator.R	2018-08-18 23:35:03 UTC (rev 1164)
@@ -202,7 +202,7 @@
                    sytm <<- .addTime(sytm,mmPreICNm)
                    if(diagnostic) diagn[[mmPreICNm]] <<- attr(IC,"diagnostic")
                    if(steps==1L && withMakeIC){
-                      makeICargs <- c(list(IC, L2Fam),E.argList)
+                      makeICargs <- list(IC, L2Fam, diagnostic=diagnostic, E.argList=E.argList)
                       IC <- do.call(makeIC, makeICargs)
                       mmPreMkICNm <- paste("modifyIC-makeIC-",updStp)
                       sytm <<- .addTime(sytm,mmPreMkICNm)
@@ -231,7 +231,7 @@
                             if(!is.null(IC.UpdateInKer)&&!is(IC.UpdateInKer,"IC"))
                                warning("'IC.UpdateInKer' is not of class 'IC'; we use default instead.")
                             if(is.null(IC.UpdateInKer)){
-                                 getBoundedICargs <- c(list(L2Fam, D = projker),E.argList)
+                                 getBoundedICargs <- list(L2Fam, D = projker, diagnostic=diagnostic,E.argList=E.argList)
                                  IC.tot2 <- do.call(getBoundedIC, getBoundedICargs)
                                  mmgtBDICNm <- paste("getBoundedIC-",updStp)
                                  sytm <<- .addTime(sytm,mmgtBDICNm)
@@ -359,7 +359,7 @@
                   IC <- upd$IC
                   L2Fam <- upd$L2Fam
                   if((i==steps)&&withMakeIC){
-                      makeICargs <- c(list(IC, L2Fam),E.argList)
+                      makeICargs <- list(IC, L2Fam, diagnostic=diagnostic, E.argList=E.argList)
                       IC <- do.call(makeIC, makeICargs)
                       mkICnm <- paste("makeIC-",i)
                       sytm <- .addTime(sytm,mkICnm)
@@ -402,7 +402,7 @@
               Infos <- rbind(Infos, c("kStepEstimator",
                "computation of IC, trafo, asvar and asbias via useLast = TRUE"))
               if(withMakeIC){
-                  makeICargs <- c(list(IC, L2Fam),E.argList)
+                  makeICargs <- list(IC, L2Fam, diagnostic=diagnostic, E.argList=E.argList)
                   IC <- do.call(makeIC, makeICargs)
                   mkICULnm <- paste("makeIC-useLast")
                   sytm <- .addTime(sytm,mkICULnm)
@@ -450,7 +450,8 @@
               asVar <- if(is.matrix(Risks(IC)$asCov) || length(Risks(IC)$asCov) == 1)
                        Risks(IC)$asCov else Risks(IC)$asCov$value
            }else{
-                getRiskICasVarArgs <- c(list(IC, risk = asCov(), withCheck = FALSE),E.argList)
+                getRiskICasVarArgs <- list(IC, risk = asCov(), withCheck = FALSE,
+                                        diagnostic=diagnostic, E.argList = E.argList)
                 riskAsVar <- do.call(getRiskIC, getRiskICasVarArgs)
                 asVar <- riskAsVar$asCov$value
                 sytm <- .addTime(sytm,"getRiskIC-Var")