[Robast-commits] r545 - in branches/robast-0.9/pkg/RobExtremes: R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 19 02:09:12 CET 2013
Author: ruckdeschel
Date: 2013-01-19 02:09:11 +0100 (Sat, 19 Jan 2013)
New Revision: 545
Modified:
branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R
branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R
branches/robast-0.9/pkg/RobExtremes/R/QBCC.R
branches/robast-0.9/pkg/RobExtremes/man/LDEstimator.Rd
branches/robast-0.9/pkg/RobExtremes/man/PickandsEstimator.Rd
branches/robast-0.9/pkg/RobExtremes/man/QuantileBCCEstimator.Rd
Log:
RobExtremes: fixed some bugs; examples run now except for .SnGrids.N does not exist (yet to be done...)
Modified: branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R 2013-01-18 23:58:15 UTC (rev 544)
+++ branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R 2013-01-19 01:09:11 UTC (rev 545)
@@ -86,14 +86,12 @@
asvar.0 <- asvar
nuis.idx.0 <- nuis.idx
trafo.0 <- trafo
+ if(is.null(fixed)) fixed <- fixed(ParamFamily)
fixed.0 <- fixed
na.rm.0 <- na.rm
- print(nuis.idx.0)
- print(trafo.0)
- print(fixed.0)
-
+
estimate <- Estimator(x, estimator, name, Infos,
asvar = asvar.0, nuis.idx = nuis.idx.0,
trafo = trafo.0, fixed = fixed.0,
@@ -101,9 +99,6 @@
na.rm = na.rm.0, ...,
ParamFamily = ParamFamily)
- print(estimate)
- #print(estimate at untransformed.estimate)
- print(estimate at untransformed.asvar)
cat("\n asvar",estimate at asvar,"\n")
@@ -115,7 +110,6 @@
asvar <- asvar.fct(ParamFamily, estimate, ...)
estimate at untransformed.asvar <- asvar
- #print(estimate)
l.e <- length(estimate at untransformed.estimate)
idx <- NULL
@@ -132,7 +126,6 @@
estimate at asvar <- estimate at trafo$mat%*%asvar[idm,idm]%*%t(estimate at trafo$mat)
}
- print(estimate at asvar)
}
##<-
estimate at estimate.call <- es.call
Modified: branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R 2013-01-18 23:58:15 UTC (rev 544)
+++ branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R 2013-01-19 01:09:11 UTC (rev 545)
@@ -56,6 +56,7 @@
asvarPickands(model=L2Fam, alpha = alpha)}
nuis.idx.0 <- nuis.idx
trafo.0 <- trafo
+ if(is.null(fixed)) fixed <- fixed(ParamFamily)
fixed.0 <- fixed
na.rm.0 <- na.rm
Modified: branches/robast-0.9/pkg/RobExtremes/R/QBCC.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/QBCC.R 2013-01-18 23:58:15 UTC (rev 544)
+++ branches/robast-0.9/pkg/RobExtremes/R/QBCC.R 2013-01-19 01:09:11 UTC (rev 545)
@@ -38,6 +38,7 @@
asvarQBCC(model=L2Fam, p1 = p1, p2 = p2)}
nuis.idx.0 <- nuis.idx
trafo.0 <- trafo
+ if(is.null(fixed)&!is.null( fixed(ParamFamily))) fixed <- fixed(ParamFamily)
fixed.0 <- fixed
na.rm.0 <- na.rm
Modified: branches/robast-0.9/pkg/RobExtremes/man/LDEstimator.Rd
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/man/LDEstimator.Rd 2013-01-18 23:58:15 UTC (rev 544)
+++ branches/robast-0.9/pkg/RobExtremes/man/LDEstimator.Rd 2013-01-19 01:09:11 UTC (rev 545)
@@ -127,6 +127,7 @@
\code{\link{Estimate-class}} }
\examples{
## (empirical) Data
+set.seed(123)
x <- rgamma(50, scale = 0.5, shape = 3)
## parametric family of probability measures
Modified: branches/robast-0.9/pkg/RobExtremes/man/PickandsEstimator.Rd
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/man/PickandsEstimator.Rd 2013-01-18 23:58:15 UTC (rev 544)
+++ branches/robast-0.9/pkg/RobExtremes/man/PickandsEstimator.Rd 2013-01-19 01:09:11 UTC (rev 545)
@@ -95,6 +95,7 @@
\code{\link{Estimate-class}} }
\examples{
## (empirical) Data
+set.seed(123)
x <- rgpd(50, scale = 0.5, shape = 3)
y <- rgev(50, scale = 0.5, shape = 3)
## parametric family of probability measures
Modified: branches/robast-0.9/pkg/RobExtremes/man/QuantileBCCEstimator.Rd
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/man/QuantileBCCEstimator.Rd 2013-01-18 23:58:15 UTC (rev 544)
+++ branches/robast-0.9/pkg/RobExtremes/man/QuantileBCCEstimator.Rd 2013-01-19 01:09:11 UTC (rev 545)
@@ -52,6 +52,7 @@
\examples{
## (empirical) Data
set.seed(123)
+distroptions("withgaps"=FALSE)
x <- rweibull(50, scale = 0.5, shape = 3)
##
QuantileBCCEstimator(x = x)
More information about the Robast-commits
mailing list