[Robast-commits] r123 - branches/robast-0.6/pkg/ROptEst/R

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

Author: stamats
Date: 2008-07-24 16:59:51 +0200 (Thu, 24 Jul 2008)
New Revision: 123

Modified:
   branches/robast-0.6/pkg/ROptEst/R/getFixRobIC_fiUnOvShoot.R
   branches/robast-0.6/pkg/ROptEst/R/getInfRobIC_asUnOvShoot.R
Log:
adaption to new implementation which uses weights

Modified: branches/robast-0.6/pkg/ROptEst/R/getFixRobIC_fiUnOvShoot.R
===================================================================
--- branches/robast-0.6/pkg/ROptEst/R/getFixRobIC_fiUnOvShoot.R	2008-07-24 14:04:03 UTC (rev 122)
+++ branches/robast-0.6/pkg/ROptEst/R/getFixRobIC_fiUnOvShoot.R	2008-07-24 14:59:51 UTC (rev 123)
@@ -29,9 +29,16 @@
         a <- -A*c0
         b <- 2*A*c0
 
+        w <- new("BdStWeight")
+        clip(w) <- c(0,b)+a
+        stand(w) <- as.matrix(A)
+        weight(w) <- getweight(w, neighbor = TotalVarNeighborhood(radius = neighbor at radius), 
+                               biastype = symmetricBias(), normW = NormType())
+
         Risk <- getFiRisk(risk = risk, Distr = Distr, neighbor = neighbor, 
                           clip = c0, stand = A, sampleSize = sampleSize, 
                           Algo = Algo, cont = cont)
 
-        return(list(A = as.matrix(A), a = a, b = b, d = NULL, risk = Risk, info = info))    
+        return(list(A = as.matrix(A), a = a, b = b, d = NULL, risk = Risk, info = info, w = w,
+                    biastype = symmetricBias(), normtype = NormType()))
     })

Modified: branches/robast-0.6/pkg/ROptEst/R/getInfRobIC_asUnOvShoot.R
===================================================================
--- branches/robast-0.6/pkg/ROptEst/R/getInfRobIC_asUnOvShoot.R	2008-07-24 14:04:03 UTC (rev 122)
+++ branches/robast-0.6/pkg/ROptEst/R/getInfRobIC_asUnOvShoot.R	2008-07-24 14:59:51 UTC (rev 123)
@@ -124,9 +124,17 @@
                      biastype = biastype, clip = c0, cent = z, trafo = trafo)
         a <- as.vector(A)*z
         b <- abs(as.vector(A))*c0
+
+        w <- new("BdStWeight")
+        clip(w) <- c(0,b)+a
+        stand(w) <- A
+        weight(w) <- getweight(w, neighbor = TotalVarNeighborhood(radius = neighbor at radius), 
+                               biastype = biastype, normW = normtype(risk))
+
         Risk <- getAsRisk(risk = risk, L2deriv = L2deriv, neighbor = neighbor, 
                           biastype = biastype, clip = b, cent = a, stand = A, 
                           trafo = trafo)
 
-        return(list(A = A, a = a, b = b, d = NULL, risk = Risk, info = info))    
+        return(list(A = A, a = a, b = b, d = NULL, risk = Risk, info = info, w = w,
+                    biastype = biastype, normtype = normtype(risk)))
     })