From noreply at r-forge.r-project.org Sun Oct 5 23:23:40 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 5 Oct 2014 23:23:40 +0200 (CEST) Subject: [Robast-commits] r789 - branches/robast-1.0/pkg/ROptEst/R Message-ID: <20141005212341.043C618681E@r-forge.r-project.org> Author: ruckdeschel Date: 2014-10-05 23:23:40 +0200 (Sun, 05 Oct 2014) New Revision: 789 Modified: branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R Log: ROptEst: Some changes in wrapper to cniperpointplot Modified: branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R =================================================================== --- branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R 2014-09-24 14:00:07 UTC (rev 788) +++ branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R 2014-10-05 21:23:40 UTC (rev 789) @@ -64,8 +64,6 @@ dots <- mc$"..." if(is.null(mc$lower)) lower <- getdistrOption("DistrResolution") if(is.null(mc$upper)) upper <- 1-getdistrOption("DistrResolution") - if(is.null(mc$with.legend)) mc$with.legend <- TRUE - if(is.null(mc$withCall)) mc$withCall <- TRUE if(missing(fam)) stop("Argument 'fam' must be given as argument to 'CniperPointPlot'") ### ### 2. build up the argument list for the (powerful/fullfledged) @@ -100,14 +98,14 @@ ,adj = 0.5 ,cex.main = substitute(1.5) ,cex.lab = substitute(1.5) - ,main = ""#"Outlyingness Plot" + ,main = "Cniperpointplot" ,xlab=substitute("Dirac point") ,ylab=substitute("Asymptotic Risk difference (classic - robust)") ,bty = substitute("o") ), scaleList) # print(argsList) ##parameter for plotting - if(mc$with.legend) + if(with.legend) { argsList$col.main <- "black" argsList$col.lab <- "black" @@ -135,7 +133,7 @@ ### ### 5. return the call (if withCall==TRUE) ### - if(mc$withCall) print(mycall) + if(withCall) print(mycall) } #CniperPointPlot(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) From noreply at r-forge.r-project.org Thu Oct 16 14:10:54 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 16 Oct 2014 14:10:54 +0200 (CEST) Subject: [Robast-commits] r790 - in branches/robast-1.0/pkg/RobExtremes: . R man Message-ID: <20141016121054.3D201183BEC@r-forge.r-project.org> Author: ruckdeschel Date: 2014-10-16 14:10:53 +0200 (Thu, 16 Oct 2014) New Revision: 790 Modified: branches/robast-1.0/pkg/RobExtremes/NAMESPACE branches/robast-1.0/pkg/RobExtremes/R/AllGeneric.R branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R branches/robast-1.0/pkg/RobExtremes/man/ismevgpdgevdiag-methods.Rd Log: [RobExtremes] forgot to commit my changes from Oct 07. Should work now. (concerns the gev.diag gpd.diag S4 methods...) Modified: branches/robast-1.0/pkg/RobExtremes/NAMESPACE =================================================================== --- branches/robast-1.0/pkg/RobExtremes/NAMESPACE 2014-10-05 21:23:40 UTC (rev 789) +++ branches/robast-1.0/pkg/RobExtremes/NAMESPACE 2014-10-16 12:10:53 UTC (rev 790) @@ -47,4 +47,7 @@ exportMethods("rescaleFunction") S3method(print, riskMeasure) exportMethods("gev.diag", "gpd.diag","gev.prof", "gpd.prof", - "gev.profxi", "gpd.profxi") \ No newline at end of file + "gev.profxi", "gpd.profxi") +export("gev.diag", "gpd.diag","gev.prof", "gpd.prof", + "gev.profxi", "gpd.profxi") + \ No newline at end of file Modified: branches/robast-1.0/pkg/RobExtremes/R/AllGeneric.R =================================================================== --- branches/robast-1.0/pkg/RobExtremes/R/AllGeneric.R 2014-10-05 21:23:40 UTC (rev 789) +++ branches/robast-1.0/pkg/RobExtremes/R/AllGeneric.R 2014-10-16 12:10:53 UTC (rev 790) @@ -38,7 +38,7 @@ setGeneric("gev.profxi", function(z, ...) standardGeneric("gev.profxi")) } if(!isGeneric("gpd.diag")){ - setGeneric("gpd.diag", function(z) standardGeneric("gpd.diag")) + setGeneric("gpd.diag", function(z,...) standardGeneric("gpd.diag")) } if(!isGeneric("gpd.prof")){ setGeneric("gpd.prof", function(z, ...) standardGeneric("gpd.prof")) Modified: branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R =================================================================== --- branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R 2014-10-05 21:23:40 UTC (rev 789) +++ branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R 2014-10-16 12:10:53 UTC (rev 790) @@ -1,25 +1,36 @@ setMethod("gev.diag", "gev.fit", function(z) ismev::gev.diag(z)) setMethod("gpd.diag", "gpd.fit", function(z) ismev::gpd.diag(z)) -setMethod("gev.diag", "GEVEstimate", function(z)ismev::gev.diag(..gevgpd.diag.fct(z))) -setMethod("gpd.diag", "GPDEstimate", function(z)ismev::gev.diag(..gevgpd.diag.fct(z))) +setMethod("gev.diag", "GEVEstimate", function(z) + ismev::gev.diag(..gevgpd.diag.fct(z))) +setMethod("gpd.diag", "GPDEstimate", function(z, npy=365) + ismev::gpd.diag(..gevgpd.diag.fct(z, GPD=TRUE, npy=npy))) setMethod("gev.prof", "gev.fit", function(z, m, xlow, xup, conf = 0.95, nint = 100) - ismev::gev.prof(z, m, xlow, xup, conf = 0.95, nint = 100)) -setMethod("gpd.prof", "gpd.fit", function(z, m, xlow, xup, npy = 365, conf = 0.95, nint = 100) - ismev::gpd.prof(z, m, xlow, xup, npy, conf, nint)) -setMethod("gev.prof", "GEVEstimate", function(z, m, xlow, xup, conf = 0.95, nint = 100) - ismev::gev.prof(..gevgpd.diag.fct(z), m, xlow, xup, conf = 0.95, nint = 100)) -setMethod("gpd.prof", "GPDEstimate", function(z, m, xlow, xup, npy = 365, conf = 0.95, nint = 100) - ismev::gev.prof(..gevgpd.diag.fct(z), m, xlow, xup, npy = 365, conf = 0.95, nint = 100)) -setMethod("gev.profxi", "gev.fit", function(z, xlow, xup, conf = 0.95, nint = 100) - ismev::gev.profxi(z, xlow, xup, conf = 0.95, nint = 100)) -setMethod("gpd.profxi", "gpd.fit", function(z, xlow, xup, conf = 0.95, nint = 100) - ismev::gpd.profxi(z, xlow, xup, conf = 0.95, nint = 100)) -setMethod("gev.profxi", "GEVEstimate", function(z, xlow, xup, conf = 0.95, nint = 100) - ismev::gev.profxi(..gevgpd.diag.fct(z), xlow, xup, conf = 0.95, nint = 100)) -setMethod("gpd.profxi", "GPDEstimate", function(z, xlow, xup, conf = 0.95, nint = 100) - ismev::gev.profxi(..gevgpd.diag.fct(z), xlow, xup, conf = 0.95, nint = 100)) + ismev::gev.prof(z, m, xlow, xup, conf = conf, nint = nint)) +setMethod("gpd.prof", "gpd.fit", function(z, m, xlow, xup, npy = 365, + conf = 0.95, nint = 100) ismev::gpd.prof(z, m, xlow, xup, npy = npy, + conf = conf, nint = nint)) +setMethod("gev.prof", "GEVEstimate", + function(z, m, xlow, xup, conf = 0.95, nint = 100) + ismev::gev.prof(..gevgpd.diag.fct(z), m, xlow, xup, + conf = conf, nint = nint)) +setMethod("gpd.prof", "GPDEstimate", function(z, m, xlow, xup, npy = 365, + conf = 0.95, nint = 100) + ismev::gpd.prof(..gevgpd.diag.fct(z, GPD=TRUE, npy = npy), m, + xlow, xup, npy = npy, conf = conf, nint = nint)) +setMethod("gev.profxi", "gev.fit", function(z, xlow, xup, conf = 0.95, + nint = 100) ismev::gev.profxi(z, xlow, xup, conf = conf, + nint = nint)) +setMethod("gpd.profxi", "gpd.fit", function(z, xlow, xup, conf = 0.95, + nint = 100) ismev::gpd.profxi(z, xlow, xup, conf = conf, + nint = nint)) +setMethod("gev.profxi", "GEVEstimate", function(z, xlow, xup, conf = 0.95, + nint = 100) ismev::gev.profxi(..gevgpd.diag.fct(z), xlow, xup, + conf = 0.95, nint = 100)) +setMethod("gpd.profxi", "GPDEstimate", function(z, xlow, xup, npy=365, + conf = 0.95, nint = 100) ismev::gpd.profxi(..gevgpd.diag.fct(z, + GPD=TRUE, npy), xlow, xup, conf = 0.95, nint = 100)) -..gevgpd.diag.fct <- function(z){ +..gevgpd.diag.fct <- function(z, GPD=FALSE, npy=365){ utfe <- untransformed.estimate(z) if(length(utfe)==2) param <- ParamFamParameter(main=utfe, nuisance=nuisance(z), @@ -33,20 +44,59 @@ if(is.null(PFam)) stop("There is no object of class 'ProbFamily' in the call of 'z'") PFam0 <- modifyModel(PFam, param) + + thresh <- if(GPD) fixed(param) else NULL x <- eval(es.call$x) + n0 <- length(x) z0 <- list() + if(GPD){ + z0$threshold <- thresh + z0$npy <- npy + z0$xdata <- x + x <- x[x > thresh] + } + + z0$data <- x z0$trans <- FALSE - z0$model <- list(NULL,NULL,NULL) - z0$link <- rep("identity",3) + z0$model <- if(GPD) list(NULL,NULL) else list(NULL,NULL,NULL) + z0$link <- rep("identity",if(GPD) 2 else 3) z0$conv <- 0 - z0$nllh <- sum(d(PFam0)(x,log=TRUE)) - z0$data <- x + z0$nllh <- -sum(d(PFam0)(x,log=TRUE)) + ml0 <- c(untransformed.estimate(z)) - if(!is.null(fixed(z))) ml0 <- c(fixed(z),ml0) + + if(!GPD){ + if(!is.null(fixed(z))) ml0 <- c(fixed(z),ml0) + nam <- c("loc", "scale", "shape") + }else nam <- c("scale", "shape") + + names(ml0) <- nam z0$mle <- ml0 - z0$cov <- asvar(z)/length(x) - z0$se <- diag(z0$cov)^.5 - z0$vals <- t(matrix(z0$mle,3,length(x))) + + if (GPD){ + n <- length(x) + z0$nexc <- n + z0$n <- n0 + z0$rate <- n/n0 + }else n <- n0 + + cova <- asvar(z)/n + dimnames(cova) <- list(nam,nam) + z0$cov <- cova + + se <- diag(z0$cov)^.5 + names(se) <- nam + z0$se <- se + + if(GPD){ + vals <- cbind(t(matrix(z0$mle,2,n)),rep(thresh,n)) + dimnames(vals) <- list(NULL, c("","","u")) + z0$vals <- vals + }else + z0$vals <- t(matrix(z0$mle,3,n)) + if(GPD) z0 <- z0[c(5:7,1,11,4,8,9,16,10,13:15,12,2,3)] + else z0 <- z0[c(2:6, 1,7:10)] + class(z0) <- if(GPD) "gpd.fit" else "gev.fit" return(z0) #ismev::gev.fit(z0) } Modified: branches/robast-1.0/pkg/RobExtremes/man/ismevgpdgevdiag-methods.Rd =================================================================== --- branches/robast-1.0/pkg/RobExtremes/man/ismevgpdgevdiag-methods.Rd 2014-10-05 21:23:40 UTC (rev 789) +++ branches/robast-1.0/pkg/RobExtremes/man/ismevgpdgevdiag-methods.Rd 2014-10-16 12:10:53 UTC (rev 790) @@ -29,9 +29,9 @@ \code{gev.profxi}. } \usage{ -gpd.diag(z) +gpd.diag(z,...) \S4method{gpd.diag}{gpd.fit}(z) -\S4method{gpd.diag}{GPDEstimate}(z) +\S4method{gpd.diag}{GPDEstimate}(z, npy = 365) gev.diag(z) \S4method{gev.diag}{gev.fit}(z) \S4method{gev.diag}{GEVEstimate}(z) @@ -43,7 +43,7 @@ \S4method{gev.prof}{GEVEstimate}(z, m, xlow, xup, conf = 0.95, nint = 100) gpd.profxi(z,...) \S4method{gpd.profxi}{gpd.fit}(z, xlow, xup, conf = 0.95, nint = 100) -\S4method{gpd.profxi}{GPDEstimate}(z, xlow, xup, conf = 0.95, nint = 100) +\S4method{gpd.profxi}{GPDEstimate}(z, xlow, xup, npy = 365, conf = 0.95, nint = 100) gev.profxi(z,...) \S4method{gev.profxi}{gev.fit}(z, xlow, xup, conf = 0.95, nint = 100) \S4method{gev.profxi}{GEVEstimate}(z, xlow, xup, conf = 0.95, nint = 100) @@ -114,18 +114,30 @@ if(require(ismev)){ ## from ismev data(portpirie) - ppfit <- gev.fit(portpirie[,2]) + data(rain) + + detach(package:ismev) + ppfit <- ismev::gev.fit(portpirie[,2]) gev.diag(ppfit) ## mlE <- MLEstimator(portpirie[,2], GEVFamilyMuUnknown(withPos=FALSE)) - RobExtremes::gev.diag(mlE) + gev.diag(mlE) \dontrun{ - RobExtremes::gev.prof(mlE) - RobExtremes::gev.profxi(mlE) + gev.prof(mlE, m = 10, 4.1, 5) + gev.profxi(mlE, -0.3, 0.3) } -} + rnfit <- ismev::gpd.fit(rain,10) + gpd.diag(rnfit) + ## + mlE2 <- MLEstimator(rain[rain>10], GParetoFamily(loc=10)) + gpd.diag(mlE2) + \dontrun{ + gpd.prof(mlE, m = 10, 55, 77) + gpd.profxi(mlE, -0.02, 0.02) + } } +} \keyword{graphics} From noreply at r-forge.r-project.org Tue Oct 21 18:48:28 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 21 Oct 2014 18:48:28 +0200 (CEST) Subject: [Robast-commits] r791 - branches/robast-1.0/pkg/ROptEst/R Message-ID: <20141021164828.4BC8A186D31@r-forge.r-project.org> Author: ruckdeschel Date: 2014-10-21 18:48:28 +0200 (Tue, 21 Oct 2014) New Revision: 791 Modified: branches/robast-1.0/pkg/ROptEst/R/cniperCont.R Log: [ROptEst] fixed an error in cniperPointPlot() -- default for argument risk had not been passed on correctly to cniperCont() Modified: branches/robast-1.0/pkg/ROptEst/R/cniperCont.R =================================================================== --- branches/robast-1.0/pkg/ROptEst/R/cniperCont.R 2014-10-16 12:10:53 UTC (rev 790) +++ branches/robast-1.0/pkg/ROptEst/R/cniperCont.R 2014-10-21 16:48:28 UTC (rev 791) @@ -270,6 +270,7 @@ expand.dots = TRUE) mcl <- as.list(mc[-1]) dots <- as.list(mc0$"...") + if(is.null(mcl$risk)) mcl$risk <- asMSE() robMod <- InfRobModel(center = L2Fam, neighbor = neighbor) From noreply at r-forge.r-project.org Tue Oct 21 19:59:36 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 21 Oct 2014 19:59:36 +0200 (CEST) Subject: [Robast-commits] r792 - branches/robast-1.0/pkg/RobExtremes/R Message-ID: <20141021175936.4B9E41875BA@r-forge.r-project.org> Author: ruckdeschel Date: 2014-10-21 19:59:35 +0200 (Tue, 21 Oct 2014) New Revision: 792 Modified: branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R Log: [RobExtremes] gev.diag, gpd.diag now check for existence of se's and ascov Modified: branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R =================================================================== --- branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R 2014-10-21 16:48:28 UTC (rev 791) +++ branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R 2014-10-21 17:59:35 UTC (rev 792) @@ -1,22 +1,45 @@ setMethod("gev.diag", "gev.fit", function(z) ismev::gev.diag(z)) setMethod("gpd.diag", "gpd.fit", function(z) ismev::gpd.diag(z)) -setMethod("gev.diag", "GEVEstimate", function(z) - ismev::gev.diag(..gevgpd.diag.fct(z))) -setMethod("gpd.diag", "GPDEstimate", function(z, npy=365) - ismev::gpd.diag(..gevgpd.diag.fct(z, GPD=TRUE, npy=npy))) +setMethod("gev.diag", "GEVEstimate", function(z){ + z0 <- ..gevgpd.diag.fct(z) + oK <- ..checkIsNa.gevgpd.diag(z0) + if(!oK) stop(paste("Not all covariances / se's were specified.\n", + "Try using 'returnlevelplot' / 'qqplot' instead.", + sep="")) + ismev::gev.diag(z0)}) +setMethod("gpd.diag", "GPDEstimate", function(z, npy=365){ + z0 <- ..gevgpd.diag.fct(z, GPD=TRUE, npy=npy) + oK <- ..checkIsNa.gevgpd.diag(z0) + if(!oK) stop(paste("Not all covariances / se's were specified.\n", + "Try using 'returnlevelplot' / 'qqplot' instead.", + sep="")) + ismev::gpd.diag(z0) + }) setMethod("gev.prof", "gev.fit", function(z, m, xlow, xup, conf = 0.95, nint = 100) ismev::gev.prof(z, m, xlow, xup, conf = conf, nint = nint)) setMethod("gpd.prof", "gpd.fit", function(z, m, xlow, xup, npy = 365, conf = 0.95, nint = 100) ismev::gpd.prof(z, m, xlow, xup, npy = npy, conf = conf, nint = nint)) setMethod("gev.prof", "GEVEstimate", - function(z, m, xlow, xup, conf = 0.95, nint = 100) - ismev::gev.prof(..gevgpd.diag.fct(z), m, xlow, xup, - conf = conf, nint = nint)) + function(z, m, xlow, xup, conf = 0.95, nint = 100){ + z0 <- ..gevgpd.diag.fct(z) + oK <- ..checkIsNa.gevgpd.diag(z0) + if(!oK) stop(paste("Not all covariances / se's were specified.\n", + "Profiling is not available for this estimator.", + sep="")) + ismev::gev.prof(z0, m, xlow, xup, + conf = conf, nint = nint) + }) setMethod("gpd.prof", "GPDEstimate", function(z, m, xlow, xup, npy = 365, - conf = 0.95, nint = 100) - ismev::gpd.prof(..gevgpd.diag.fct(z, GPD=TRUE, npy = npy), m, - xlow, xup, npy = npy, conf = conf, nint = nint)) + conf = 0.95, nint = 100){ + z0 <- ..gevgpd.diag.fct(z, GPD=TRUE, npy = npy) + oK <- ..checkIsNa.gevgpd.diag(z0) + if(!oK) stop(paste("Not all covariances / se's were specified.\n", + "Profiling is not available for this estimator.", + sep="")) + ismev::gpd.prof(z0, m, xlow, xup, npy = npy, conf = conf, + nint = nint) + }) setMethod("gev.profxi", "gev.fit", function(z, xlow, xup, conf = 0.95, nint = 100) ismev::gev.profxi(z, xlow, xup, conf = conf, nint = nint)) @@ -24,11 +47,23 @@ nint = 100) ismev::gpd.profxi(z, xlow, xup, conf = conf, nint = nint)) setMethod("gev.profxi", "GEVEstimate", function(z, xlow, xup, conf = 0.95, - nint = 100) ismev::gev.profxi(..gevgpd.diag.fct(z), xlow, xup, - conf = 0.95, nint = 100)) + nint = 100){ + z0 <- ..gevgpd.diag.fct(z) + oK <- ..checkIsNa.gevgpd.diag(z0) + if(!oK) stop(paste("Not all covariances / se's were specified.\n", + "Profiling is not available for this estimator.", + sep="")) + ismev::gev.profxi(z0, xlow, xup, conf = 0.95, nint = 100) + }) setMethod("gpd.profxi", "GPDEstimate", function(z, xlow, xup, npy=365, - conf = 0.95, nint = 100) ismev::gpd.profxi(..gevgpd.diag.fct(z, - GPD=TRUE, npy), xlow, xup, conf = 0.95, nint = 100)) + conf = 0.95, nint = 100){ + z0 <- ..gevgpd.diag.fct(z, GPD=TRUE, npy = npy) + oK <- ..checkIsNa.gevgpd.diag(z0) + if(!oK) stop(paste("Not all covariances / se's were specified.\n", + "Profiling is not available for this estimator.", + sep="")) + ismev::gpd.profxi(z0, xlow, xup, conf = 0.95, nint = 100) + }) ..gevgpd.diag.fct <- function(z, GPD=FALSE, npy=365){ utfe <- untransformed.estimate(z) @@ -44,7 +79,6 @@ if(is.null(PFam)) stop("There is no object of class 'ProbFamily' in the call of 'z'") PFam0 <- modifyModel(PFam, param) - thresh <- if(GPD) fixed(param) else NULL x <- eval(es.call$x) n0 <- length(x) @@ -80,11 +114,16 @@ z0$rate <- n/n0 }else n <- n0 - cova <- asvar(z)/n + cova <- asvar(z) + if(is.null(cova)){ + cova <- matrix(NA,nrow=length(nam),ncol=length(nam)) + se <- rep(NA,length(nam)) + }else{ + se <- diag(cova)^.5 + } dimnames(cova) <- list(nam,nam) z0$cov <- cova - se <- diag(z0$cov)^.5 names(se) <- nam z0$se <- se @@ -100,3 +139,10 @@ return(z0) #ismev::gev.fit(z0) } + +..checkIsNa.gevgpd.diag <- function(x){ + oK <- TRUE + if(any(is.na(x$se))) oK <- FALSE + if(any(is.na(x$cov))) oK <- FALSE + return(oK) +} From noreply at r-forge.r-project.org Tue Oct 28 12:45:18 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 28 Oct 2014 12:45:18 +0100 (CET) Subject: [Robast-commits] r793 - in branches/robast-1.0/pkg: ROptEst ROptEst/inst RandVar RandVar/inst RobAStBase RobAStBase/inst RobAStRDA RobAStRDA/inst Message-ID: <20141028114518.CDA451864A7@r-forge.r-project.org> Author: ruckdeschel Date: 2014-10-28 12:45:18 +0100 (Tue, 28 Oct 2014) New Revision: 793 Modified: branches/robast-1.0/pkg/ROptEst/DESCRIPTION branches/robast-1.0/pkg/ROptEst/NAMESPACE branches/robast-1.0/pkg/ROptEst/inst/NEWS branches/robast-1.0/pkg/RandVar/DESCRIPTION branches/robast-1.0/pkg/RandVar/NAMESPACE branches/robast-1.0/pkg/RandVar/inst/NEWS branches/robast-1.0/pkg/RobAStBase/DESCRIPTION branches/robast-1.0/pkg/RobAStBase/NAMESPACE branches/robast-1.0/pkg/RobAStBase/inst/NEWS branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION branches/robast-1.0/pkg/RobAStRDA/NAMESPACE branches/robast-1.0/pkg/RobAStRDA/inst/NEWS Log: [RandVar, RobAStBase, ROptEst, RobAStRDA]: fixed some issue with (second-order) imported NAMESPACE (from pkg. startupmsg) and updated NEWS file Modified: branches/robast-1.0/pkg/ROptEst/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2014-10-28 11:45:18 UTC (rev 793) @@ -6,6 +6,7 @@ classes and methods. Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), RandVar(>= 0.9.2), RobAStBase(>= 0.9) +Imports: startupmsg Suggests: RobLox, MASS Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl Modified: branches/robast-1.0/pkg/ROptEst/NAMESPACE =================================================================== --- branches/robast-1.0/pkg/ROptEst/NAMESPACE 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/ROptEst/NAMESPACE 2014-10-28 11:45:18 UTC (rev 793) @@ -4,6 +4,7 @@ import("RandVar") import("distrMod") import("RobAStBase") +importFrom("startupmsg", "buildStartupMessage", "infoShow") exportClasses("asAnscombe", "asL1", "asL4") exportMethods("optIC", Modified: branches/robast-1.0/pkg/ROptEst/inst/NEWS =================================================================== --- branches/robast-1.0/pkg/ROptEst/inst/NEWS 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/ROptEst/inst/NEWS 2014-10-28 11:45:18 UTC (rev 793) @@ -23,6 +23,7 @@ + removed ::: internal dependencies (within distr&robast-Fam's of pkgs) by copying respective routines + adjusted plot-Method for ICs to include the new argument x.vec ++ enhanced imports in DESCRIPTION by explicating second order imports BUGFIXES: @@ -35,7 +36,9 @@ + fixed issue with points plotting in Cniperpoint-plots + in wrapper function CniperPointPlot, arguments 'data' and 'alpha.trsp' had not been passed on correctly - ++ some changes in wrapper to cniperpointplot ++ fixed an error in cniperPointPlot() -- default for argument risk had not + been passed on correctly to cniperCont() ####################################### version 0.9 ####################################### Modified: branches/robast-1.0/pkg/RandVar/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RandVar/DESCRIPTION 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RandVar/DESCRIPTION 2014-10-28 11:45:18 UTC (rev 793) @@ -4,6 +4,7 @@ Title: Implementation of random variables Description: Implementation of random variables by means of S4 classes and methods Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5) +Imports: startupmsg Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl ByteCompile: yes Modified: branches/robast-1.0/pkg/RandVar/NAMESPACE =================================================================== --- branches/robast-1.0/pkg/RandVar/NAMESPACE 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RandVar/NAMESPACE 2014-10-28 11:45:18 UTC (rev 793) @@ -1,6 +1,7 @@ import("methods") import("distr") import("distrEx") +importFrom("startupmsg", "buildStartupMessage", "infoShow") exportClasses("OptionalrSpace") exportClasses("RandVariable", Modified: branches/robast-1.0/pkg/RandVar/inst/NEWS =================================================================== --- branches/robast-1.0/pkg/RandVar/inst/NEWS 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RandVar/inst/NEWS 2014-10-28 11:45:18 UTC (rev 793) @@ -8,6 +8,13 @@ information) ####################################### +version 1.0 +####################################### + +under the hood: +enhanced imports in DESCRIPTION by explicating second order imports + +####################################### version 0.9 ####################################### Modified: branches/robast-1.0/pkg/RobAStBase/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RobAStBase/DESCRIPTION 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RobAStBase/DESCRIPTION 2014-10-28 11:45:18 UTC (rev 793) @@ -6,6 +6,7 @@ Depends: R(>= 2.14.0), methods, rrcov, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), RandVar(>= 0.9.2) Suggests: ROptEst, RUnit (>= 0.4.26) +Imports: startupmsg Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph"), email="Matthias.Kohl at stamats.de"), person("Peter", "Ruckdeschel", role=c("aut", "cph")), person("R Core Team", role = c("ctb", "cph"), Modified: branches/robast-1.0/pkg/RobAStBase/NAMESPACE =================================================================== --- branches/robast-1.0/pkg/RobAStBase/NAMESPACE 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RobAStBase/NAMESPACE 2014-10-28 11:45:18 UTC (rev 793) @@ -4,6 +4,7 @@ import("distrEx") import("distrMod") import("RandVar") +importFrom("startupmsg", "buildStartupMessage", "infoShow") exportClasses("Neighborhood", "UncondNeighborhood", Modified: branches/robast-1.0/pkg/RobAStBase/inst/NEWS =================================================================== --- branches/robast-1.0/pkg/RobAStBase/inst/NEWS 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RobAStBase/inst/NEWS 2014-10-28 11:45:18 UTC (rev 793) @@ -62,6 +62,7 @@ objects of class "GEVkStepEstimate", i.e. which inherit from both "kStepEstimate", so that a diag-method for "GEVEstimate" becomes available for this class. ++ enhanced imports in DESCRIPTION by explicating second order imports BUGFIXES: Modified: branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION 2014-10-28 11:45:18 UTC (rev 793) @@ -5,6 +5,7 @@ Description: sysdata.rda for packages of RobASt - Family of Pkgs; is currently used by pkg RobExtremes only. Depends: R (>= 2.14.0), methods +Imports: startupmsg Author: Peter Ruckdeschel, Matthias Kohl Maintainer: Peter Ruckdeschel LazyData: yes Modified: branches/robast-1.0/pkg/RobAStRDA/NAMESPACE =================================================================== --- branches/robast-1.0/pkg/RobAStRDA/NAMESPACE 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RobAStRDA/NAMESPACE 2014-10-28 11:45:18 UTC (rev 793) @@ -1 +1,2 @@ -import(methods) \ No newline at end of file +import(methods) +importFrom("startupmsg", "buildStartupMessage", "infoShow") Modified: branches/robast-1.0/pkg/RobAStRDA/inst/NEWS =================================================================== --- branches/robast-1.0/pkg/RobAStRDA/inst/NEWS 2014-10-21 17:59:35 UTC (rev 792) +++ branches/robast-1.0/pkg/RobAStRDA/inst/NEWS 2014-10-28 11:45:18 UTC (rev 793) @@ -17,6 +17,7 @@ under the hood: + warning methods about not importing from methods ... ++ enhanced imports in DESCRIPTION by explicating second order imports BUGFIXES: From noreply at r-forge.r-project.org Tue Oct 28 12:50:37 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 28 Oct 2014 12:50:37 +0100 (CET) Subject: [Robast-commits] r794 - in branches/robast-1.0/pkg/RobExtremes: . R inst Message-ID: <20141028115037.E9EC91866D5@r-forge.r-project.org> Author: ruckdeschel Date: 2014-10-28 12:50:37 +0100 (Tue, 28 Oct 2014) New Revision: 794 Modified: branches/robast-1.0/pkg/RobExtremes/DESCRIPTION branches/robast-1.0/pkg/RobExtremes/NAMESPACE branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R branches/robast-1.0/pkg/RobExtremes/inst/NEWS Log: [RobExtremes]: fixed some issue with (second-order) imported NAMESPACE (from pkg. startupmsg) and updated NEWS file; fixed missing 1/n in gev.diag / gpd.diag (spotted by Bernhard Spangl) Modified: branches/robast-1.0/pkg/RobExtremes/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RobExtremes/DESCRIPTION 2014-10-28 11:45:18 UTC (rev 793) +++ branches/robast-1.0/pkg/RobExtremes/DESCRIPTION 2014-10-28 11:50:37 UTC (rev 794) @@ -6,7 +6,7 @@ packages distr, distrEx, distrMod, RobAStBase, and ROptEst) Depends: R (>= 2.14.0), methods, distrMod(>= 2.5.2), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar Suggests: RUnit (>= 0.4.26), ismev (>= 1.39) -Imports: RobAStRDA, distr, distrEx, RandVar, RobAStBase +Imports: RobAStRDA, distr, distrEx, RandVar, RobAStBase, startupmsg Author: Peter Ruckdeschel, Matthias Kohl, Nataliya Horbenko Maintainer: Peter Ruckdeschel LazyLoad: yes Modified: branches/robast-1.0/pkg/RobExtremes/NAMESPACE =================================================================== --- branches/robast-1.0/pkg/RobExtremes/NAMESPACE 2014-10-28 11:45:18 UTC (rev 793) +++ branches/robast-1.0/pkg/RobExtremes/NAMESPACE 2014-10-28 11:50:37 UTC (rev 794) @@ -11,6 +11,7 @@ import("ROptEst") import("actuar") import("evd") +importFrom("startupmsg", "buildStartupMessage", "infoShow") exportClasses("GumbelParameter", "ParetoParameter", Modified: branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R =================================================================== --- branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R 2014-10-28 11:45:18 UTC (rev 793) +++ branches/robast-1.0/pkg/RobExtremes/R/gevgpddiag.R 2014-10-28 11:50:37 UTC (rev 794) @@ -122,7 +122,7 @@ se <- diag(cova)^.5 } dimnames(cova) <- list(nam,nam) - z0$cov <- cova + z0$cov <- cova/n names(se) <- nam z0$se <- se Modified: branches/robast-1.0/pkg/RobExtremes/inst/NEWS =================================================================== --- branches/robast-1.0/pkg/RobExtremes/inst/NEWS 2014-10-28 11:45:18 UTC (rev 793) +++ branches/robast-1.0/pkg/RobExtremes/inst/NEWS 2014-10-28 11:50:37 UTC (rev 794) @@ -31,7 +31,8 @@ added Encoding due to warning about character 2292 in my locale + removed ::: internal dependencies (within distr&robast-Fam's of pkgs) by copying respective routines - ++ enhanced imports in DESCRIPTION by explicating second order imports ++ gev.diag, gpd.diag now check for existence of se's and ascov BUGFIXES: + fixed issue with updateStep in kStepEstimator when using interpol risks (somehow modifyIC had not been attached in prior steps...) @@ -58,6 +59,7 @@ + cleaned small buglet in modifyPar + corrected link in Var.Rd + put code in \dontrun to reduce checking time ++ some issues fixed with gev.diag gpd.diag S4 methods #######################################