[Robast-commits] r87 - in pkg/ROptEst: R inst/scripts man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Mar 31 01:17:01 CEST 2008
Author: ruckdeschel
Date: 2008-03-31 01:17:01 +0200 (Mon, 31 Mar 2008)
New Revision: 87
Modified:
pkg/ROptEst/R/getInfRobIC_asGRisk.R
pkg/ROptEst/R/getInfRobIC_asHampel.R
pkg/ROptEst/R/getRiskIC.R
pkg/ROptEst/R/leastFavorableRadius.R
pkg/ROptEst/R/radiusMinimaxIC.R
pkg/ROptEst/inst/scripts/BinomialModel.R
pkg/ROptEst/inst/scripts/ExponentialScaleModel.R
pkg/ROptEst/inst/scripts/LognormalAndNormalModel.R
pkg/ROptEst/inst/scripts/NormalScaleModel.R
pkg/ROptEst/inst/scripts/PoissonModel.R
pkg/ROptEst/man/getInfRobIC.Rd
Log:
yet some buglets; noticed them when running scripts...
Modified: pkg/ROptEst/R/getInfRobIC_asGRisk.R
===================================================================
--- pkg/ROptEst/R/getInfRobIC_asGRisk.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/R/getInfRobIC_asGRisk.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -4,7 +4,8 @@
setMethod("getInfRobIC", signature(L2deriv = "UnivariateDistribution",
risk = "asGRisk",
neighbor = "UncondNeighborhood"),
- function(L2deriv, risk, neighbor, symm, Finfo, trafo, upper, maxiter, tol, warn){
+ function(L2deriv, risk, neighbor, symm, Finfo, trafo, upper, maxiter, tol,
+ warn, noLow = FALSE){
biastype <- biastype(risk)
radius <- neighbor at radius
if(identical(all.equal(radius, 0), TRUE)){
Modified: pkg/ROptEst/R/getInfRobIC_asHampel.R
===================================================================
--- pkg/ROptEst/R/getInfRobIC_asHampel.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/R/getInfRobIC_asHampel.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -30,7 +30,7 @@
return(res)
}
- if(! noLow)
+ if(!noLow)
{res <- getInfRobIC(L2deriv = L2deriv, risk = asBias(biastype = biastype),
neighbor = neighbor, symm = symm,
trafo = trafo, maxiter = maxiter, tol = tol, Finfo = Finfo,
Modified: pkg/ROptEst/R/getRiskIC.R
===================================================================
--- pkg/ROptEst/R/getRiskIC.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/R/getRiskIC.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -6,16 +6,16 @@
neighbor = "missing",
L2Fam = "missing"),
function(IC, risk){
- L2Fam <- eval(IC at CallL2Fam)
+ L2Fam <- force(eval(IC at CallL2Fam))
getRiskIC(IC = IC, risk = risk, L2Fam = L2Fam)
})
setMethod("getRiskIC", signature(IC = "HampIC",
risk = "asCov",
neighbor = "missing",
- L2Fam = "missing"),
+ L2Fam = "L2ParamFamily"),
function(IC, risk, L2Fam){
- Cov <- IC at Risks[["asCov"]]
+ Cov <- IC at Risks[["asCov"]] ; print(L2Fam)
return(list(asCov = list(distribution = .getDistr(L2Fam), value = Cov)))
})
@@ -29,7 +29,6 @@
if(missing(L2Fam))
{misF <- TRUE;
L2Fam <- eval(IC at CallL2Fam)}
- print(L2Fam)
return(list(asBias = list(distribution = .getDistr(L2Fam),
neighborhood = neighbor at type, value = IC at Risks$asBias$value)))
})
Modified: pkg/ROptEst/R/leastFavorableRadius.R
===================================================================
--- pkg/ROptEst/R/leastFavorableRadius.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/R/leastFavorableRadius.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -51,8 +51,7 @@
bmin <- getAsRisk(risk = asBias(biastype = biastype),
L2deriv = L2Fam at L2derivDistr[[1]],
neighbor = neighbor, biastype = biastype,
- trafo = L2Fam at param@trafo, symm = L2Fam at L2derivSymm[[1]],
- warn = warn)
+ trafo = L2Fam at param@trafo, symm = L2Fam at L2derivSymm[[1]])
upRisk <- bmin^2
}else{
neighbor at radius <- upRad
Modified: pkg/ROptEst/R/radiusMinimaxIC.R
===================================================================
--- pkg/ROptEst/R/radiusMinimaxIC.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/R/radiusMinimaxIC.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -45,8 +45,7 @@
bmin <- getAsRisk(risk = asBias(biastype = biastype),
L2deriv = L2Fam at L2derivDistr[[1]],
neighbor = neighbor, biastype = biastype,
- trafo = L2Fam at param@trafo,
- warn = warn)$asBias
+ trafo = L2Fam at param@trafo)$asBias
upRisk <- bmin^2
}else{
neighbor at radius <- upRad
Modified: pkg/ROptEst/inst/scripts/BinomialModel.R
===================================================================
--- pkg/ROptEst/inst/scripts/BinomialModel.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/inst/scripts/BinomialModel.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -72,7 +72,7 @@
Risks(IC5)
plot(IC5)
-(IC6 <- optIC(model=RobB2, risk=asHampel(bound=Risks(IC2)$asBias), maxiter = 200))
+(IC6 <- optIC(model=RobB2, risk=asHampel(bound=Risks(IC2)$asBias$value), maxiter = 200))
checkIC(IC6)
Risks(IC6)
plot(IC6)
Modified: pkg/ROptEst/inst/scripts/ExponentialScaleModel.R
===================================================================
--- pkg/ROptEst/inst/scripts/ExponentialScaleModel.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/inst/scripts/ExponentialScaleModel.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -46,7 +46,7 @@
checkIC(E1.IC5)
Risks(E1.IC5)
plot(E1.IC5)
-(E1.IC6 <- optIC(model=E1.Rob2, risk=asHampel(bound=Risks(E1.IC2)$asBias), maxiter = 200))
+(E1.IC6 <- optIC(model=E1.Rob2, risk=asHampel(bound=Risks(E1.IC2)$asBias$value), maxiter = 200))
checkIC(E1.IC6)
Risks(E1.IC6)
plot(E1.IC6)
Modified: pkg/ROptEst/inst/scripts/LognormalAndNormalModel.R
===================================================================
--- pkg/ROptEst/inst/scripts/LognormalAndNormalModel.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/inst/scripts/LognormalAndNormalModel.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -107,12 +107,12 @@
Risks(N0.IC5)
plot(N0.IC5)
-LN1.IC6 <- optIC(model=LN1.Rob2, risk=asHampel(bound=Risks(LN1.IC2)$asBias))
+LN1.IC6 <- optIC(model=LN1.Rob2, risk=asHampel(bound=Risks(LN1.IC2)$asBias$value))
checkIC(LN1.IC6)
Risks(LN1.IC6)
plot(LN1.IC6)
-N0.IC6 <- optIC(model=N0.Rob2, risk=asHampel(bound=Risks(N0.IC2)$asBias))
+N0.IC6 <- optIC(model=N0.Rob2, risk=asHampel(bound=Risks(N0.IC2)$asBias$value))
checkIC(N0.IC6)
Risks(N0.IC6)
plot(N0.IC6)
Modified: pkg/ROptEst/inst/scripts/NormalScaleModel.R
===================================================================
--- pkg/ROptEst/inst/scripts/NormalScaleModel.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/inst/scripts/NormalScaleModel.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -47,7 +47,7 @@
checkIC(N0.IC5)
Risks(N0.IC5)
plot(N0.IC5)
-(N0.IC6 <- optIC(model=N0.Rob2, risk=asHampel(bound=Risks(N0.IC2)$asBias), maxiter = 200))
+(N0.IC6 <- optIC(model=N0.Rob2, risk=asHampel(bound=Risks(N0.IC2)$asBias$value), maxiter = 200))
checkIC(N0.IC6)
Risks(N0.IC6)
plot(N0.IC6)
Modified: pkg/ROptEst/inst/scripts/PoissonModel.R
===================================================================
--- pkg/ROptEst/inst/scripts/PoissonModel.R 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/inst/scripts/PoissonModel.R 2008-03-30 23:17:01 UTC (rev 87)
@@ -78,7 +78,7 @@
Risks(IC5)
plot(IC5)
-(IC6 <- optIC(model=RobP2, risk=asHampel(bound=Risks(IC2)$asBias), maxiter = 200))
+(IC6 <- optIC(model=RobP2, risk=asHampel(bound=Risks(IC2)$asBias$value), maxiter = 200))
checkIC(IC6)
Risks(IC6)
plot(IC6)
Modified: pkg/ROptEst/man/getInfRobIC.Rd
===================================================================
--- pkg/ROptEst/man/getInfRobIC.Rd 2008-03-30 22:31:21 UTC (rev 86)
+++ pkg/ROptEst/man/getInfRobIC.Rd 2008-03-30 23:17:01 UTC (rev 87)
@@ -41,7 +41,7 @@
L2derivDistrSymm, Finfo, z.start, A.start, trafo, upper, maxiter, tol, warn)
\S4method{getInfRobIC}{UnivariateDistribution,asGRisk,UncondNeighborhood}(L2deriv, risk, neighbor, symm, Finfo, trafo,
- upper, maxiter, tol, warn)
+ upper, maxiter, tol, warn, noLow = FALSE)
\S4method{getInfRobIC}{RealRandVariable,asGRisk,ContNeighborhood}(L2deriv, risk, neighbor, Distr, DistrSymm, L2derivSymm,
L2derivDistrSymm, Finfo, z.start, A.start, trafo, upper, maxiter, tol, warn)
More information about the Robast-commits
mailing list