[Robast-commits] r333 - branches/robast-0.7/pkg/ROptEst/R branches/robast-0.7/pkg/ROptEst/chm branches/robast-0.7/pkg/ROptEst/man pkg/ROptEst/R pkg/ROptEst/chm
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Jul 31 23:59:28 CEST 2009
Author: ruckdeschel
Date: 2009-07-31 23:59:27 +0200 (Fri, 31 Jul 2009)
New Revision: 333
Modified:
branches/robast-0.7/pkg/ROptEst/R/getIneffDiff.R
branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asGRisk.R
branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asHampel.R
branches/robast-0.7/pkg/ROptEst/chm/ROptEst.chm
branches/robast-0.7/pkg/ROptEst/chm/ROptEst.hhp
branches/robast-0.7/pkg/ROptEst/chm/getIneffDiff.html
branches/robast-0.7/pkg/ROptEst/chm/getInfRobIC.html
branches/robast-0.7/pkg/ROptEst/man/getIneffDiff.Rd
branches/robast-0.7/pkg/ROptEst/man/getInfRobIC.Rd
pkg/ROptEst/R/getInfRobIC_asGRisk.R
pkg/ROptEst/chm/00Index.html
pkg/ROptEst/chm/ROptEst.chm
pkg/ROptEst/chm/getInfRobIC.html
Log:
ROptEst: upper by default is now set to NULL in getInfRobIC_asGRisk, getInfRobIC_asHampel, getIneffDiff
Modified: branches/robast-0.7/pkg/ROptEst/R/getIneffDiff.R
===================================================================
--- branches/robast-0.7/pkg/ROptEst/R/getIneffDiff.R 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/R/getIneffDiff.R 2009-07-31 21:59:27 UTC (rev 333)
@@ -6,7 +6,7 @@
neighbor = "UncondNeighborhood",
risk = "asMSE"),
function(radius, L2Fam, neighbor, risk, loRad, upRad, loRisk, upRisk,
- z.start = NULL, A.start = NULL, upper.b, MaxIter, eps, warn,
+ z.start = NULL, A.start = NULL, upper.b = NULL, MaxIter, eps, warn,
loNorm = NULL, upNorm = NULL, verbose = FALSE){
L2derivDim <- numberOfMaps(L2Fam at L2deriv)
if(L2derivDim == 1){
Modified: branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asGRisk.R
===================================================================
--- branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asGRisk.R 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asGRisk.R 2009-07-31 21:59:27 UTC (rev 333)
@@ -4,7 +4,7 @@
setMethod("getInfRobIC", signature(L2deriv = "UnivariateDistribution",
risk = "asGRisk",
neighbor = "UncondNeighborhood"),
- function(L2deriv, risk, neighbor, symm, Finfo, trafo, upper, maxiter, tol,
+ function(L2deriv, risk, neighbor, symm, Finfo, trafo, upper = NULL, maxiter, tol,
warn, noLow = FALSE, verbose = FALSE){
biastype <- biastype(risk)
radius <- neighbor at radius
@@ -44,10 +44,10 @@
z.old <- z
c0.old <- c0
## new
- lower0 <- getL1normL2deriv(L2deriv = L2deriv, cent = z) /
+ lower0 <- getL1normL2deriv(L2deriv = L2deriv, cent = z) /
(1 + neighbor at radius^2)
upper0 <- sqrt( as.numeric( Finfo + z^2 )/(( 1 + neighbor at radius^2)^2 - 1) )
- if (!is.null(upper)|(iter == 1))
+ if (!is.null(upper)|(iter == 1))
{lower <- .Machine$double.eps^0.75
}else{ lower <- lower0; upper <- upper0}
##
@@ -146,7 +146,7 @@
neighbor = "ContNeighborhood"),
function(L2deriv, risk, neighbor, Distr, DistrSymm, L2derivSymm,
L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE,
- z.start, A.start, upper, maxiter, tol, warn, verbose = FALSE){
+ z.start, A.start, upper = NULL, maxiter, tol, warn, verbose = FALSE){
biastype <- biastype(risk)
normtype <- normtype(risk)
Modified: branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asHampel.R
===================================================================
--- branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asHampel.R 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/R/getInfRobIC_asHampel.R 2009-07-31 21:59:27 UTC (rev 333)
@@ -5,7 +5,7 @@
risk = "asHampel",
neighbor = "UncondNeighborhood"),
function(L2deriv, risk, neighbor, symm, Finfo, trafo,
- upper, maxiter, tol, warn, noLow = FALSE, verbose = FALSE,
+ upper = NULL, maxiter, tol, warn, noLow = FALSE, verbose = FALSE,
checkBounds = TRUE){
biastype <- biastype(risk)
normtype <- normtype(risk)
@@ -133,7 +133,7 @@
neighbor = "ContNeighborhood"),
function(L2deriv, risk, neighbor, Distr, DistrSymm, L2derivSymm,
L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE,
- z.start, A.start, upper, maxiter, tol, warn, verbose = FALSE,
+ z.start, A.start, upper = NULL, maxiter, tol, warn, verbose = FALSE,
checkBounds = TRUE){
biastype <- biastype(risk)
@@ -152,9 +152,9 @@
if(checkBounds){
ClassIC <- trafo %*% solve(Finfo) %*% L2deriv
- lower <- q(Distr)(getdistrOption("TruncQuantile"))
- upper <- q(Distr)(1-getdistrOption("TruncQuantile"))
- x <- seq(from = lower, to = upper, length = 1000)
+ lower.x <- q(Distr)(getdistrOption("TruncQuantile"))
+ upper.x <- q(Distr)(1-getdistrOption("TruncQuantile"))
+ x <- seq(from = lower.x, to = upper.x, length = 1000)
bmax <- sapply(x,function(x) evalRandVar(ClassIC,x))
bmax <- sqrt(max(colSums(bmax^2)))
cat("numerical approximation of maximal bound:\t", bmax, "\n")
Modified: branches/robast-0.7/pkg/ROptEst/chm/ROptEst.chm
===================================================================
(Binary files differ)
Modified: branches/robast-0.7/pkg/ROptEst/chm/ROptEst.hhp
===================================================================
--- branches/robast-0.7/pkg/ROptEst/chm/ROptEst.hhp 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/chm/ROptEst.hhp 2009-07-31 21:59:27 UTC (rev 333)
@@ -37,6 +37,4 @@
optRisk.html
radiusMinimaxIC.html
roptest.html
-trAsCov-class.html
-trFiCov-class.html
updateNorm-methods.html
Modified: branches/robast-0.7/pkg/ROptEst/chm/getIneffDiff.html
===================================================================
--- branches/robast-0.7/pkg/ROptEst/chm/getIneffDiff.html 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/chm/getIneffDiff.html 2009-07-31 21:59:27 UTC (rev 333)
@@ -33,7 +33,7 @@
## UncondNeighborhood, asMSE':
getIneffDiff(
radius, L2Fam, neighbor, risk, loRad, upRad, loRisk, upRisk,
- z.start = NULL, A.start = NULL, upper.b, MaxIter, eps, warn,
+ z.start = NULL, A.start = NULL, upper.b = NULL, MaxIter, eps, warn,
loNorm = NULL, upNorm = NULL, verbose = FALSE)
</pre>
Modified: branches/robast-0.7/pkg/ROptEst/chm/getInfRobIC.html
===================================================================
--- branches/robast-0.7/pkg/ROptEst/chm/getInfRobIC.html 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/chm/getInfRobIC.html 2009-07-31 21:59:27 UTC (rev 333)
@@ -64,23 +64,23 @@
## S4 method for signature 'UnivariateDistribution,
## asHampel, UncondNeighborhood':
getInfRobIC(L2deriv, risk, neighbor, symm, Finfo, trafo,
- upper, maxiter, tol, warn, noLow = FALSE, verbose = FALSE, checkBounds = TRUE)
+ upper = NULL, maxiter, tol, warn, noLow = FALSE, verbose = FALSE, checkBounds = TRUE)
## S4 method for signature 'RealRandVariable, asHampel,
## ContNeighborhood':
getInfRobIC(L2deriv, risk, neighbor, Distr, DistrSymm, L2derivSymm,
- L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper, maxiter, tol, warn,
+ L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper = NULL, maxiter, tol, warn,
verbose = FALSE, checkBounds = TRUE)
## S4 method for signature 'UnivariateDistribution,
## asGRisk, UncondNeighborhood':
getInfRobIC(L2deriv, risk, neighbor, symm, Finfo, trafo,
- upper, maxiter, tol, warn, noLow = FALSE, verbose = FALSE)
+ upper = NULL, maxiter, tol, warn, noLow = FALSE, verbose = FALSE)
## S4 method for signature 'RealRandVariable, asGRisk,
## ContNeighborhood':
getInfRobIC(L2deriv, risk, neighbor, Distr, DistrSymm, L2derivSymm,
- L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper, maxiter, tol, warn, verbose = FALSE)
+ L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper = NULL, maxiter, tol, warn, verbose = FALSE)
## S4 method for signature 'UnivariateDistribution,
## asUnOvShoot, UncondNeighborhood':
Modified: branches/robast-0.7/pkg/ROptEst/man/getIneffDiff.Rd
===================================================================
--- branches/robast-0.7/pkg/ROptEst/man/getIneffDiff.Rd 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/man/getIneffDiff.Rd 2009-07-31 21:59:27 UTC (rev 333)
@@ -14,7 +14,7 @@
\S4method{getIneffDiff}{numeric,L2ParamFamily,UncondNeighborhood,asMSE}(
radius, L2Fam, neighbor, risk, loRad, upRad, loRisk, upRisk,
- z.start = NULL, A.start = NULL, upper.b, MaxIter, eps, warn,
+ z.start = NULL, A.start = NULL, upper.b = NULL, MaxIter, eps, warn,
loNorm = NULL, upNorm = NULL, verbose = FALSE)
}
\arguments{
Modified: branches/robast-0.7/pkg/ROptEst/man/getInfRobIC.Rd
===================================================================
--- branches/robast-0.7/pkg/ROptEst/man/getInfRobIC.Rd 2009-07-31 19:12:58 UTC (rev 332)
+++ branches/robast-0.7/pkg/ROptEst/man/getInfRobIC.Rd 2009-07-31 21:59:27 UTC (rev 333)
@@ -35,17 +35,17 @@
L2derivDistrSymm, z.start, A.start, Finfo, trafo, maxiter, tol, warn, verbose = FALSE, ...)
\S4method{getInfRobIC}{UnivariateDistribution,asHampel,UncondNeighborhood}(L2deriv, risk, neighbor, symm, Finfo, trafo,
- upper, maxiter, tol, warn, noLow = FALSE, verbose = FALSE, checkBounds = TRUE)
+ upper = NULL, maxiter, tol, warn, noLow = FALSE, verbose = FALSE, checkBounds = TRUE)
\S4method{getInfRobIC}{RealRandVariable,asHampel,ContNeighborhood}(L2deriv, risk, neighbor, Distr, DistrSymm, L2derivSymm,
- L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper, maxiter, tol, warn,
+ L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper = NULL, maxiter, tol, warn,
verbose = FALSE, checkBounds = TRUE)
\S4method{getInfRobIC}{UnivariateDistribution,asGRisk,UncondNeighborhood}(L2deriv, risk, neighbor, symm, Finfo, trafo,
- upper, maxiter, tol, warn, noLow = FALSE, verbose = FALSE)
+ upper = NULL, maxiter, tol, warn, noLow = FALSE, verbose = FALSE)
\S4method{getInfRobIC}{RealRandVariable,asGRisk,ContNeighborhood}(L2deriv, risk, neighbor, Distr, DistrSymm, L2derivSymm,
- L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper, maxiter, tol, warn, verbose = FALSE)
+ L2derivDistrSymm, Finfo, trafo, onesetLM = FALSE, z.start, A.start, upper = NULL, maxiter, tol, warn, verbose = FALSE)
\S4method{getInfRobIC}{UnivariateDistribution,asUnOvShoot,UncondNeighborhood}(L2deriv, risk, neighbor, symm, Finfo, trafo,
upper, maxiter, tol, warn)
Modified: pkg/ROptEst/R/getInfRobIC_asGRisk.R
===================================================================
--- pkg/ROptEst/R/getInfRobIC_asGRisk.R 2009-07-31 19:12:58 UTC (rev 332)
+++ pkg/ROptEst/R/getInfRobIC_asGRisk.R 2009-07-31 21:59:27 UTC (rev 333)
@@ -4,7 +4,7 @@
setMethod("getInfRobIC", signature(L2deriv = "UnivariateDistribution",
risk = "asGRisk",
neighbor = "UncondNeighborhood"),
- function(L2deriv, risk, neighbor, symm, Finfo, trafo, upper, maxiter, tol,
+ function(L2deriv, risk, neighbor, symm, Finfo, trafo, upper, maxiter, tol,
warn, noLow = FALSE, verbose = FALSE){
biastype <- biastype(risk)
radius <- neighbor at radius
Modified: pkg/ROptEst/chm/00Index.html
===================================================================
--- pkg/ROptEst/chm/00Index.html 2009-07-31 19:12:58 UTC (rev 332)
+++ pkg/ROptEst/chm/00Index.html 2009-07-31 21:59:27 UTC (rev 333)
@@ -10,7 +10,7 @@
<param name="keyword" value=".. contents">
</object>
-<h2>Help pages for package ‘ROptEst’ version 0.6.3</h2>
+<h2>Help pages for package ‘ROptEst’ version 0.7</h2>
<p align="center">
<a href="# "> </a>
Modified: pkg/ROptEst/chm/ROptEst.chm
===================================================================
(Binary files differ)
Modified: pkg/ROptEst/chm/getInfRobIC.html
===================================================================
--- pkg/ROptEst/chm/getInfRobIC.html 2009-07-31 19:12:58 UTC (rev 332)
+++ pkg/ROptEst/chm/getInfRobIC.html 2009-07-31 21:59:27 UTC (rev 333)
@@ -268,6 +268,6 @@
</script>
-<hr><div align="center">[Package <em>ROptEst</em> version 0.6.0 <a href="00Index.html">Index]</a></div>
+<hr><div align="center">[Package <em>ROptEst</em> version 0.7 <a href="00Index.html">Index</a>]</div>
</body></html>
More information about the Robast-commits
mailing list