[Robast-commits] r145 - in branches/robast-0.6/pkg: ROptEst/man RobAStBase/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Aug 5 18:58:12 CEST 2008
Author: stamats
Date: 2008-08-05 18:58:12 +0200 (Tue, 05 Aug 2008)
New Revision: 145
Modified:
branches/robast-0.6/pkg/ROptEst/man/roptest.Rd
branches/robast-0.6/pkg/RobAStBase/R/ContIC.R
branches/robast-0.6/pkg/RobAStBase/R/IC.R
branches/robast-0.6/pkg/RobAStBase/R/TotalVarIC.R
branches/robast-0.6/pkg/RobAStBase/R/optIC.R
Log:
adaption to new implementation of ParamFamily (slot fam.call).
Modified: branches/robast-0.6/pkg/ROptEst/man/roptest.Rd
===================================================================
--- branches/robast-0.6/pkg/ROptEst/man/roptest.Rd 2008-08-05 05:18:00 UTC (rev 144)
+++ branches/robast-0.6/pkg/ROptEst/man/roptest.Rd 2008-08-05 16:58:12 UTC (rev 145)
@@ -129,7 +129,7 @@
MLEstimator(x, PoisFamily(), interval = c(0, 10))
## compute optimally robust estimator (unknown contamination)
-#roptest(x, PoisFamily(), eps.upper = 0.05, interval = c(0, 10), steps = 3)
+roptest(x, PoisFamily(), eps.upper = 0.05, interval = c(0, 10), steps = 3)
#############################
## 3. Normal (Gaussian) location and scale
Modified: branches/robast-0.6/pkg/RobAStBase/R/ContIC.R
===================================================================
--- branches/robast-0.6/pkg/RobAStBase/R/ContIC.R 2008-08-05 05:18:00 UTC (rev 144)
+++ branches/robast-0.6/pkg/RobAStBase/R/ContIC.R 2008-08-05 16:58:12 UTC (rev 145)
@@ -50,7 +50,6 @@
}
-
setMethod("generateIC", signature(neighbor = "ContNeighborhood",
L2Fam = "L2ParamFamily"),
function(neighbor, L2Fam, res){
@@ -63,20 +62,7 @@
w <- res$w
return(ContIC(
name = "IC of contamination type",
- CallL2Fam = call("L2ParamFamily",
- name = L2Fam at name,
- distribution = L2Fam at distribution,
- distrSymm = L2Fam at distrSymm,
- param = L2Fam at param,
- modifyParam = L2Fam at modifyParam,
- props = L2Fam at props,
-# L2deriv = L2Fam at L2deriv,
- L2deriv.fct = L2Fam at L2deriv.fct,
- L2derivSymm = L2Fam at L2derivSymm,
- L2derivDistr = L2Fam at L2derivDistr,
- L2derivDistrSymm = L2Fam at L2derivDistrSymm,
- FisherInfo = L2Fam at FisherInfo,
- FisherInfo.fct = L2Fam at FisherInfo.fct),
+ CallL2Fam = L2Fam at fam.call,
Curve = generateIC.fct(neighbor, L2Fam, res),
clip = b,
cent = a,
@@ -93,7 +79,6 @@
})
## Access methods
-
setMethod("clip", "ContIC", function(object) object at clip)
setMethod("cent", "ContIC", function(object) object at cent)
setMethod("neighbor", "ContIC", function(object) ContNeighborhood(radius = object at neighborRadius) )
Modified: branches/robast-0.6/pkg/RobAStBase/R/IC.R
===================================================================
--- branches/robast-0.6/pkg/RobAStBase/R/IC.R 2008-08-05 05:18:00 UTC (rev 144)
+++ branches/robast-0.6/pkg/RobAStBase/R/IC.R 2008-08-05 16:58:12 UTC (rev 145)
@@ -145,19 +145,7 @@
modifyIC <- function(L2Fam, IC){ makeIC(IC, L2Fam) }
- CallL2Fam <- call("L2ParamFamily",
- name = L2Fam at name,
- distribution = L2Fam at distribution,
- distrSymm = L2Fam at distrSymm,
- param = L2Fam at param,
- props = L2Fam at props,
- modifyParam = L2Fam at modifyParam,
- L2deriv.fct = L2Fam at L2deriv.fct,
- L2derivSymm = L2Fam at L2derivSymm,
- L2derivDistr = L2Fam at L2derivDistr,
- L2derivDistrSymm = L2Fam at L2derivDistrSymm,
- FisherInfo.fct = L2Fam at FisherInfo.fct,
- FisherInfo = L2Fam at FisherInfo)
+ CallL2Fam <- L2Fam at fam.call
return(IC(name = name(IC),
Curve = EuclRandVarList(Y),
Modified: branches/robast-0.6/pkg/RobAStBase/R/TotalVarIC.R
===================================================================
--- branches/robast-0.6/pkg/RobAStBase/R/TotalVarIC.R 2008-08-05 05:18:00 UTC (rev 144)
+++ branches/robast-0.6/pkg/RobAStBase/R/TotalVarIC.R 2008-08-05 16:58:12 UTC (rev 145)
@@ -59,20 +59,7 @@
return(TotalVarIC(
name = "IC of total variation type",
- CallL2Fam = call("L2ParamFamily",
- name = L2Fam at name,
- distribution = L2Fam at distribution,
- distrSymm = L2Fam at distrSymm,
- param = L2Fam at param,
- modifyParam = L2Fam at modifyParam,
- props = L2Fam at props,
-# L2deriv = L2Fam at L2deriv,
- L2deriv.fct = L2Fam at L2deriv.fct,
- L2derivSymm = L2Fam at L2derivSymm,
- L2derivDistr = L2Fam at L2derivDistr,
- L2derivDistrSymm = L2Fam at L2derivDistrSymm,
- FisherInfo = L2Fam at FisherInfo,
- FisherInfo.fct = L2Fam at FisherInfo.fct),
+ CallL2Fam = L2Fam at fam.call,
Curve = generateIC.fct(neighbor, L2Fam, res),
clipUp = clipUp,
clipLo = clipLo,
Modified: branches/robast-0.6/pkg/RobAStBase/R/optIC.R
===================================================================
--- branches/robast-0.6/pkg/RobAStBase/R/optIC.R 2008-08-05 05:18:00 UTC (rev 144)
+++ branches/robast-0.6/pkg/RobAStBase/R/optIC.R 2008-08-05 16:58:12 UTC (rev 145)
@@ -10,20 +10,7 @@
return(IC(
name = paste("Classical optimal influence curve for", model at name),
- CallL2Fam = call("L2ParamFamily",
- name = model at name,
- distribution = model at distribution,
- distrSymm = model at distrSymm,
- param = model at param,
- modifyParam = model at modifyParam,
- props = model at props,
-# L2deriv = model at L2deriv,
- L2deriv.fct = model at L2deriv.fct,
- L2derivSymm = model at L2derivSymm,
- L2derivDistr = model at L2derivDistr,
- L2derivDistrSymm = model at L2derivDistrSymm,
- FisherInfo = model at FisherInfo,
- FisherInfo.fct = model at FisherInfo.fct),
+ CallL2Fam = model at fam.call,
Curve = EuclRandVarList(Curve),
modifyIC = modifyIC,
Risks = list(asCov = asCov, trAsCov = sum(diag(asCov))),
More information about the Robast-commits
mailing list