[Robast-commits] r326 - in branches/robast-0.7/pkg/ROptEst: . R man

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

Author: stamats
Date: 2009-07-16 09:49:47 +0200 (Thu, 16 Jul 2009)
New Revision: 326

Modified:
   branches/robast-0.7/pkg/ROptEst/DESCRIPTION
   branches/robast-0.7/pkg/ROptEst/R/cniperCont.R
   branches/robast-0.7/pkg/ROptEst/man/0ROptEst-package.Rd
Log:
cniper contamination now also available for partial ICs

Modified: branches/robast-0.7/pkg/ROptEst/DESCRIPTION
===================================================================
--- branches/robast-0.7/pkg/ROptEst/DESCRIPTION	2009-07-15 14:24:08 UTC (rev 325)
+++ branches/robast-0.7/pkg/ROptEst/DESCRIPTION	2009-07-16 07:49:47 UTC (rev 326)
@@ -1,6 +1,6 @@
 Package: ROptEst
 Version: 0.7
-Date: 2009-07-15
+Date: 2009-07-16
 Title: Optimally robust estimation
 Description: Optimally robust estimation in general smoothly
         parameterized models using S4 classes and methods.

Modified: branches/robast-0.7/pkg/ROptEst/R/cniperCont.R
===================================================================
--- branches/robast-0.7/pkg/ROptEst/R/cniperCont.R	2009-07-15 14:24:08 UTC (rev 325)
+++ branches/robast-0.7/pkg/ROptEst/R/cniperCont.R	2009-07-16 07:49:47 UTC (rev 326)
@@ -32,7 +32,8 @@
                                    neighbor = "ContNeighborhood",
                                    risk = "asMSE"),
     function(L2Fam, neighbor, risk, lower, upper){
-        tr.invF <- sum(diag(solve(FisherInfo(L2Fam))))
+        D <- trafo(L2Fam at param)
+        tr.invF <- sum(diag(D %*% solve(FisherInfo(L2Fam)) %*% t(D)))
         psi <- optIC(model = L2Fam, risk = asCov())
         robMod <- InfRobModel(center = L2Fam, neighbor = neighbor)
         eta <- optIC(model = robMod, risk = asMSE())
@@ -50,7 +51,8 @@
                                    neighbor = "ContNeighborhood",
                                    risk = "asMSE"),
     function(L2Fam, neighbor, risk, lower, upper, n = 101){
-        tr.invF <- sum(diag(solve(FisherInfo(L2Fam))))
+        D <- trafo(L2Fam at param)
+        tr.invF <- sum(diag(D %*% solve(FisherInfo(L2Fam)) %*% t(D)))
         psi <- optIC(model = L2Fam, risk = asCov())
         robMod <- InfRobModel(center = L2Fam, neighbor = neighbor)
         eta <- optIC(model = robMod, risk = asMSE())

Modified: branches/robast-0.7/pkg/ROptEst/man/0ROptEst-package.Rd
===================================================================
--- branches/robast-0.7/pkg/ROptEst/man/0ROptEst-package.Rd	2009-07-15 14:24:08 UTC (rev 325)
+++ branches/robast-0.7/pkg/ROptEst/man/0ROptEst-package.Rd	2009-07-16 07:49:47 UTC (rev 326)
@@ -13,7 +13,7 @@
 \tabular{ll}{
 Package: \tab ROptEst\cr
 Version: \tab 0.7 \cr
-Date: \tab 2009-07-15 \cr
+Date: \tab 2009-07-16 \cr
 Depends: \tab R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0),distrMod(>= 2.0), RandVar(>= 0.6.4), RobAStBase\cr
 LazyLoad: \tab yes\cr
 License: \tab LGPL-3\cr