[Robast-commits] r417 - branches/robast-0.8/pkg/ROptEst/R

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

Author: ruckdeschel
Date: 2010-09-03 00:42:52 +0200 (Fri, 03 Sep 2010)
New Revision: 417

Modified:
   branches/robast-0.8/pkg/ROptEst/R/getAsRisk.R
Log:
ROptEst: oops forgot to commit some changes

Modified: branches/robast-0.8/pkg/ROptEst/R/getAsRisk.R
===================================================================
--- branches/robast-0.8/pkg/ROptEst/R/getAsRisk.R	2010-09-02 22:39:14 UTC (rev 416)
+++ branches/robast-0.8/pkg/ROptEst/R/getAsRisk.R	2010-09-02 22:42:52 UTC (rev 417)
@@ -365,11 +365,7 @@
         else{
              s <- getInfV(L2deriv, neighbor, biastype, clip, cent, stand)
              r <- neighbor at radius
-             b <- r*clip
-             w <- b/s^.5
-             pp <- 2*pnorm(w)-1
-             dp <- 2*dnorm(w)
-             L1 <- b*pp+s^.5*dp
+             L1 <- get.asGRisk.fct(risk)(r,s=s^.5,b=clip)
         }
         return(list(asL1 = L1))
     })
@@ -385,10 +381,9 @@
         if(!is.finite(neighbor at radius))
             L4 <- Inf
         else{
-              s <- getInfV(L2deriv, neighbor, biastype, clip, cent, stand)
-              r <- neighbor at radius
-              b <- r*clip
-              L4 <- 3*s^2+6*s*b^2+b^4
+             s <- getInfV(L2deriv, neighbor, biastype, clip, cent, stand)
+             r <- neighbor at radius
+             L4 <- get.asGRisk.fct(risk)(r,s=s^.5,b=clip)
         }
         return(list(asL4 = L4))
     })