[Robast-commits] r112 - in branches/robast-0.6/pkg: ROptEst/R RobAStBase/R

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

Author: stamats
Date: 2008-07-22 14:44:39 +0200 (Tue, 22 Jul 2008)
New Revision: 112

Modified:
   branches/robast-0.6/pkg/ROptEst/R/getRiskIC.R
   branches/robast-0.6/pkg/RobAStBase/R/getRiskIC.R
Log:
some minor changes

Modified: branches/robast-0.6/pkg/ROptEst/R/getRiskIC.R
===================================================================
--- branches/robast-0.6/pkg/ROptEst/R/getRiskIC.R	2008-07-21 14:11:37 UTC (rev 111)
+++ branches/robast-0.6/pkg/ROptEst/R/getRiskIC.R	2008-07-22 12:44:39 UTC (rev 112)
@@ -15,7 +15,7 @@
                                  neighbor = "missing",
                                  L2Fam = "L2ParamFamily"),
     function(IC, risk, L2Fam){
-        Cov <- IC at Risks[["asCov"]]  ; print(L2Fam)      
+        Cov <- IC at Risks[["asCov"]]
         return(list(asCov = list(distribution = .getDistr(L2Fam), value = Cov)))
     })
 
@@ -26,9 +26,9 @@
 setMethod("getBiasIC", signature(IC = "HampIC",
                                  neighbor = "UncondNeighborhood"),
     function(IC, neighbor, L2Fam,...){
-        if(missing(L2Fam)) 
-           {misF <- TRUE; 
-            L2Fam <- eval(IC at CallL2Fam)}
+        if(missing(L2Fam))
+            L2Fam <- eval(IC at CallL2Fam)
+
         return(list(asBias = list(distribution = .getDistr(L2Fam), 
                     neighborhood = neighbor at type, value = IC at Risks$asBias$value)))
     })

Modified: branches/robast-0.6/pkg/RobAStBase/R/getRiskIC.R
===================================================================
--- branches/robast-0.6/pkg/RobAStBase/R/getRiskIC.R	2008-07-21 14:11:37 UTC (rev 111)
+++ branches/robast-0.6/pkg/RobAStBase/R/getRiskIC.R	2008-07-22 12:44:39 UTC (rev 112)
@@ -52,8 +52,8 @@
         if(dimension(Domain(IC at Curve[[1]])) != dimension(img(L2Fam at distribution)))
             stop("dimension of 'Domain' of 'Curve' != dimension of 'img' of 'distribution' of 'L2Fam'")
 
-        trCov <- getRiskIC(IC, risk = asCov(), L2Fam = L2Fam)$trCov        
-        trCov$value <- sum(diag(std %*% trCov$value))
+        trCov <- getRiskIC(IC, risk = asCov(), L2Fam = L2Fam)$asCov
+        trCov$value <- sum(diag(trCov$value))
 
         prec <- checkIC(IC, L2Fam, out = FALSE)
         if(prec > tol)