From noreply at r-forge.r-project.org Mon Sep 2 17:26:28 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 2 Sep 2013 17:26:28 +0200 (CEST) Subject: [Robast-commits] r684 - in branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes: . Bilder zum Auswahl Message-ID: <20130902152628.97786185CF0@r-forge.r-project.org> Author: pupashenko Date: 2013-09-02 17:26:28 +0200 (Mon, 02 Sep 2013) New Revision: 684 Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/.Rhistory branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/AuswhalSkript.R branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GEV_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GEV_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GPD_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GPD_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Gamma_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Gamma_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Weibull_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Weibull_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_GEV.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_GPD.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_Gamma.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_Weibull.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_GEV_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_GEV_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_GPD_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_GPD_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_Gamma_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_Gamma_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_Weibull_optIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/infoPlot_Weibull_robIC.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/outllyingPlot_GEV.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/outllyingPlot_GPD.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/outllyingPlot_Gamma.png branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/outllyingPlot_Weibull.png Log: - Ticket # 149 - Vignette RobExtremes: Diagnostik - Auswahl der Bilder + Outlyingnessplot + cniperPlot + ICplot mit Daten + infoPlot Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/.Rhistory =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/.Rhistory (rev 0) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/.Rhistory 2013-09-02 15:26:28 UTC (rev 684) @@ -0,0 +1,512 @@ +# +# # GEV +# dev.new() +# fam = GEVFamily(loc = 0, scale = 1, shape = 0.7) +# X=distribution(fam) +# x = r(X)(1000) +# outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +# +# # Gamma +# dev.new() +# fam = GammaFamily() +# X=distribution(fam) +# x = r(X)(1000) +# outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +# +# # Weibull +# dev.new() +# fam = WeibullFamily(scale = 0.5, shape = 1) +# X=distribution(fam) +# x = r(X)(1000) +# outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +# +# ### infoPlotWrapper ######################################################################## +# GPD +fam = GParetoFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +# +# +# # GEV +# fam = GEVFamily() +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# data = r(Y)(1000) +# # dev.new() +# # infoPlotWrapper(IC, alpha.trsp=100, with.legend = TRUE, rescale = TRUE, withCall = TRUE) +# dev.new() +# infoPlotWrapper(IC, data, rescale = TRUE, withCall = FALSE) +# +# # Gamma +# fam = GammaFamily() +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# data = r(Y)(1000) +# # dev.new() +# # infoPlotWrapper(IC) +# dev.new() +# infoPlotWrapper(IC, data, withCall = FALSE) +# +# # Weibull +# fam = WeibullFamily() +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# data = r(Y)(1000) +# # dev.new() +# # infoPlotWrapper(IC, alpha.trsp=30, with.legend = TRUE, withCall = FALSE) +# dev.new() +# infoPlotWrapper(IC, data, withCall = FALSE) +# +# ### cniperPointPlotWrapper ################################################################# +# # GPD +# dev.new() +# fam = GParetoFamily() +# cniperPointPlotWrapper(fam=fam, main = "GPD", lower = 0, upper = 10, withCall = FALSE) +# +# # GEV +# dev.new() +# fam = GEVFamily() +# cniperPointPlotWrapper(fam=fam, main = "GEV", lower = 0, upper = 5, withCall = FALSE) +# +# # Gamma +# dev.new() +# fam = GammaFamily() +# cniperPointPlotWrapper(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +# +# # Weibull +# dev.new() +# fam = WeibullFamily() +# cniperPointPlotWrapper(fam=fam, main = "Weibull", withCall = FALSE) +# GPD +fam = GParetoFamily(loc = 0, scale = 0.5, shape = 0.1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +# GPD +fam = GParetoFamily(loc = 0, scale = 0.1, shape = 0.1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = GParetoFamily(loc = 0, scale = 0.5, shape = 0.1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=50, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=50, withCall = FALSE) +fam = GParetoFamily(loc = 0, scale = 0.5, shape = 0.1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=30, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=30, withCall = FALSE) +fam = GEVFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +GEVFamily +fam = GEVFamily(loc = 0, scale = 0.5, shape = 1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +fam = GEVFamily(loc = 0, scale = 1, shape = 0.7) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +fam = GammaFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = GammaFamily(scale = 0.1, shape = 0.5) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = GammaFamily(scale = 0.3, shape = 1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = GammaFamily(scale = 0.1, shape = 0.3) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = GammaFamily(scale = 0.1, shape = 0.7) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = GammaFamily(scale = 0.1, shape = 0.5) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = WeibullFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +IC <- optIC(model = fam, risk = asCov()) +fam = WeibullFamily(scale = 0.1, shape = 0.5) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +fam = WeibullFamily(scale = 0.2, shape = 0.7) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +dev.new() +fam = GParetoFamily() +cniperPointPlotWrapper(fam=fam, main = "GPD", lower = 0, upper = 10, withCall = FALSE) +# ### cniperPointPlotWrapper ################################################################# +# GPD +dev.new() +fam = GParetoFamily() +cniperPointPlotWrapper(fam=fam, main = "GPD", lower = 0, upper = 10, withCall = FALSE) +# GEV +dev.new() +fam = GEVFamily() +cniperPointPlotWrapper(fam=fam, main = "GEV", lower = 0, upper = 5, withCall = FALSE) +# Gamma +dev.new() +fam = GammaFamily() +cniperPointPlotWrapper(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +# Weibull +dev.new() +fam = WeibullFamily() +cniperPointPlotWrapper(fam=fam, main = "Weibull", withCall = FALSE) +# Gamma +dev.new() +fam = GammaFamily(scale = 1, shape = 1) +cniperPointPlotWrapper(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +require(RobExtremes) +require(distr) +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperCont.R") +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/ICAllPlotWrapper.R") +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/outlyingPlotWrapper.R") +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/infoPlotWrapper.R") +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperPointPlotWrapper.R") +setwd("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl") +windows.options(width=15, height=12) +### ICAllPlotWrapper ######################################################################## +# GPD +fam = GParetoFamily(loc = 0, scale = 0.5, shape = 0.1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y = r(Y)(1000) +dev.new() +png(filename = "ICAllPlot_GPD_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(IC, y, alpha.trsp = 100, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "ICAllPlot_GPD_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(ICr, y, alpha.trsp = 100, withCall = FALSE) +dev.off() +# GEV +fam = GEVFamily(loc = 0, scale = 0.5, shape = 0.1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y = r(Y)(1000) +dev.new() +png(filename = "ICAllPlot_GEV_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(IC, y, alpha.trsp = 100, rescale = TRUE, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "ICAllPlot_GEV_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(ICr, y, alpha.trsp = 100, rescale = TRUE, withCall = FALSE) +dev.off() +# Gamma +fam = GammaFamily(scale = 0.5, shape = 0.5) +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y = r(Y)(1000) +dev.new() +png(filename = "ICAllPlot_Gamma_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(IC, y, alpha.trsp = 100, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "ICAllPlot_Gamma_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(ICr, y, alpha.trsp = 100, withCall = FALSE) +dev.off() +# Weibull +fam = WeibullFamily(scale = 0.5, shape = 1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y = r(Y)(1000) +dev.new() +png(filename = "ICAllPlot_Weibull_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(IC, y, alpha.trsp = 100, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "ICAllPlot_Weibull_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +ICAllPlotWrapper(ICr, y, alpha.trsp = 100, withCall = FALSE) +dev.off() +### outllyingPlotWrapper ################################################################### +# GPD +dev.new() +png(filename = "outllyingPlot_GPD.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = GParetoFamily(loc = 0, scale = 1, shape = 1) +X=distribution(fam) +x = r(X)(1000) +outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +dev.off() +# GEV +dev.new() +png(filename = "outllyingPlot_GEV.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = GEVFamily(loc = 0, scale = 1, shape = 0.7) +X=distribution(fam) +x = r(X)(1000) +outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +dev.off() +# Gamma +dev.new() +png(filename = "outllyingPlot_Gamma.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = GammaFamily() +X=distribution(fam) +x = r(X)(1000) +outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +dev.off() +# Weibull +dev.new() +png(filename = "outllyingPlot_Weibull.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = WeibullFamily(scale = 0.5, shape = 1) +X=distribution(fam) +x = r(X)(1000) +outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +dev.off() +### infoPlotWrapper ######################################################################## +# GPD +fam = GParetoFamily(loc = 0, scale = 0.5, shape = 0.1) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +png(filename = "infoPlot_GPD_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(IC, data, alpha.trsp=30, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "infoPlot_GPD_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(ICr, data, alpha.trsp=30, withCall = FALSE) +dev.off() +# GEV +fam = GEVFamily(loc = 0, scale = 1, shape = 0.7) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +png(filename = "infoPlot_GEV_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(IC, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "infoPlot_GEV_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(ICr, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +dev.off() +# Gamma +fam = GammaFamily(scale = 0.1, shape = 0.5) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +png(filename = "infoPlot_Gamma_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "infoPlot_Gamma_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +dev.off() +# Weibull +fam = WeibullFamily(scale = 0.2, shape = 0.7) +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +data = r(Y)(1000) +dev.new() +png(filename = "infoPlot_Weibull_optIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +dev.off() +rfam = InfRobModel(fam, ContNeighborhood(0.5)) +ICr <- optIC(model = rfam, risk = asBias()) +dev.new() +png(filename = "infoPlot_Weibull_robIC.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +dev.off() +# ### cniperPointPlotWrapper ################################################################# +# GPD +dev.new() +png(filename = "cniperPointPlot_GPD.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = GParetoFamily() +cniperPointPlotWrapper(fam=fam, main = "GPD", lower = 0, upper = 10, withCall = FALSE) +dev.off() +# GEV +dev.new() +png(filename = "cniperPointPlot_GEV.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = GEVFamily() +cniperPointPlotWrapper(fam=fam, main = "GEV", lower = 0, upper = 5, withCall = FALSE) +dev.off() +# Gamma +dev.new() +png(filename = "cniperPointPlot_Gamma.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = GammaFamily() +cniperPointPlotWrapper(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +dev.off() +# Weibull +dev.new() +png(filename = "cniperPointPlot_Weibull.png", +width = 900, height = 700, units = "px", pointsize = 12, +bg = "white") +fam = WeibullFamily() +cniperPointPlotWrapper(fam=fam, main = "Weibull", withCall = FALSE) +dev.off() Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/AuswhalSkript.R =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/AuswhalSkript.R (rev 0) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/AuswhalSkript.R 2013-09-02 15:26:28 UTC (rev 684) @@ -0,0 +1,264 @@ +require(RobExtremes) +require(distr) + +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperCont.R") + +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/ICAllPlotWrapper.R") +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/outlyingPlotWrapper.R") +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/infoPlotWrapper.R") +source("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperPointPlotWrapper.R") + +setwd("D:/Dropbox/My Mathematics/Researches Misha/Current Research/11.06 - KL PhD/PhD Thesis/Reports for Project/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl") +windows.options(width=15, height=12) +# ### ICAllPlotWrapper ######################################################################## +# # GPD +# fam = GParetoFamily(loc = 0, scale = 0.5, shape = 0.1) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# y = r(Y)(1000) +# dev.new() +# png(filename = "ICAllPlot_GPD_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(IC, y, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "ICAllPlot_GPD_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(ICr, y, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# # GEV +# fam = GEVFamily(loc = 0, scale = 0.5, shape = 0.1) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# y = r(Y)(1000) +# dev.new() +# png(filename = "ICAllPlot_GEV_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(IC, y, alpha.trsp = 100, rescale = TRUE, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "ICAllPlot_GEV_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(ICr, y, alpha.trsp = 100, rescale = TRUE, withCall = FALSE) +# dev.off() +# +# # Gamma +# fam = GammaFamily(scale = 0.5, shape = 0.5) +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# y = r(Y)(1000) +# dev.new() +# png(filename = "ICAllPlot_Gamma_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(IC, y, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "ICAllPlot_Gamma_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(ICr, y, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# # Weibull +# fam = WeibullFamily(scale = 0.5, shape = 1) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# y = r(Y)(1000) +# dev.new() +# png(filename = "ICAllPlot_Weibull_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(IC, y, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "ICAllPlot_Weibull_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# ICAllPlotWrapper(ICr, y, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# ### outllyingPlotWrapper ################################################################### +# # GPD +# dev.new() +# png(filename = "outllyingPlot_GPD.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = GParetoFamily(loc = 0, scale = 1, shape = 1) +# X=distribution(fam) +# x = r(X)(1000) +# outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# # GEV +# dev.new() +# png(filename = "outllyingPlot_GEV.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = GEVFamily(loc = 0, scale = 1, shape = 0.7) +# X=distribution(fam) +# x = r(X)(1000) +# outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# # Gamma +# dev.new() +# png(filename = "outllyingPlot_Gamma.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = GammaFamily() +# X=distribution(fam) +# x = r(X)(1000) +# outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +# dev.off() +# +# # Weibull +# dev.new() +# png(filename = "outllyingPlot_Weibull.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = WeibullFamily(scale = 0.5, shape = 1) +# X=distribution(fam) +# x = r(X)(1000) +# outlyingPlotWrapper(x,alpha=0.95,fam=fam, alpha.trsp = 100, withCall = FALSE) +# dev.off() + +# ### infoPlotWrapper ######################################################################## +# # GPD +# fam = GParetoFamily(loc = 0, scale = 0.5, shape = 0.1) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# data = r(Y)(1000) +# dev.new() +# png(filename = "infoPlot_GPD_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(IC, data, alpha.trsp=30, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "infoPlot_GPD_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(ICr, data, alpha.trsp=30, withCall = FALSE) +# dev.off() +# +# # GEV +# fam = GEVFamily(loc = 0, scale = 1, shape = 0.7) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# data = r(Y)(1000) +# dev.new() +# png(filename = "infoPlot_GEV_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(IC, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "infoPlot_GEV_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(ICr, data, alpha.trsp=100, rescale = TRUE, withCall = FALSE) +# dev.off() +# +# # Gamma +# fam = GammaFamily(scale = 0.1, shape = 0.5) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# data = r(Y)(1000) +# dev.new() +# png(filename = "infoPlot_Gamma_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "infoPlot_Gamma_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +# dev.off() +# +# # Weibull +# fam = WeibullFamily(scale = 0.2, shape = 0.7) +# IC <- optIC(model = fam, risk = asCov()) +# Y=distribution(fam) +# data = r(Y)(1000) +# dev.new() +# png(filename = "infoPlot_Weibull_optIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(IC, data, alpha.trsp=100, withCall = FALSE) +# dev.off() +# +# rfam = InfRobModel(fam, ContNeighborhood(0.5)) +# ICr <- optIC(model = rfam, risk = asBias()) +# dev.new() +# png(filename = "infoPlot_Weibull_robIC.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# infoPlotWrapper(ICr, data, alpha.trsp=100, withCall = FALSE) +# dev.off() + +# # ### cniperPointPlotWrapper ################################################################# +# # GPD +# dev.new() +# png(filename = "cniperPointPlot_GPD.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = GParetoFamily() +# cniperPointPlotWrapper(fam=fam, main = "GPD", lower = 0, upper = 10, withCall = FALSE) +# dev.off() +# +# # GEV +# dev.new() +# png(filename = "cniperPointPlot_GEV.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = GEVFamily() +# cniperPointPlotWrapper(fam=fam, main = "GEV", lower = 0, upper = 5, withCall = FALSE) +# dev.off() +# +# # Gamma +# dev.new() +# png(filename = "cniperPointPlot_Gamma.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = GammaFamily() +# cniperPointPlotWrapper(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +# dev.off() +# +# # Weibull +# dev.new() +# png(filename = "cniperPointPlot_Weibull.png", +# width = 900, height = 700, units = "px", pointsize = 12, +# bg = "white") +# fam = WeibullFamily() +# cniperPointPlotWrapper(fam=fam, main = "Weibull", withCall = FALSE) +# dev.off() Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GEV_optIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GEV_optIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GEV_robIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GEV_robIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GPD_optIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GPD_optIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GPD_robIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_GPD_robIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Gamma_optIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Gamma_optIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Gamma_robIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Gamma_robIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Weibull_optIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Weibull_optIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Weibull_robIC.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/ICAllPlot_Weibull_robIC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_GEV.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_GEV.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_GPD.png =================================================================== (Binary files differ) Property changes on: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/Bilder zum Auswahl/cniperPointPlot_GPD.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 684 From noreply at r-forge.r-project.org Tue Sep 3 20:39:56 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 3 Sep 2013 20:39:56 +0200 (CEST) Subject: [Robast-commits] r685 - in branches/robast-0.9/pkg: ROptReg RobExtremes RobExtremes/R Message-ID: <20130903183956.2E119183D80@r-forge.r-project.org> Author: kroisand Date: 2013-09-03 20:39:55 +0200 (Tue, 03 Sep 2013) New Revision: 685 Modified: branches/robast-0.9/pkg/ROptReg/DESCRIPTION branches/robast-0.9/pkg/RobExtremes/DESCRIPTION branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R Log: Fehler in GEVFamilyMuUnknown behoben, damit es installiert, aber nicht nachgerechnet, dass die Aenderungen auch sinnvoll sind; Beschreibungsdateien von RobExtremes und ROptReg angepasst, dass dort die benoetigten Versionen richtig angegeben sind Modified: branches/robast-0.9/pkg/ROptReg/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/ROptReg/DESCRIPTION 2013-09-02 15:26:28 UTC (rev 684) +++ branches/robast-0.9/pkg/ROptReg/DESCRIPTION 2013-09-03 18:39:55 UTC (rev 685) @@ -5,7 +5,7 @@ Description: Optimally robust estimation for regression-type models using S4 classes and methods (based on distrMod, RobAStBase, and ROptEst) Depends: R (>= 2.14.0), methods, distr(>= 2.3), distrEx(>= 2.3), RandVar(>= 0.8), - distrMod(>=2.4), RobAStBase(>=0.8), ROptEst(>=0.8) + distrMod(>= 2.4), RobAStBase(>= 0.8), ROptEst(>= 0.8) Author: Matthias Kohl, Peter Ruckdeschel, Daria Pupashenko Maintainer: Peter Ruckdeschel LazyLoad: yes Modified: branches/robast-0.9/pkg/RobExtremes/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/RobExtremes/DESCRIPTION 2013-09-02 15:26:28 UTC (rev 684) +++ branches/robast-0.9/pkg/RobExtremes/DESCRIPTION 2013-09-03 18:39:55 UTC (rev 685) @@ -8,8 +8,8 @@ Depends: R (>= 2.14.0), methods, distr(>= 2.4), distrEx(>= 2.4), RandVar(>= 0.8), distrMod(>= 2.5), RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar +Suggests: RUnit (>= 0.4.26) Imports: RobAStRDA -Suggests: RUnit Author: Peter Ruckdeschel, Matthias Kohl, Nataliya Horbenko Maintainer: Peter Ruckdeschel LazyLoad: yes Modified: branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R =================================================================== --- branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R 2013-09-02 15:26:28 UTC (rev 684) +++ branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R 2013-09-03 18:39:55 UTC (rev 685) @@ -68,7 +68,7 @@ theta[3] + theta[1] } names(es) <- "expected shortfall" es }, list(p0 = p)) - bDes <- substitute({ if(theta[3]>=1L){ D0 <- NA, D1 <- D2 <- NA} else { + bDes <- substitute({ if(theta[3]>=1L){ D0 <- NA; D1 <- D2 <- NA} else { loc <- theta[1]; scale <- theta[2]; shape <- theta[3] pg <- pgamma(-log(p0), 1-theta[3], lower.tail = TRUE) dd <- ddigamma(-log(p0),1-theta[3]) @@ -242,7 +242,7 @@ x0 <- k1^2*2*k I00 <- (2*k)*k1^2*G20/sc^2 I01 <- (G10-k1*2*G20)*k1/sc^2 - I02 <- [k1*2 * gamma(2k)- k1* gamma(k) - gamma(k)-k * G11]*k1/k + I02 <- (k1*2 * gamma(2*k)- k1* gamma(k) - gamma(k)-k * G11)*k1/k I02 <- (2*k1*G20 -(k+2)*G10-k*G11)*k1/k/sc I11 <- G20*x0-2*G10*k*(k+1)+1 I11 <- I11/sc^2/k^2 From noreply at r-forge.r-project.org Sat Sep 7 05:52:05 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 7 Sep 2013 05:52:05 +0200 (CEST) Subject: [Robast-commits] r686 - in branches/robast-0.9/pkg: ROptEst ROptEst/R ROptEst/man ROptEstOld ROptReg ROptRegTS ROptRegTS/man RandVar RobAStBase RobAStBase/R RobAStBase/man RobAStRDA RobExtremes RobExtremes/R RobExtremes/man RobLox RobLox/R RobLoxBioC RobRex Message-ID: <20130907035205.9DD70185E55@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-07 05:52:05 +0200 (Sat, 07 Sep 2013) New Revision: 686 Added: branches/robast-0.9/pkg/ROptEst/.Rbuildignore branches/robast-0.9/pkg/ROptEst/R/00internal.R branches/robast-0.9/pkg/ROptEstOld/.Rbuildignore branches/robast-0.9/pkg/ROptReg/.Rbuildignore branches/robast-0.9/pkg/ROptRegTS/.Rbuildignore branches/robast-0.9/pkg/RandVar/.Rbuildignore branches/robast-0.9/pkg/RobAStBase/.Rbuildignore branches/robast-0.9/pkg/RobAStBase/R/00internal.R branches/robast-0.9/pkg/RobAStRDA/.Rbuildignore branches/robast-0.9/pkg/RobExtremes/.Rbuildignore branches/robast-0.9/pkg/RobExtremes/R/00fromRobAStRDA.R branches/robast-0.9/pkg/RobLox/.Rbuildignore branches/robast-0.9/pkg/RobLoxBioC/.Rbuildignore branches/robast-0.9/pkg/RobRex/.Rbuildignore Removed: branches/robast-0.9/pkg/RobExtremes/R/internals.R Modified: branches/robast-0.9/pkg/ROptEst/NAMESPACE branches/robast-0.9/pkg/ROptEst/R/cniperCont.R branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asBias.R branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asHampel.R branches/robast-0.9/pkg/ROptEst/R/roptest.R branches/robast-0.9/pkg/ROptEst/R/roptest.new.R branches/robast-0.9/pkg/ROptEst/man/getAsRisk.Rd branches/robast-0.9/pkg/ROptEst/man/getInfClip.Rd branches/robast-0.9/pkg/ROptEst/man/getInfRad.Rd branches/robast-0.9/pkg/ROptEst/man/optRisk.Rd branches/robast-0.9/pkg/ROptEstOld/NAMESPACE branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION branches/robast-0.9/pkg/ROptRegTS/man/Av1CondContIC.Rd branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd branches/robast-0.9/pkg/ROptRegTS/man/Av2CondContIC.Rd branches/robast-0.9/pkg/ROptRegTS/man/CondContIC.Rd branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd branches/robast-0.9/pkg/ROptRegTS/man/L2RegTypeFamily.Rd branches/robast-0.9/pkg/ROptRegTS/man/getAsRiskRegTS.Rd branches/robast-0.9/pkg/ROptRegTS/man/getFiRiskRegTS.Rd branches/robast-0.9/pkg/ROptRegTS/man/getInfCentRegTS.Rd branches/robast-0.9/pkg/ROptRegTS/man/getInfClipRegTS.Rd branches/robast-0.9/pkg/ROptRegTS/man/getInfGammaRegTS.Rd branches/robast-0.9/pkg/ROptRegTS/man/getInfRobRegTypeIC.Rd branches/robast-0.9/pkg/ROptRegTS/man/getInfStandRegTS.Rd branches/robast-0.9/pkg/ROptRegTS/man/optIC-methods.Rd branches/robast-0.9/pkg/RandVar/DESCRIPTION branches/robast-0.9/pkg/RobAStBase/NAMESPACE branches/robast-0.9/pkg/RobAStBase/R/AllPlot.R branches/robast-0.9/pkg/RobAStBase/R/bALEstimate.R branches/robast-0.9/pkg/RobAStBase/R/comparePlot.R branches/robast-0.9/pkg/RobAStBase/R/ddPlot_utils.R branches/robast-0.9/pkg/RobAStBase/R/infoPlot.R branches/robast-0.9/pkg/RobAStBase/R/kStepEstimator.R branches/robast-0.9/pkg/RobAStBase/R/oneStepEstimator.R branches/robast-0.9/pkg/RobAStBase/R/plotRescaledAxis.R branches/robast-0.9/pkg/RobAStBase/R/qqplot.R branches/robast-0.9/pkg/RobAStBase/man/outlyingPlotIC.Rd branches/robast-0.9/pkg/RobExtremes/NAMESPACE branches/robast-0.9/pkg/RobExtremes/R/AllClass.R branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R branches/robast-0.9/pkg/RobExtremes/R/interpolSn.R branches/robast-0.9/pkg/RobExtremes/man/getStartIC-methods.Rd branches/robast-0.9/pkg/RobExtremes/man/mov2bckRef-methods.Rd branches/robast-0.9/pkg/RobExtremes/man/validParameter-methods.Rd branches/robast-0.9/pkg/RobLox/DESCRIPTION branches/robast-0.9/pkg/RobLox/NAMESPACE branches/robast-0.9/pkg/RobLox/R/rowRoblox.R branches/robast-0.9/pkg/RobLoxBioC/DESCRIPTION branches/robast-0.9/pkg/RobLoxBioC/NAMESPACE Log: modified the packages according to Rdev-r63824 (no more ::: ..., line breaks in \usage in .Rd) Added: branches/robast-0.9/pkg/ROptEst/.Rbuildignore =================================================================== --- branches/robast-0.9/pkg/ROptEst/.Rbuildignore (rev 0) +++ branches/robast-0.9/pkg/ROptEst/.Rbuildignore 2013-09-07 03:52:05 UTC (rev 686) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: branches/robast-0.9/pkg/ROptEst/NAMESPACE =================================================================== --- branches/robast-0.9/pkg/ROptEst/NAMESPACE 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/NAMESPACE 2013-09-07 03:52:05 UTC (rev 686) @@ -36,4 +36,6 @@ export("roptest","roptest.old", "robest", "getLagrangeMultByOptim","getLagrangeMultByIter") export("genkStepCtrl", "genstartCtrl", "gennbCtrl") -export("cniperCont", "cniperPoint", "cniperPointPlot") \ No newline at end of file +export("cniperCont", "cniperPoint", "cniperPointPlot") +export(".generateInterpGrid",".getLMGrid",".saveGridToCSV", ".readGridFromCSV") +export(".RMXE.th",".OMSE.th", ".MBRE.th") \ No newline at end of file Added: branches/robast-0.9/pkg/ROptEst/R/00internal.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/00internal.R (rev 0) +++ branches/robast-0.9/pkg/ROptEst/R/00internal.R 2013-09-07 03:52:05 UTC (rev 686) @@ -0,0 +1,7 @@ +.rescalefct <- RobAStBase:::.rescalefct +.plotRescaledAxis <- RobAStBase:::.plotRescaledAxis +.makedotsP <- RobAStBase:::.makedotsP +.makedotsLowLevel <- RobAStBase:::.makedotsLowLevel +.SelectOrderData <- RobAStBase:::.SelectOrderData +### helper function to recursively evaluate list +.evalListRec <- RobAStBase:::.evalListRec Modified: branches/robast-0.9/pkg/ROptEst/R/cniperCont.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/cniperCont.R 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/R/cniperCont.R 2013-09-07 03:52:05 UTC (rev 686) @@ -1,8 +1,3 @@ -.rescalefct <- RobAStBase:::.rescalefct -.plotRescaledAxis <- RobAStBase:::.plotRescaledAxis -.makedotsP <- RobAStBase:::.makedotsP -.makedotsLowLevel <- RobAStBase:::.makedotsLowLevel -.SelectOrderData <- RobAStBase:::.SelectOrderData .plotData <- function( ## helper function for cniper-type plots to plot in data Modified: branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asBias.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asBias.R 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asBias.R 2013-09-07 03:52:05 UTC (rev 686) @@ -93,7 +93,7 @@ A.comp <- matrix(rep(TRUE,k*k),nrow=k) # otherwise if trafo == unitMatrix may use symmetry info - if(distrMod:::.isUnitMatrix(trafo)){ + if(.isUnitMatrix(trafo)){ comp <- .getComp(L2deriv, DistrSymm, L2derivSymm, L2derivDistrSymm) z.comp <- comp$"z.comp" A.comp <- comp$"A.comp" Modified: branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asGRisk.R 2013-09-07 03:52:05 UTC (rev 686) @@ -247,7 +247,7 @@ A.comp <- matrix(rep(TRUE,k*k),nrow=k) # otherwise if trafo == unitMatrix may use symmetry info - if(distrMod:::.isUnitMatrix(trafo)){ + if(.isUnitMatrix(trafo)){ comp <- .getComp(L2deriv, DistrSymm, L2derivSymm, L2derivDistrSymm) z.comp <- comp$"z.comp" A.comp <- comp$"A.comp" @@ -494,8 +494,6 @@ iter.In = iter.In, prec.In = prec.In, problem = problem )) }) -### helper function to recursively evaluate list -.evalListRec <- RobAStBase:::.evalListRec ### helper function to return the upper case solution if r=0 .getUpperSol <- function(L2deriv, radius, risk, neighbor, biastype, Modified: branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asHampel.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asHampel.R 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/R/getInfRobIC_asHampel.R 2013-09-07 03:52:05 UTC (rev 686) @@ -209,7 +209,7 @@ A.comp <- matrix(rep(TRUE,k*k),nrow=k) # otherwise if trafo == unitMatrix may use symmetry info - if(distrMod:::.isUnitMatrix(trafo)){ + if(.isUnitMatrix(trafo)){ comp <- .getComp(L2deriv, DistrSymm, L2derivSymm, L2derivDistrSymm) z.comp <- comp$"z.comp" A.comp <- comp$"A.comp" Modified: branches/robast-0.9/pkg/ROptEst/R/roptest.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/roptest.R 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/R/roptest.R 2013-09-07 03:52:05 UTC (rev 686) @@ -111,7 +111,7 @@ ncol = 2) colnames(Infos) <- c("method", "message") - if(! distrMod:::.isUnitMatrix(trafo(L2Fam))) + if(! .isUnitMatrix(trafo(L2Fam))) Infos <- rbind(Infos, c("roptest", paste("computation of IC", ifelse(withUpdateInKer,"with","without") , Modified: branches/robast-0.9/pkg/ROptEst/R/roptest.new.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/roptest.new.R 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/R/roptest.new.R 2013-09-07 03:52:05 UTC (rev 686) @@ -321,7 +321,7 @@ colnames(Infos) <- c("method", "message") - if(! distrMod:::.isUnitMatrix(trafo(L2Fam))) + if(! .isUnitMatrix(trafo(L2Fam))) Infos <- rbind(Infos, c("method"="roptest", "message"=paste("computation of IC", ifelse(kStepCtrl$withUpdateInKer,"with","without") , Modified: branches/robast-0.9/pkg/ROptEst/man/getAsRisk.Rd =================================================================== --- branches/robast-0.9/pkg/ROptEst/man/getAsRisk.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/man/getAsRisk.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -31,32 +31,40 @@ getAsRisk(risk, L2deriv, neighbor, biastype, ...) \S4method{getAsRisk}{asMSE,UnivariateDistribution,Neighborhood,ANY}(risk, - L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand, trafo, ...) + L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand, trafo, ...) \S4method{getAsRisk}{asL1,UnivariateDistribution,Neighborhood,ANY}(risk, - L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand, trafo, ...) + L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand, trafo, ...) \S4method{getAsRisk}{asL4,UnivariateDistribution,Neighborhood,ANY}(risk, - L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand, trafo, ...) + L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand, trafo, ...) \S4method{getAsRisk}{asMSE,EuclRandVariable,Neighborhood,ANY}(risk, - L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand, trafo, ...) + L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand, trafo, ...) \S4method{getAsRisk}{asBias,UnivariateDistribution,ContNeighborhood,ANY}(risk, - L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand = NULL,trafo, ...) + L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand = NULL, trafo, ...) \S4method{getAsRisk}{asBias,UnivariateDistribution,ContNeighborhood,onesidedBias}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand = NULL, trafo, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand = NULL, trafo, ...) \S4method{getAsRisk}{asBias,UnivariateDistribution,ContNeighborhood,asymmetricBias}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand = NULL, trafo, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand = NULL, trafo, ...) \S4method{getAsRisk}{asBias,UnivariateDistribution,TotalVarNeighborhood,ANY}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand = NULL, trafo, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand = NULL, trafo, ...) \S4method{getAsRisk}{asBias,RealRandVariable,ContNeighborhood,ANY}( - risk,L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, stand = NULL, - Distr, DistrSymm, L2derivSymm, + risk,L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent = NULL, + stand = NULL, Distr, DistrSymm, L2derivSymm, L2derivDistrSymm, Finfo, trafo, z.start, A.start, maxiter, tol, warn, verbose = NULL, ...) \S4method{getAsRisk}{asBias,RealRandVariable,TotalVarNeighborhood,ANY}( @@ -66,25 +74,30 @@ warn, verbose = NULL, ...) \S4method{getAsRisk}{asCov,UnivariateDistribution,ContNeighborhood,ANY}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, trafo = NULL, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, + trafo = NULL, ...) \S4method{getAsRisk}{asCov,UnivariateDistribution,TotalVarNeighborhood,ANY}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, trafo = NULL, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, + trafo = NULL, ...) \S4method{getAsRisk}{asCov,RealRandVariable,ContNeighborhood,ANY}(risk, - L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent, stand, Distr, trafo = NULL, - V.comp = matrix(TRUE, ncol = nrow(stand), nrow = nrow(stand)), w, ...) + L2deriv, neighbor, biastype, normtype = NULL, clip = NULL, cent, stand, + Distr, trafo = NULL, V.comp = matrix(TRUE, ncol = nrow(stand), + nrow = nrow(stand)), w, ...) \S4method{getAsRisk}{trAsCov,UnivariateDistribution,UncondNeighborhood,ANY}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, trafo = NULL, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, + trafo = NULL, ...) \S4method{getAsRisk}{trAsCov,RealRandVariable,ContNeighborhood,ANY}(risk, - L2deriv, neighbor, biastype, normtype, clip, cent, stand, Distr, trafo = NULL, - V.comp = matrix(TRUE, ncol = nrow(stand), nrow = nrow(stand)), - w, ...) + L2deriv, neighbor, biastype, normtype, clip, cent, stand, Distr, + trafo = NULL, V.comp = matrix(TRUE, ncol = nrow(stand), + nrow = nrow(stand)), w, ...) \S4method{getAsRisk}{asAnscombe,UnivariateDistribution,UncondNeighborhood,ANY}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, trafo = NULL, FI, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, + trafo = NULL, FI, ...) \S4method{getAsRisk}{asAnscombe,RealRandVariable,ContNeighborhood,ANY}(risk, L2deriv, neighbor, biastype, normtype, clip, cent, stand, Distr, trafo = NULL, @@ -93,10 +106,12 @@ \S4method{getAsRisk}{asUnOvShoot,UnivariateDistribution,UncondNeighborhood,ANY}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, trafo, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, + trafo, ...) \S4method{getAsRisk}{asSemivar,UnivariateDistribution,Neighborhood,onesidedBias}( - risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, trafo, ...) + risk, L2deriv, neighbor, biastype, normtype = NULL, clip, cent, stand, + trafo, ...) } \arguments{ \item{risk}{ object of class \code{"asRisk"}. } Modified: branches/robast-0.9/pkg/ROptEst/man/getInfClip.Rd =================================================================== --- branches/robast-0.9/pkg/ROptEst/man/getInfClip.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/man/getInfClip.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -20,32 +20,32 @@ \usage{ getInfClip(clip, L2deriv, risk, neighbor, ...) -\S4method{getInfClip}{numeric,UnivariateDistribution,asMSE,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asMSE,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfClip}{numeric,UnivariateDistribution,asMSE,TotalVarNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asMSE,TotalVarNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfClip}{numeric,UnivariateDistribution,asL1,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asL1,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfClip}{numeric,UnivariateDistribution,asL1,TotalVarNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asL1,TotalVarNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfClip}{numeric,UnivariateDistribution,asL4,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asL4,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfClip}{numeric,UnivariateDistribution,asL4,TotalVarNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asL4,TotalVarNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfClip}{numeric,EuclRandVariable,asMSE,UncondNeighborhood}(clip, L2deriv, risk, - neighbor, biastype, Distr, stand, cent, trafo) +\S4method{getInfClip}{numeric,EuclRandVariable,asMSE,UncondNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, Distr, stand, cent, trafo) -\S4method{getInfClip}{numeric,UnivariateDistribution,asUnOvShoot,UncondNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asUnOvShoot,UncondNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfClip}{numeric,UnivariateDistribution,asSemivar,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfClip}{numeric,UnivariateDistribution,asSemivar,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) } \arguments{ \item{clip}{ positive real: clipping bound } Modified: branches/robast-0.9/pkg/ROptEst/man/getInfRad.Rd =================================================================== --- branches/robast-0.9/pkg/ROptEst/man/getInfRad.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/man/getInfRad.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -24,32 +24,32 @@ \usage{ getInfRad(clip, L2deriv, risk, neighbor, ...) -\S4method{getInfRad}{numeric,UnivariateDistribution,asMSE,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asMSE,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfRad}{numeric,UnivariateDistribution,asMSE,TotalVarNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asMSE,TotalVarNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfRad}{numeric,UnivariateDistribution,asL1,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asL1,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfRad}{numeric,UnivariateDistribution,asL1,TotalVarNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asL1,TotalVarNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfRad}{numeric,UnivariateDistribution,asL4,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asL4,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfRad}{numeric,UnivariateDistribution,asL4,TotalVarNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asL4,TotalVarNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfRad}{numeric,EuclRandVariable,asMSE,UncondNeighborhood}(clip, L2deriv, risk, - neighbor, biastype, Distr, stand, cent, trafo) +\S4method{getInfRad}{numeric,EuclRandVariable,asMSE,UncondNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, Distr, stand, cent, trafo) -\S4method{getInfRad}{numeric,UnivariateDistribution,asUnOvShoot,UncondNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asUnOvShoot,UncondNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) -\S4method{getInfRad}{numeric,UnivariateDistribution,asSemivar,ContNeighborhood}(clip, L2deriv, - risk, neighbor, biastype, cent, symm, trafo) +\S4method{getInfRad}{numeric,UnivariateDistribution,asSemivar,ContNeighborhood}( + clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo) } \arguments{ \item{clip}{ positive real: clipping bound } Modified: branches/robast-0.9/pkg/ROptEst/man/optRisk.Rd =================================================================== --- branches/robast-0.9/pkg/ROptEst/man/optRisk.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEst/man/optRisk.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -15,12 +15,13 @@ \S4method{optRisk}{L2ParamFamily,asCov}(model, risk) -\S4method{optRisk}{InfRobModel,asRisk}(model, risk, - z.start = NULL, A.start = NULL, upper = 1e4, - maxiter = 50, tol = .Machine$double.eps^0.4, warn = TRUE, noLow = FALSE) +\S4method{optRisk}{InfRobModel,asRisk}(model, risk, z.start = NULL, + A.start = NULL, upper = 1e4, maxiter = 50, + tol = .Machine$double.eps^0.4, warn = TRUE, noLow = FALSE) -\S4method{optRisk}{FixRobModel,fiUnOvShoot}(model, risk, sampleSize, upper = 1e4, maxiter = 50, - tol = .Machine$double.eps^0.4, warn = TRUE, Algo = "A", cont = "left") +\S4method{optRisk}{FixRobModel,fiUnOvShoot}(model, risk, sampleSize, + upper = 1e4, maxiter = 50, tol = .Machine$double.eps^0.4, + warn = TRUE, Algo = "A", cont = "left") } \arguments{ \item{model}{ probability model } Added: branches/robast-0.9/pkg/ROptEstOld/.Rbuildignore =================================================================== --- branches/robast-0.9/pkg/ROptEstOld/.Rbuildignore (rev 0) +++ branches/robast-0.9/pkg/ROptEstOld/.Rbuildignore 2013-09-07 03:52:05 UTC (rev 686) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: branches/robast-0.9/pkg/ROptEstOld/NAMESPACE =================================================================== --- branches/robast-0.9/pkg/ROptEstOld/NAMESPACE 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptEstOld/NAMESPACE 2013-09-07 03:52:05 UTC (rev 686) @@ -2,6 +2,7 @@ import("distr") import("distrEx") import("RandVar") +import("evd") exportClasses("FunctionSymmetry", "NonSymmetric", Added: branches/robast-0.9/pkg/ROptReg/.Rbuildignore =================================================================== --- branches/robast-0.9/pkg/ROptReg/.Rbuildignore (rev 0) +++ branches/robast-0.9/pkg/ROptReg/.Rbuildignore 2013-09-07 03:52:05 UTC (rev 686) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Added: branches/robast-0.9/pkg/ROptRegTS/.Rbuildignore =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/.Rbuildignore (rev 0) +++ branches/robast-0.9/pkg/ROptRegTS/.Rbuildignore 2013-09-07 03:52:05 UTC (rev 686) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION 2013-09-07 03:52:05 UTC (rev 686) @@ -1,6 +1,6 @@ Package: ROptRegTS -Version: 0.9 -Date: 2013-03-22 +Version: 0.9.1 +Date: 2013-09-07 Title: Optimally robust estimation for regression-type models Description: Optimally robust estimation for regression-type models using S4 classes and methods Modified: branches/robast-0.9/pkg/ROptRegTS/man/Av1CondContIC.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/Av1CondContIC.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/Av1CondContIC.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -13,11 +13,13 @@ } \usage{ Av1CondContIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x){x[1]*x[2]}), - Domain = EuclideanSpace(dimension = 2))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x){x[1]*x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clip = Inf, stand = as.matrix(1), - cent = EuclRandVarList(RealRandVariable(Map = list(function(x){numeric(length(x))}), - Domain = EuclideanSpace(dimension = 2))), + cent = EuclRandVarList(RealRandVariable( + Map = list(function(x){numeric(length(x))}), + Domain = EuclideanSpace(dimension = 2))), lowerCase = NULL, neighborRadius = 0) } \arguments{ Modified: branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -13,12 +13,13 @@ } \usage{ Av1CondTotalVarIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clipUp = Inf, stand = as.matrix(1), clipLo = RealRandVariable(Map = list(function(x) {-Inf}), Domain = EuclideanSpace(dimension = 1)), - lowerCase = NULL, neighborRadius = 0) + lowerCase = NULL, neighborRadius = 0) } \arguments{ \item{name}{ object of class \code{"character"}. } Modified: branches/robast-0.9/pkg/ROptRegTS/man/Av2CondContIC.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/Av2CondContIC.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/Av2CondContIC.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -12,9 +12,11 @@ } \usage{ Av2CondContIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2))), - Risks, Infos, clip = Inf, stand = 1, cent = 0, lowerCase = NULL, neighborRadius = 0) + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2))), + Risks, Infos, clip = Inf, stand = 1, cent = 0, lowerCase = NULL, + neighborRadius = 0) } \arguments{ \item{name}{ object of class \code{"character"}. } Modified: branches/robast-0.9/pkg/ROptRegTS/man/CondContIC.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/CondContIC.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/CondContIC.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -13,13 +13,15 @@ } \usage{ CondContIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x){x[1]*x[2]}), - Domain = EuclideanSpace(dimension = 2))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x){x[1]*x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clip = RealRandVariable(Map = list(function(x){ Inf }), Domain = Reals()), stand = as.matrix(1), - cent = EuclRandVarList(RealRandVariable(Map = list(function(x){numeric(length(x))}), - Domain = EuclideanSpace(dimension = 2))), + cent = EuclRandVarList(RealRandVariable( + Map = list(function(x){numeric(length(x))}), + Domain = EuclideanSpace(dimension = 2))), lowerCase = NULL, neighborRadius = 0, neighborRadiusCurve = function(x){1}) } \arguments{ Modified: branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -6,9 +6,10 @@ Generates an object of class \code{"CondIC"}. } \usage{ -CondIC(name, Curve = EuclRandVarList(EuclRandVariable(Map = list(function(x){x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2), - Range = Reals())), +CondIC(name, Curve = EuclRandVarList(EuclRandVariable( + Map = list(function(x){x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2), + Range = Reals())), Risks, Infos, CallL2Fam = call("L2RegTypeFamily")) } \arguments{ Modified: branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -13,8 +13,9 @@ } \usage{ CondTotalVarIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clipUp = RealRandVariable(Map = list(function(x) {Inf}), Domain = Reals()), stand = as.matrix(1), Modified: branches/robast-0.9/pkg/ROptRegTS/man/L2RegTypeFamily.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/L2RegTypeFamily.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/L2RegTypeFamily.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -8,9 +8,10 @@ \usage{ L2RegTypeFamily(name, distribution = LMCondDistribution(), distrSymm, main = 0, nuisance, trafo, param, props = character(0), - L2deriv = EuclRandVarList(EuclRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2), - dimension = 1)), + L2deriv = EuclRandVarList(EuclRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2), + dimension = 1)), ErrorDistr = Norm(), ErrorSymm, RegDistr = Norm(), RegSymm, Regressor = RealRandVariable(Map = list(function(x) {x}), Domain = Reals()), ErrorL2deriv = EuclRandVarList(RealRandVariable(Map = list(function(x) {x}), Modified: branches/robast-0.9/pkg/ROptRegTS/man/getAsRiskRegTS.Rd =================================================================== --- branches/robast-0.9/pkg/ROptRegTS/man/getAsRiskRegTS.Rd 2013-09-03 18:39:55 UTC (rev 685) +++ branches/robast-0.9/pkg/ROptRegTS/man/getAsRiskRegTS.Rd 2013-09-07 03:52:05 UTC (rev 686) @@ -25,47 +25,56 @@ \usage{ getAsRiskRegTS(risk, ErrorL2deriv, Regressor, neighbor, ...) -\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Neighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, trafo) +\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Neighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand, trafo) -\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Av2CondContNeighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, trafo) +\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Av2CondContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand, trafo) -\S4method{getAsRiskRegTS}{asMSE,EuclRandVariable,Distribution,Neighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, trafo) +\S4method{getAsRiskRegTS}{asMSE,EuclRandVariable,Distribution,Neighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand, trafo) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,ContNeighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,ContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondTotalVarNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondTotalVarNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,ContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,ContNeighborhood}( [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 686 From noreply at r-forge.r-project.org Mon Sep 9 11:18:10 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 9 Sep 2013 11:18:10 +0200 (CEST) Subject: [Robast-commits] r687 - branches/robast-0.9/pkg/ROptReg/R Message-ID: <20130909091810.67946185D93@r-forge.r-project.org> Author: kroisand Date: 2013-09-09 11:18:10 +0200 (Mon, 09 Sep 2013) New Revision: 687 Modified: branches/robast-0.9/pkg/ROptReg/R/AllClass.R branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R branches/robast-0.9/pkg/ROptReg/R/generateICfct.R branches/robast-0.9/pkg/ROptReg/R/weights.R Log: offensichtliche Fehler in ROptReg behoben, aber check l?\195?\164uft immer noch nicht durch... Modified: branches/robast-0.9/pkg/ROptReg/R/AllClass.R =================================================================== --- branches/robast-0.9/pkg/ROptReg/R/AllClass.R 2013-09-07 03:52:05 UTC (rev 686) +++ branches/robast-0.9/pkg/ROptReg/R/AllClass.R 2013-09-09 09:18:10 UTC (rev 687) @@ -80,7 +80,7 @@ ErrorL2derivSymm = new("FunSymmList"), ErrorL2derivDistr = UnivarDistrList(Norm()), ErrorL2derivDistrSymm = new("DistrSymmList"), - FisherInfo = new("PosDefSymmMatrix", matrix(1)) + FisherInfo = new("PosDefSymmMatrix", matrix(1)), FisherInfo.fct = function(theta)return(new("PosDefSymmMatrix", matrix(1))) ), contains = "RegTypeFamily", @@ -144,7 +144,7 @@ ErrorL2derivSymm = new("FunSymmList"), ErrorL2derivDistr = UnivarDistrList(Norm()), ErrorL2derivDistrSymm = new("DistrSymmList"), - FisherInfo = new("PosDefSymmMatrix", matrix(1)) + FisherInfo = new("PosDefSymmMatrix", matrix(1)), FisherInfo.fct = function(theta)return(new("PosDefSymmMatrix", matrix(1))) ), contains = "RegTypeFamily", Modified: branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R =================================================================== --- branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R 2013-09-07 03:52:05 UTC (rev 686) +++ branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R 2013-09-09 09:18:10 UTC (rev 687) @@ -43,23 +43,6 @@ setMethod("generateIC", signature(neighbor = "CondTotalVarNeighborhood", L2Fam = "L2RegTypeFamily"), function(neighbor, L2Fam, res){ - return(CondContIC( - name = "conditionally centered IC of contamination type", - CallL2Fam = L2call, - Curve = generateIC.fct(neighbor, L2Fam, res), - clip = b, - cent = a, - stand = A, - lowerCase = d, - neighborRadius = neighbor at radius, - neighborRadiusCurve = neighbor at radiusCurve, - modifyIC = res$modifyIC, - normtype = normtype, - biastype = biastype, - Risks = res$risk, - Infos = matrix(res$info, ncol = 2, - dimnames = list(character(0), c("method", "message"))))) - }) A <- res$A a <- res$a b <- res$b @@ -71,7 +54,7 @@ L2call$trafo <- trafo(L2Fam) return(CondTotalVarIC( name = "conditionally centered IC of contamination type", - CallL2Fam = L2call + CallL2Fam = L2call, Curve = generateIC.fct(neighbor, L2Fam, res), clipUp = b, clipLo = a, Modified: branches/robast-0.9/pkg/ROptReg/R/generateICfct.R =================================================================== --- branches/robast-0.9/pkg/ROptReg/R/generateICfct.R 2013-09-07 03:52:05 UTC (rev 686) +++ branches/robast-0.9/pkg/ROptReg/R/generateICfct.R 2013-09-09 09:18:10 UTC (rev 687) @@ -213,7 +213,7 @@ }else{ body(ICfct[[1]]) <- substitute( { L2x <- L2(x[k+1])-z - ind <- .eq(L2x)) + ind <- .eq(L2x) D <- matrix(D.vec, ncol = k) K.inv <- matrix(K.vec, ncol = k) D %*% K.inv %*% x[1:k]*ifelse(ind, NA, L2x*w(L2x)) }, Modified: branches/robast-0.9/pkg/ROptReg/R/weights.R =================================================================== --- branches/robast-0.9/pkg/ROptReg/R/weights.R 2013-09-07 03:52:05 UTC (rev 686) +++ branches/robast-0.9/pkg/ROptReg/R/weights.R 2013-09-09 09:18:10 UTC (rev 687) @@ -25,7 +25,7 @@ .fac <- function(norm,D,Kinv){ if(is(norm,"SelfNorm")||is(norm,"InfoNorm")){ 1/sqrt(nrow(D)) - }else{ if(norm,"QFNorm"){ + }else{ if(is(norm,"QFNorm")){ B <- QuadForm(norm) sum(diag(t(D)%*%B%*%D%*%Kinv))^-.5 }else{ From noreply at r-forge.r-project.org Wed Sep 11 00:13:29 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 00:13:29 +0200 (CEST) Subject: [Robast-commits] r688 - in branches/robast-0.9/pkg: 13.07.16 - Wrapper for RobAStBase, RobExtremes ROptEst ROptEst/R ROptEst/man RobAStBase RobAStBase/R RobAStBase/man RobExtremes RobExtremes/R RobExtremes/man Message-ID: <20130910221329.D1C64184D71@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 00:13:29 +0200 (Wed, 11 Sep 2013) New Revision: 688 Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/rescaleFunctionP.R branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/zusaetzlicheBsp.R branches/robast-0.9/pkg/ROptEst/R/plotWrapper.R branches/robast-0.9/pkg/ROptEst/man/CniperPointPlotWrapper.Rd branches/robast-0.9/pkg/RobAStBase/R/plotWrapper.R branches/robast-0.9/pkg/RobAStBase/R/rescaleFct.R branches/robast-0.9/pkg/RobAStBase/man/ComparePlotWrapper.Rd branches/robast-0.9/pkg/RobAStBase/man/InfoPlotWrapper.Rd branches/robast-0.9/pkg/RobAStBase/man/PlotICWrapper.Rd branches/robast-0.9/pkg/RobAStBase/man/mergelists.Rd branches/robast-0.9/pkg/RobAStBase/man/rescaleFunction-methods.Rd branches/robast-0.9/pkg/RobExtremes/R/rescaleFct.R branches/robast-0.9/pkg/RobExtremes/man/GEVFamilyMuUnknown.Rd branches/robast-0.9/pkg/RobExtremes/man/rescaleFunction-methods.Rd Modified: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/ICAllPlotWrapper.R branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperCont.R branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperPointPlotWrapper.R branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/infoPlotWrapper.R branches/robast-0.9/pkg/ROptEst/NAMESPACE branches/robast-0.9/pkg/ROptEst/R/cniperCont.R branches/robast-0.9/pkg/ROptEst/man/cniperCont.Rd branches/robast-0.9/pkg/RobAStBase/NAMESPACE branches/robast-0.9/pkg/RobAStBase/R/AllGeneric.R branches/robast-0.9/pkg/RobAStBase/R/comparePlot.R branches/robast-0.9/pkg/RobAStBase/R/infoPlot.R branches/robast-0.9/pkg/RobAStBase/man/comparePlot.Rd branches/robast-0.9/pkg/RobAStBase/man/internal_plots.Rd branches/robast-0.9/pkg/RobExtremes/NAMESPACE branches/robast-0.9/pkg/RobExtremes/man/InternalReturnClasses-class.Rd Log: integrated Wrapper functions into RobAStBase, ROptEst, and RobExtremes Modified: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/ICAllPlotWrapper.R =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/ICAllPlotWrapper.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/ICAllPlotWrapper.R 2013-09-10 22:13:29 UTC (rev 688) @@ -90,7 +90,7 @@ ## with.legend - optional legend indicator ## withCall - optional indicator of the function call # -ICAllPlotWrapper = function(IC, y,...,alpha.trsp = 100, with.legend = TRUE, rescale = FALSE ,withCall = TRUE){ +PlotIC <- function(IC, y,...,alpha.trsp = 100, with.legend = TRUE, rescale = FALSE ,withCall = TRUE){ ### ### 1. grab the dots (and manipulate it within the wrapper function) ### Modified: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperCont.R =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperCont.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperCont.R 2013-09-10 22:13:29 UTC (rev 688) @@ -1,9 +1,3 @@ -.rescalefct <- RobAStBase:::.rescalefct -.plotRescaledAxis <- RobAStBase:::.plotRescaledAxis -.makedotsP <- RobAStBase:::.makedotsP -.makedotsLowLevel <- RobAStBase:::.makedotsLowLevel -.SelectOrderData <- RobAStBase:::.SelectOrderData - .plotData <- function( ## helper function for cniper-type plots to plot in data data, # data to be plot in Modified: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperPointPlotWrapper.R =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperPointPlotWrapper.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/cniperPointPlotWrapper.R 2013-09-10 22:13:29 UTC (rev 688) @@ -73,7 +73,7 @@ ## with.legend - optional legend indicator ## withCall - optional indicator of the function call # -cniperPointPlotWrapper = function(fam,... +CniperPointPlot <- function(fam,... ,lower = getdistrOption("DistrResolution") ,upper=1-getdistrOption("DistrResolution") ,with.legend = TRUE, withCall = TRUE){ @@ -95,7 +95,10 @@ ### graphics/diagnostics function; ## - argsList <- list(L2Fam = substitute(fam) + ## Scaling of the axes + scaleList <- rescaleFunction(eval(IC at CallL2Fam), FALSE, mc$rescale) + + argsList <- c(list(L2Fam = substitute(fam) ,data = substitute(NULL) ,neighbor = substitute(ContNeighborhood(radius = 0.5)) ,risk = substitute(asMSE()) @@ -103,15 +106,7 @@ ,upper = substitute(upper) ,n = substitute(101) ,withMaxRisk = substitute(TRUE) - ,scaleX = substitute(FALSE) - ,scaleX.fct = substitute(p(fam)) - ,scaleX.inv = substitute(q(fam)) - ,scaleY = substitute(FALSE) - ,scaleY.fct = substitute(pnorm) - ,scaleY.inv = substitute(qnorm) ,scaleN = substitute(9) - ,x.ticks = substitute(NULL) - ,y.ticks = substitute(NULL) ,cex.pts = substitute(1) ,col.pts = substitute(par("col")) ,pch.pts = substitute(1) @@ -130,7 +125,7 @@ ,xlab=substitute("Dirac point") ,ylab=substitute("Asymptotic Risk difference (classic - robust)") ,bty = substitute("o") - ) + ), scaleList) ##parameter for plotting if(mc$with.legend) Modified: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/infoPlotWrapper.R =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/infoPlotWrapper.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/infoPlotWrapper.R 2013-09-10 22:13:29 UTC (rev 688) @@ -91,7 +91,7 @@ ## with.legend - optional legend indicator ## withCall - optional indicator of the function call # -infoPlotWrapper = function(IC, data,...,alpha.trsp = 100,with.legend = TRUE, rescale = FALSE ,withCall = TRUE){ +InfoPlot <- function(IC, data,...,alpha.trsp = 100,with.legend = TRUE, rescale = FALSE ,withCall = TRUE){ ### ### 1. grab the dots (and manipulate it within the wrapper function) ### @@ -124,7 +124,7 @@ ## ## Scaling of the axes - scaleList <- rescaleFunction(as.list(IC at CallL2Fam)[[1]], FALSE, mc$rescale) + scaleList <- rescaleFunction(eval(IC at CallL2Fam), FALSE, mc$rescale) argsList <- c(list(object = substitute(IC) ,data = substitute(data) Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/rescaleFunctionP.R =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/rescaleFunctionP.R (rev 0) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/rescaleFunctionP.R 2013-09-10 22:13:29 UTC (rev 688) @@ -0,0 +1,104 @@ +### rescale function + +## famName - text argument stating the name of the family for which +## the rescaling is done +## dataFlag - flag, whether the the data is plotted or not +## rescaleFlag + +# function returns the list of rescaling arguments to be passed on the +# corresponding diagnostic function + +if(!isGeneric("rescaleFunction")){ + setGeneric("rescaleFunction", function(famName, ...) + standardGeneric("rescaleFunction")) +} + +setMethod("rescalueFunction", signature(famName="ANY"), + function(famName, dataFlag){ + if(dataFlag){ + scaleList <- list(scaleX = substitute(FALSE) + ,scaleY = substitute(FALSE) + ) + } else { + scaleList <- list(scaleX = substitute(FALSE) + ,scaleX.fct = substitute(p(eval(IC at CallL2Fam))) + ,scaleX.inv = substitute(q(eval(IC at CallL2Fam))) + ,scaleY = substitute(FALSE) + ,scaleY.fct = substitute(pnorm) + ,scaleY.inv=substitute(qnorm) + ,x.ticks = substitute(NULL) + ,y.ticks = substitute(NULL) + ) + } + + return(scaleList)} +) + +setMethod("rescalueFunction", signature(famName="GParetoFamily"), + function(famName, dataFlag, rescaleFlag){ + if(!rescaleFlag) + return(getMethod("rescalueFunction", "ANY")(famName, + dataFlag)) + if(dataFlag){ + scaleList <- list(scaleX = substitute(TRUE) + ,scaleY = substitute(TRUE) + ) + } else { + scaleList <- list(scaleX = substitute(TRUE) + ,scaleX.fct = substitute(p(eval(IC at CallL2Fam))) + ,scaleX.inv = substitute(q(eval(IC at CallL2Fam))) + ,scaleY = substitute(TRUE) + ,scaleY.fct = substitute(pnorm) + ,scaleY.inv = substitute(qnorm) + ,x.ticks = substitute(NULL) + ,y.ticks = substitute(NULL) + ) + } + return(scaleList) +}) + +setMethod("rescalueFunction", signature(famName="GEVFamily"), + function(famName, dataFlag, rescaleFlag){ + if(!rescaleFlag) + return(getMethod("rescalueFunction", "ANY")(famName, + dataFlag, rescaleFlag)) + if(dataFlag){ + scaleList <- list(scaleX = substitute(TRUE) + ,scaleY = substitute(TRUE) + ) + } else { + scaleList <- list(scaleX = substitute(TRUE) + ,scaleX.fct = substitute(p(eval(IC at CallL2Fam))) + ,scaleX.inv = substitute(q(eval(IC at CallL2Fam))) + ,scaleY = substitute(TRUE) + ,scaleY.fct = substitute(pnorm) + ,scaleY.inv = substitute(qnorm) + ,x.ticks = substitute(NULL) + ,y.ticks = substitute(NULL) + ) + } + return(scaleList) +}) + +setMethod("rescalueFunction", signature(famName="GEVFamilyUnknownMu"), + function(famName, dataFlag, rescaleFlag){ + if(!rescaleFlag) + return(getMethod("rescalueFunction", "ANY")(famName, + dataFlag, rescaleFlag)) + if(dataFlag){ + scaleList <- list(scaleX = substitute(TRUE) + ,scaleY = substitute(TRUE) + ) + } else { + scaleList <- list(scaleX = substitute(TRUE) + ,scaleX.fct = substitute(p(eval(IC at CallL2Fam))) + ,scaleX.inv = substitute(q(eval(IC at CallL2Fam))) + ,scaleY = substitute(TRUE) + ,scaleY.fct = substitute(pnorm) + ,scaleY.inv = substitute(qnorm) + ,x.ticks = substitute(NULL) + ,y.ticks = substitute(NULL) + ) + } + return(scaleList) +}) Added: branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/zusaetzlicheBsp.R =================================================================== --- branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/zusaetzlicheBsp.R (rev 0) +++ branches/robast-0.9/pkg/13.07.16 - Wrapper for RobAStBase, RobExtremes/zusaetzlicheBsp.R 2013-09-10 22:13:29 UTC (rev 688) @@ -0,0 +1,90 @@ +#' # GPD +#' fam = GParetoFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' data = r(Y)(1000) +#' InfoPlot(IC, data, withCall = FALSE) +#' +#' # GEV +#' fam = GEVFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' data = r(Y)(1000) +#' InfoPlot(IC, data, rescale = TRUE, withCall = FALSE) +#' +#' # Weibull +#' fam = WeibullFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' data = r(Y)(1000) +#' InfoPlot(IC, data, withCall = FALSE) +#' # GPD +#' fam = GParetoFamily() +#' CniperPointPlot(fam=fam, main = "GPD", lower = 0, upper = 10, withCall = FALSE) +#' # GEV +#' fam = GEVFamily() +#' CniperPointPlot(fam=fam, main = "GEV", lower = 0, upper = 5, withCall = FALSE) +#' # Gamma +#' fam = GammaFamily() +#' CniperPointPlot(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +#' # Weibull +#' fam = WeibullFamily() +#' CniperPointPlot(fam=fam, main = "Weibull", withCall = FALSE) +#' @examples +#' # GPD +#' fam = GParetoFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' PlotIC(IC, y, withCall = FALSE) +#' +#' # GEV +#' fam = GEVFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' PlotIC(IC, y, rescale = TRUE, withCall = FALSE) +#' +#' # Gamma +#' fam = GammaFamily() +#' rfam = InfRobModel(fam, ContNeighborhood(0.5)) +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' PlotIC(IC, y, withCall = FALSE) +#' +#' # Weibull +#' fam = WeibullFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' PlotIC(IC, y, withCall = FALSE) +#' @examples +#' # GPD +#' fam = GParetoFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' ComparePlot(IC, y, withCall = FALSE) +#' +#' # GEV +#' fam = GEVFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' ComparePlot(IC, y, rescale = TRUE, withCall = FALSE) +#' +#' # Gamma +#' fam = GammaFamily() +#' rfam = InfRobModel(fam, ContNeighborhood(0.5)) +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' ComparePlot(IC, y, withCall = FALSE) +#' +#' # Weibull +#' fam = WeibullFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y=distribution(fam) +#' y = r(Y)(1000) +#' ComparePlot(IC, y, withCall = FALSE) Modified: branches/robast-0.9/pkg/ROptEst/NAMESPACE =================================================================== --- branches/robast-0.9/pkg/ROptEst/NAMESPACE 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/ROptEst/NAMESPACE 2013-09-10 22:13:29 UTC (rev 688) @@ -38,4 +38,5 @@ export("genkStepCtrl", "genstartCtrl", "gennbCtrl") export("cniperCont", "cniperPoint", "cniperPointPlot") export(".generateInterpGrid",".getLMGrid",".saveGridToCSV", ".readGridFromCSV") -export(".RMXE.th",".OMSE.th", ".MBRE.th") \ No newline at end of file +export(".RMXE.th",".OMSE.th", ".MBRE.th") +export("CniperPointPlot") \ No newline at end of file Modified: branches/robast-0.9/pkg/ROptEst/R/cniperCont.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/cniperCont.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/ROptEst/R/cniperCont.R 2013-09-10 22:13:29 UTC (rev 688) @@ -100,7 +100,7 @@ scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, scaleN = 9, x.ticks = NULL, y.ticks = NULL, cex.pts = 1, col.pts = par("col"), - pch.pts = 1, jitter.fac = 1, with.lab = FALSE, + pch.pts = 19, jitter.fac = 1, with.lab = FALSE, lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, which.lbs = NULL, which.Order = NULL, return.Order = FALSE){ @@ -215,12 +215,12 @@ scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, scaleN = 9, x.ticks = NULL, y.ticks = NULL, cex.pts = 1, col.pts = par("col"), - pch.pts = 1, jitter.fac = 1, with.lab = FALSE, + pch.pts = 19, jitter.fac = 1, with.lab = FALSE, lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, which.lbs = NULL, which.Order = NULL, return.Order = FALSE){ - mc <- match.call(call = sys.call(sys.parent(1)), + mc <- match.call(#call = sys.call(sys.parent(1)), expand.dots = FALSE) mcl <- as.list(mc[-1]) dots <- as.list(mc$"...") Added: branches/robast-0.9/pkg/ROptEst/R/plotWrapper.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/plotWrapper.R (rev 0) +++ branches/robast-0.9/pkg/ROptEst/R/plotWrapper.R 2013-09-10 22:13:29 UTC (rev 688) @@ -0,0 +1,141 @@ +################################################################################ + +########################################## +## ## +## Wrapper for cniperPointPlot.R ## +## ## +## ## +########################################## + +############################################################## +#' Wrapper function for cniperPointPlot - Computation and Plot +#' of Cniper Contamination and Cniper Points +#' +#' The wrapper takes most of arguments to the cniperPointPlot +#' function by default and gives a user possibility to run the +#' function with low number of arguments +#' +#' @param fam object of class L2ParamFamily +#' +#' @param ... additional parameters (in particular to be passed on to \code{plot}) +#' +#' @param lower the lower end point of the contamination interval +#' +#' @param upper the upper end point of the contamination interval +#' +#' @param rescale the flag for rescaling the axes for better view of the plot +#' +#' @param with.legend the flag for showing the legend of the plot +#' +#' @param withCall the flag for the call output +#' +#' @return invisible(NULL) +# +#' @section Details: Calls \code{cniperPointPlot} with suitably chosen defaults; if \code{withCall == TRUE}, the call to \code{cniperPointPlot} is returned. +#' +#' @export +#' @rdname CniperPointPlotWrapper +#' +#' @examples +#' fam <- GammaFamily() +#' CniperPointPlot(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +############################################################## + +##@fam - parameter family +## lower - left point of the x-axis +## upper - right point of the x-axis +## alpha.trsp - optional transparency of the plot +## with.legend - optional legend indicator +## withCall - optional indicator of the function call +# +CniperPointPlot <- function(fam,... + ,lower = getdistrOption("DistrResolution") + ,upper=1-getdistrOption("DistrResolution") + ,with.legend = TRUE + ,rescale = FALSE + ,withCall = TRUE){ + ### + ### 1. grab the dots (and manipulate it within the wrapper function) + ### + ### + ### do something to fix the good default arguments + ### + mc <- as.list(match.call(expand.dots = FALSE))[-1] + 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) + ### graphics/diagnostics function; + ## + + ## Scaling of the axes + print(fam) + scaleList <- rescaleFunction(fam, FALSE, rescale) + print(scaleList) + + argsList <- c(list(L2Fam = substitute(fam) + ,data = substitute(NULL) + ,neighbor = substitute(ContNeighborhood(radius = 0.5)) + ,risk = substitute(asMSE()) + ,lower = substitute(lower) + ,upper = substitute(upper) + ,n = substitute(101) + ,withMaxRisk = substitute(TRUE) + ,scaleN = substitute(9) + ,cex.pts = substitute(1) + ,col.pts = substitute(par("col")) + ,pch.pts = substitute(19) + ,jitter.fac = substitute(1) + ,with.lab = substitute(FALSE) + ,lab.pts = substitute(NULL) + ,lab.font = substitute(NULL) + ,alpha.trsp = substitute(NA) + ,which.lbs = substitute(NULL) + ,which.Order = substitute(NULL) + ,return.Order = substitute(FALSE) + ,adj = 0.5 + ,cex.main = substitute(1.5) + ,cex.lab = substitute(1.5) + ,main = ""#"Outlyingness Plot" + ,xlab=substitute("Dirac point") + ,ylab=substitute("Asymptotic Risk difference (classic - robust)") + ,bty = substitute("o") + ), scaleList) + print(argsList) + ##parameter for plotting + if(mc$with.legend) + { + argsList$col.main <- "black" + argsList$col.lab <- "black" + } + else + { + argsList$col.main <- "white" + argsList$col.lab <- "white" + } + + args <- .merge.lists(argsList, dots) + print(args) + ### + ### 3. build up the call but grab it and write it into an object + ### + cl <- substitute(do.call(cniperPointPlot,args0), list(args0=args)) + ### manipulate it so that the wrapper do.call is ommitted + cl0 <- as.list(cl)[-1] + mycall <- c(cl0[1],unlist(cl0[-1])) + mycall <- as.call(mycall) + ### + ### 4. evaluate the call (i.e., produce the graphic) + ### + eval(mycall) + ### + ### 5. return the call (if withCall==TRUE) + ### + if(mc$withCall) print(mycall) + +} +#CniperPointPlot(fam=fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) Added: branches/robast-0.9/pkg/ROptEst/man/CniperPointPlotWrapper.Rd =================================================================== --- branches/robast-0.9/pkg/ROptEst/man/CniperPointPlotWrapper.Rd (rev 0) +++ branches/robast-0.9/pkg/ROptEst/man/CniperPointPlotWrapper.Rd 2013-09-10 22:13:29 UTC (rev 688) @@ -0,0 +1,48 @@ +\name{CniperPointPlot} +\alias{CniperPointPlot} +\title{Wrapper function for cniperPointPlot - Computation and Plot + of Cniper Contamination and Cniper Points} +\usage{ + CniperPointPlot(fam, ..., + lower = getdistrOption("DistrResolution"), + upper = 1 - getdistrOption("DistrResolution"), + with.legend = TRUE, rescale = FALSE, withCall = TRUE) +} +\arguments{ + \item{fam}{object of class L2ParamFamily} + + \item{...}{additional parameters (in particular to be + passed on to \code{plot})} + + \item{lower}{the lower end point of the contamination + interval} + + \item{upper}{the upper end point of the contamination + interval} + + \item{with.legend}{the flag for showing the legend of the + plot} + + \item{rescale}{the flag for rescaling the axes for better view of the plot} + + \item{withCall}{the flag for the call output} +} +\value{ + invisible(NULL) +} +\description{ + The wrapper takes most of arguments to the + cniperPointPlot function by default and gives a user + possibility to run the function with low number of + arguments +} +\section{Details}{ + Calls \code{cniperPointPlot} with suitably chosen + defaults; if \code{withCall == TRUE}, the call to + \code{cniperPointPlot} is returned. +} +\examples{ +L2fam <- GammaFamily() +CniperPointPlot(fam=L2fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +} + Modified: branches/robast-0.9/pkg/ROptEst/man/cniperCont.Rd =================================================================== --- branches/robast-0.9/pkg/ROptEst/man/cniperCont.Rd 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/ROptEst/man/cniperCont.Rd 2013-09-10 22:13:29 UTC (rev 688) @@ -18,7 +18,7 @@ scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, scaleN = 9, x.ticks = NULL, y.ticks = NULL, cex.pts = 1, col.pts = par("col"), - pch.pts = 1, jitter.fac = 1, with.lab = FALSE, + pch.pts = 19, jitter.fac = 1, with.lab = FALSE, lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, which.lbs = NULL, which.Order = NULL, return.Order = FALSE) @@ -34,7 +34,7 @@ scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, scaleN = 9, x.ticks = NULL, y.ticks = NULL, cex.pts = 1, col.pts = par("col"), - pch.pts = 1, jitter.fac = 1, with.lab = FALSE, + pch.pts = 19, jitter.fac = 1, with.lab = FALSE, lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, which.lbs = NULL, which.Order = NULL, return.Order = FALSE) Modified: branches/robast-0.9/pkg/RobAStBase/NAMESPACE =================================================================== --- branches/robast-0.9/pkg/RobAStBase/NAMESPACE 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/RobAStBase/NAMESPACE 2013-09-10 22:13:29 UTC (rev 688) @@ -60,7 +60,8 @@ exportMethods("pICList","ICList", "ksteps", "uksteps", "start", "startval", "ustartval") exportMethods("moveL2Fam2RefParam", - "moveICBackFromRefParam") + "moveICBackFromRefParam", + "rescaleFunction") exportMethods("ddPlot", "qqplot") exportMethods("cutoff.quantile", "cutoff.quantile<-") exportMethods("samplesize<-", "samplesize") @@ -75,3 +76,6 @@ export("outlyingPlotIC", "RobAStBaseMASK") export("OMSRRisk","MBRRisk","RMXRRisk") export("getRiskFctBV") +export(".rescalefct",".plotRescaledAxis",".makedotsP",".makedotsLowLevel",".SelectOrderData") +export(".merge.lists") +export("InfoPlot", "ComparePlot", "PlotIC") \ No newline at end of file Modified: branches/robast-0.9/pkg/RobAStBase/R/AllGeneric.R =================================================================== --- branches/robast-0.9/pkg/RobAStBase/R/AllGeneric.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/RobAStBase/R/AllGeneric.R 2013-09-10 22:13:29 UTC (rev 688) @@ -235,3 +235,8 @@ setGeneric("moveICBackFromRefParam", function(IC, L2Fam, ...) standardGeneric("moveICBackFromRefParam")) } + +if(!isGeneric("rescaleFunction")){ + setGeneric("rescaleFunction", function(L2Fam, ...) + standardGeneric("rescaleFunction")) +} Modified: branches/robast-0.9/pkg/RobAStBase/R/comparePlot.R =================================================================== --- branches/robast-0.9/pkg/RobAStBase/R/comparePlot.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/RobAStBase/R/comparePlot.R 2013-09-10 22:13:29 UTC (rev 688) @@ -1,6 +1,7 @@ setMethod("comparePlot", signature("IC","IC"), function(obj1,obj2, obj3 = NULL, obj4 = NULL, data = NULL, ..., withSweave = getdistrOption("withSweave"), + forceSameModel = FALSE, main = FALSE, inner = TRUE, sub = FALSE, col = par("col"), lwd = par("lwd"), lty, col.inner = par("col.main"), cex.inner = 0.8, @@ -32,6 +33,9 @@ ncomp <- 2+ (!missing(obj3)|!is.null(obj3)) + (!missing(obj4)|!is.null(obj4)) + if(missing(cex.pts)) cex.pts <- 1 + cex.pts <- rep(cex.pts, length.out= ncomp) + if(missing(col)) col <- 1:ncomp else col <- rep(col, length.out = ncomp) if(missing(lwd)) lwd <- rep(1,ncomp) @@ -45,6 +49,7 @@ dots$xlab <- dots$ylab <- NULL L2Fam <- eval(obj1 at CallL2Fam) + if(forceSameModel) if(!identical(CallL2Fam(obj1),CallL2Fam(obj2))) stop("ICs need to be defined for the same model") @@ -127,12 +132,14 @@ IC2 <- as(ID %*% obj2 at Curve, "EuclRandVariable") if(is(obj3, "IC")){ + if(forceSameModel) if(!identical(CallL2Fam(obj1),CallL2Fam(obj3))) stop("ICs need to be defined for the same model") IC3 <- as(ID %*% obj3 at Curve, "EuclRandVariable") } if(is(obj4, "IC")){ + if(forceSameModel) if(!identical(CallL2Fam(obj1),CallL2Fam(obj4))) stop("ICs need to be defined for the same model") IC4 <- as(ID %*% obj4 at Curve, "EuclRandVariable") Modified: branches/robast-0.9/pkg/RobAStBase/R/infoPlot.R =================================================================== --- branches/robast-0.9/pkg/RobAStBase/R/infoPlot.R 2013-09-09 09:18:10 UTC (rev 687) +++ branches/robast-0.9/pkg/RobAStBase/R/infoPlot.R 2013-09-10 22:13:29 UTC (rev 688) @@ -393,8 +393,8 @@ scaleX, scaleX.fct, scaleX.inv, FALSE, scaleY.fct, dots$xlim, dots$ylim, dotsP0) - f1 <- resc.rel$scy*3*cex0[1] - f1c <- resc.rel.c$scy*3*cex0[2] + f1 <- resc.rel$scy*0.3*cex0[1] + f1c <- resc.rel.c$scy*0.3*cex0[2] do.pts(resc.rel$X, resc.rel$Y, f1,col.pts[1],pch0[,1]) do.pts(resc.rel.c$X, resc.rel.c$Y, f1c,col.pts[2],pch0[,2]) Added: branches/robast-0.9/pkg/RobAStBase/R/plotWrapper.R =================================================================== --- branches/robast-0.9/pkg/RobAStBase/R/plotWrapper.R (rev 0) +++ branches/robast-0.9/pkg/RobAStBase/R/plotWrapper.R 2013-09-10 22:13:29 UTC (rev 688) @@ -0,0 +1,557 @@ +########################################## +## ## +## Wrapper for infoPlot.R ## +## (infoPlot method for IC) ## +## ## +########################################## + +############################################################## +#' Merging Lists +#' +#' \code{.merge.lists} takes two lists and merges them. +#' +#' @param a the first list +#' +#' @param b the second list +#' +#' @return the merged list +#' +#' @keywords internal +#' @rdname mergelists +#' +############################################################## + +### aditional function +.merge.lists <- function(a, b){ + a.names <- names(a) + b.names <- names(b) + m.names <- sort(unique(c(a.names, b.names), fromLast = TRUE)) + sapply(m.names, function(i) { + if (is.list(a[[i]]) & is.list(b[[i]])) .merge.lists(a[[i]], b[[i]]) + else if (i %in% b.names) b[[i]] + else a[[i]] + }, simplify = FALSE) +} + +############################################################## +#' Wrapper function for information plot method +#' +#' The wrapper takes most of arguments to the plot method +#' by default and gives a user possibility to run the +#' function with low number of arguments +#' +#' @param IC object of class \code{IC} +#' +#' @param data optional data argument --- for plotting observations into the plot +#' +#' @param ... additional parameters (in particular to be passed on to \code{plot}) +#' +#' @param alpha.trsp the transparency argument (0 to 100) for ploting the data +#' +#' @param with.legend the flag for showing the legend of the plot +#' +#' @param rescale the flag for rescaling the axes for better view of the plot +#' +#' @param withCall the flag for the call output +#' +#' @return invisible(NULL) +# +#' @section Details: Calls \code{infoPlot} with suitably chosen defaults. If \code{withCall == TRUE}, the call to \code{infoPlot} is returned +#' +#' @export +#' @rdname InfoPlotWrapper +#' +#' +#' @examples +#' # Gamma +#' fam <- GammaFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y <- distribution(fam) +#' data <- r(Y)(1000) +#' InfoPlot(IC, data, withCall = FALSE) +#' +############################################################## + +##IC - influence curve +##data - dataset +## with.legend - optional legend indicator +## withCall - optional indicator of the function call +# +InfoPlot <- function(IC, data,...,alpha.trsp = 100,with.legend = TRUE, rescale = FALSE ,withCall = TRUE){ + ### + ### 1. grab the dots (and manipulate it within the wrapper function) + ### + ### + ### do something to fix the good default arguments + ### + if(missing(IC)) stop("Argument 'IC' must be given as argument to 'InfoPlot'") + if(missing(data)) data <- NULL + mc <- as.list(match.call(expand.dots = FALSE))[-1] + dots <- mc$"..." + if(missing(data)){ + alpha.trsp <- 100 + } else { + if(is.null(mc$alpha.trsp)){ + alpha.trsp <- 30 + if(length(data) < 1000){ + alpha.trsp <- 50 + } + if(length(data) < 100){ + alpha.trsp <- 100 + } + } + } + if(is.null(mc$with.legend)) mc$with.legend <- TRUE + if(is.null(mc$rescale)) mc$rescale <- FALSE + if(is.null(mc$withCall)) mc$withCall <- TRUE + ### + ### 2. build up the argument list for the (powerful/fullfledged) + ### graphics/diagnostics function; + ## + + ## Scaling of the axes + scaleList <- rescaleFunction(eval(IC at CallL2Fam), FALSE, mc$rescale) + + argsList <- c(list(object = substitute(IC) + ,data = substitute(data) + ,withSweave = substitute(getdistrOption("withSweave")) + ,lwd = substitute(par("lwd")) + ,lty = substitute("solid") + ,colI = substitute(grey(0.5)) + ,lwdI = substitute(0.7*par("lwd")) + ,ltyI = substitute("dotted") + ,main = substitute(FALSE) + ,inner = substitute(TRUE) + ,sub = substitute(FALSE) + ,col.inner = substitute(par("col.main")) + ,cex.inner = substitute(0.8) + ,bmar = substitute(par("mar")[1]) + ,tmar = substitute(par("mar")[3]) + ,with.legend = substitute(TRUE) + ,legend = substitute(NULL) + ,legend.bg = substitute("white") + ,legend.location = substitute("bottomright") + ,legend.cex = substitute(0.8) + ,scaleN = substitute(9) + ,mfColRow = substitute(TRUE) + ,to.draw.arg = substitute(NULL) + ,cex.pts = substitute(1) + ,col.pts = substitute(addAlphTrsp2col(rgb(0,255,0,maxColorValue=255), substitute(alpha.trsp))) + ,pch.pts = substitute(19) + ,jitter.fac = substitute(1) + ,with.lab = substitute(FALSE) + ,lab.pts = substitute(NULL) + ,lab.font = substitute(NULL) + ,alpha.trsp = substitute(NA) + ,which.lbs = substitute(NULL) + ,which.Order = substitute(NULL) + ,return.Order = substitute(FALSE) + ,ylab.abs = substitute("absolute information") + ,ylab.rel= substitute("relative information") + ,adj = substitute(0.5) [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 688 From noreply at r-forge.r-project.org Wed Sep 11 00:31:39 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 00:31:39 +0200 (CEST) Subject: [Robast-commits] r689 - branches/robast-0.9/pkg/RobExtremes Message-ID: <20130910223139.45A73185D60@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 00:31:38 +0200 (Wed, 11 Sep 2013) New Revision: 689 Modified: branches/robast-0.9/pkg/RobExtremes/NAMESPACE Log: [RobExtremes] forgot to export generating function GEVFamilyMuUnknown ... (and dimension mismatch in FI of this model) Modified: branches/robast-0.9/pkg/RobExtremes/NAMESPACE =================================================================== --- branches/robast-0.9/pkg/RobExtremes/NAMESPACE 2013-09-10 22:13:29 UTC (rev 688) +++ branches/robast-0.9/pkg/RobExtremes/NAMESPACE 2013-09-10 22:31:38 UTC (rev 689) @@ -37,7 +37,7 @@ export("EULERMASCHERONICONSTANT","APERYCONSTANT") export("Gumbel", "Pareto", "GPareto", "GEV") export("GParetoFamily", "GumbelLocationFamily", "WeibullFamily", "GEVFamily", - "ParetoFamily") + "ParetoFamily", "GEVFamilyMuUnknown") export("LDEstimator", "medkMAD", "medSn", "medQn", "medkMADhybr") export("getShapeGrid", "getSnGrid", "PickandsEstimator","QuantileBCCEstimator") From noreply at r-forge.r-project.org Wed Sep 11 10:56:09 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 10:56:09 +0200 (CEST) Subject: [Robast-commits] r690 - in branches/robast-0.9/pkg: ROptEst/inst ROptEstOld/inst RandVar/inst RobAStBase/inst RobExtremes/R RobExtremes/inst RobExtremes/inst/scripts RobLox/inst RobLoxBioC/inst RobRex/inst Message-ID: <20130911085609.726AB184EB7@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 10:56:09 +0200 (Wed, 11 Sep 2013) New Revision: 690 Added: branches/robast-0.9/pkg/RobExtremes/inst/scripts/ExamplesForDiagnosticsWrappersWithGEVGPD.R Modified: branches/robast-0.9/pkg/ROptEst/inst/NEWS branches/robast-0.9/pkg/ROptEstOld/inst/NEWS branches/robast-0.9/pkg/RandVar/inst/NEWS branches/robast-0.9/pkg/RobAStBase/inst/NEWS branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R branches/robast-0.9/pkg/RobExtremes/inst/NEWS branches/robast-0.9/pkg/RobExtremes/inst/TOBEDONE branches/robast-0.9/pkg/RobLox/inst/NEWS branches/robast-0.9/pkg/RobLoxBioC/inst/NEWS branches/robast-0.9/pkg/RobRex/inst/NEWS Log: updated NEWS entries; expanded TOBEDONE entry of RobExtremes; example script for RobExtremes added; dimnames of FI in GEVFamilyMuUnknown.R changed in RobExtremes Modified: branches/robast-0.9/pkg/ROptEst/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/ROptEst/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/ROptEst/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -13,6 +13,7 @@ user-visible CHANGES: ++ new wrapper function CniperPointPlot + new more modularized user-interface robest + roptest (the new one) gains argument withMDE to skip call to MDE @@ -39,6 +40,7 @@ GENERAL ENHANCEMENTS: + RobASt-Pkgs: DESCRIPTION depends become stricter (requiring distrMod, distrEx, distr >=2.4 to be on the safe side) ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + deleted chm folders --- they are no longer needed + delayed evaluation is done to speed up things @@ -52,6 +54,8 @@ under the hood: ++ added .Rbuildignore + + Had to add 'importFrom(distr, q)' to NAMESPACE to avoid error with function 'q' inside of 'showdown' - why?! @@ -110,6 +114,7 @@ able to write to other files (other than sysdata.rda) => no need anymore to write in separate folders when creating new grids in parallel ++ use of unit tests BUGFIXES: + a minimal correction in getInfRobIC_asGRisk.R Modified: branches/robast-0.9/pkg/ROptEstOld/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/ROptEstOld/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/ROptEstOld/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -10,11 +10,23 @@ ####################################### version 0.9 ####################################### -EVD functionality (including Gumbel distribution) has + +user-visible CHANGES: ++ EVD functionality (including Gumbel distribution) has been moved from distrEx to new pkg RobExtremes; to avoid failure of ROptEstOld, this functionality has been copied to ROptEstOld as well. +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + +BUGFIXES + + ####################################### version 0.8 ####################################### Modified: branches/robast-0.9/pkg/RandVar/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/RandVar/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RandVar/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -10,12 +10,23 @@ ####################################### version 0.9 ####################################### + +user-visible CHANGES: + +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + introduced folder vignettes + some encoding problems with vignette which now includes "\usepackage[utf8]{inputenc}" + update of Rout.save files, added seed for reproducibility + suppressed gaps handling and warnings from .makeDNew (annoying with GEVD) in .getImageDistr + deleted chm folders --- they are no longer needed + RobASt-Pkgs: DESCRIPTION depends become stricter (requiring distrMod, distrEx, distr >=2.4 to be on the safe side) + +BUGFIXES ####################################### Modified: branches/robast-0.9/pkg/RobAStBase/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/RobAStBase/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RobAStBase/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -12,7 +12,9 @@ ####################################### user-visible CHANGES: ++ new wrapper function InfoPlot, ComparePlot, PlotIC + GENERAL ENHANCEMENTS: + RobASt-Pkgs: DESCRIPTION depends become stricter (requiring distrMod, distrEx, distr >=2.4 to be on the safe side) @@ -22,9 +24,15 @@ + removed calls to require from R sources and replaced it by directives in the NAMESPACE file + all packages get a DESCRIPTION tag "ByteCompile" - under the hood: ++ wrapper functions use default rescaling controlled by S4-method rescaleFct + dispatching on the respective model + ++ added .Rbuildignore + ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + + created new interpolRisk-class to be able to use speed up in (new version) of roptest + interpolRisks extended by slot samplesize @@ -59,6 +67,7 @@ + .rescalefct looses argument scaleY.inv (not needed). ++ use of unit tests BUGFIXES: Modified: branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R =================================================================== --- branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RobExtremes/R/GEVFamilyMuUnknown.R 2013-09-11 08:56:09 UTC (rev 690) @@ -253,7 +253,8 @@ I22 <- I22 - G11*2*k^2*(k+1) + G01*2*k*(1+k)+k^2 *G02 I22 <- I22 /k^4 mat <- PosSemDefSymmMatrix(matrix(c(I00,I01,I02,I01,I11,I12,I02,I12,I22),3,3)) - dimnames(mat) <- list(scaleshapename,scaleshapename) + lcs <- c("location",scaleshapename) + dimnames(mat) <- list(lcs,lcs) return(mat) } Modified: branches/robast-0.9/pkg/RobExtremes/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/RobExtremes/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RobExtremes/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -20,10 +20,15 @@ + created generating functions for GEV, Weibull, Pareto families + PickandsEstimator (incl. as.var) ++ new L2ParamFamily GEVFamilyMuUnkown (with corresponding ES, EL, VaR) + under the hood: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + RobASt-Pkgs: DESCRIPTION depends become stricter (requiring distrMod, distrEx, distr >=2.4 to be on the safe side) ++ added .Rbuildignore + ++ kMad: + kMad.c now has Unix ending (LF instead of CR, CRLF + removed lazyload tag in DESCRIPTION @@ -109,7 +114,11 @@ + TestInfrastructure for RobExtremes Tests for RobExtremes + to share some ideas: some test files in connection with RobExtremes ++ use of unit tests ++ wrapper functions use default rescaling controlled by S4-method rescaleFct + dispatching on the respective model; particular methods for GEV, GPareto, + GEVMuUnknown bugfixes: Modified: branches/robast-0.9/pkg/RobExtremes/inst/TOBEDONE =================================================================== --- branches/robast-0.9/pkg/RobExtremes/inst/TOBEDONE 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RobExtremes/inst/TOBEDONE 2013-09-11 08:56:09 UTC (rev 690) @@ -1,3 +1,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ to be done in package RobExtremes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++ generate LM-Grids for GEVFamilyMuUnknown ++ write code so that it uses different (semi-equivariant) norms + in GEVFamily, GParetoFamily, GParetoFamilyMuUnknown \ No newline at end of file Added: branches/robast-0.9/pkg/RobExtremes/inst/scripts/ExamplesForDiagnosticsWrappersWithGEVGPD.R =================================================================== --- branches/robast-0.9/pkg/RobExtremes/inst/scripts/ExamplesForDiagnosticsWrappersWithGEVGPD.R (rev 0) +++ branches/robast-0.9/pkg/RobExtremes/inst/scripts/ExamplesForDiagnosticsWrappersWithGEVGPD.R 2013-09-11 08:56:09 UTC (rev 690) @@ -0,0 +1,87 @@ +require(RobExtremes) +# +### plotIC +# +# GPD +fam <- GParetoFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y <- r(Y)(1000) +PlotIC(IC, y, withCall = FALSE) +# +# GEV +fam <- GEVFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y <- r(Y)(1000) +PlotIC(IC, y, withCall = FALSE) +# +# Weibull +fam <- WeibullFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y <- r(Y)(1000) +PlotIC(IC, y, withCall = FALSE) +# +### InfoPlot +# +# GPD +fam <- GParetoFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y <- r(Y)(1000) +InfoPlot(IC, y, withCall = FALSE) +# +# GEV +fam <- GEVFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y <- r(Y)(1000) +InfoPlot(IC, y, withCall = FALSE) +# +# Weibull +fam <- WeibullFamily() +IC <- optIC(model = fam, risk = asCov()) +Y=distribution(fam) +y <- r(Y)(1000) +InfoPlot(IC, y, withCall = FALSE) +# +### ComparePlot +# +# GPD +fam <- GParetoFamily() +IC1 <- optIC(model = fam, risk = asCov()) +IC2 <- makeIC(list(function(x)sin(x),function(x)x^2), L2Fam = fam) +Y=distribution(fam) +y <- r(Y)(1000) +ComparePlot(IC1, IC2, y, withCall = FALSE) +# +# GEV +fam <- GEVFamily() +IC1 <- optIC(model = fam, risk = asCov()) +IC2 <- makeIC(list(function(x)sin(x),function(x)x^2), L2Fam = fam) +Y=distribution(fam) +y <- r(Y)(1000) +ComparePlot(IC1, IC2, y, withCall = FALSE) +# +# Weibull +fam <- WeibullFamily() +IC1 <- optIC(model = fam, risk = asCov()) +IC2 <- makeIC(list(function(x)sin(x),function(x)x^2), L2Fam = fam) +Y=distribution(fam) +y <- r(Y)(1000) +ComparePlot(IC1, IC2, y, withCall = FALSE) +# +### CniperPointPlot +# +# GPD +L2fam <- GParetoFamily() +CniperPointPlot(fam=L2fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +# +# GEV +L2fam <- GEVFamily() +CniperPointPlot(fam=L2fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) +# +# Weibull +L2fam <- WeibullFamily() +CniperPointPlot(fam=L2fam, main = "Gamma", lower = 0, upper = 5, withCall = FALSE) Modified: branches/robast-0.9/pkg/RobLox/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/RobLox/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RobLox/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -8,6 +8,22 @@ information) ####################################### +version 0.9 +####################################### + +user-visible CHANGES: + +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + +BUGFIXES + + +####################################### version 0.8.1 ####################################### + new internal functions due to changes to .C() and .Call() calls Modified: branches/robast-0.9/pkg/RobLoxBioC/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/RobLoxBioC/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RobLoxBioC/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -8,6 +8,22 @@ information) ####################################### +version 0.9 +####################################### + +user-visible CHANGES: + +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + +BUGFIXES + + +####################################### version 0.8.3 ####################################### + update for beadarray versions >= 2.0.0 with support by Mark Dunnings and Modified: branches/robast-0.9/pkg/RobRex/inst/NEWS =================================================================== --- branches/robast-0.9/pkg/RobRex/inst/NEWS 2013-09-10 22:31:38 UTC (rev 689) +++ branches/robast-0.9/pkg/RobRex/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) @@ -8,6 +8,22 @@ information) ####################################### +version 0.9 +####################################### + +user-visible CHANGES: + +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + +BUGFIXES + + +####################################### version 0.8 ####################################### From noreply at r-forge.r-project.org Wed Sep 11 16:07:53 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 16:07:53 +0200 (CEST) Subject: [Robast-commits] r691 - branches/robast-0.9/pkg/ROptEst/R branches/robast-0.9/pkg/RobAStBase/R branches/robast-0.9/pkg/RobAStBase/tests branches/robast-0.9/pkg/RobExtremes/R pkg/RandVar pkg/RandVar/inst pkg/RandVar/man pkg/RobAStBase pkg/RobAStBase/R pkg/RobAStBase/inst pkg/RobAStBase/man pkg/RobAStBase/tests Message-ID: <20130911140753.2F570185D99@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 16:07:52 +0200 (Wed, 11 Sep 2013) New Revision: 691 Added: pkg/RandVar/.Rbuildignore pkg/RobAStBase/.Rbuildignore pkg/RobAStBase/R/00internal.R pkg/RobAStBase/RobAStBase-Ex.R pkg/RobAStBase/inst/unitTests/ pkg/RobAStBase/man/ComparePlotWrapper.Rd pkg/RobAStBase/man/InfoPlotWrapper.Rd pkg/RobAStBase/man/PlotICWrapper.Rd pkg/RobAStBase/man/internal_plots.Rd pkg/RobAStBase/man/mergelists.Rd pkg/RobAStBase/man/rescaleFunction-methods.Rd pkg/RobAStBase/tests/doRUnit.R Removed: pkg/RobAStBase/chm/ Modified: branches/robast-0.9/pkg/ROptEst/R/00internal.R branches/robast-0.9/pkg/RobAStBase/R/00internal.R branches/robast-0.9/pkg/RobAStBase/tests/doRUnit.R branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R pkg/RandVar/DESCRIPTION pkg/RandVar/inst/NEWS pkg/RandVar/man/0RandVar-package.Rd pkg/RobAStBase/DESCRIPTION pkg/RobAStBase/NAMESPACE pkg/RobAStBase/R/AllClass.R pkg/RobAStBase/R/AllGeneric.R pkg/RobAStBase/R/AllPlot.R pkg/RobAStBase/R/bALEstimate.R pkg/RobAStBase/R/comparePlot.R pkg/RobAStBase/inst/NEWS pkg/RobAStBase/man/0RobAStBase-package.Rd pkg/RobAStBase/man/InfluenceCurve-class.Rd pkg/RobAStBase/man/comparePlot.Rd pkg/RobAStBase/man/cutoff.Rd pkg/RobAStBase/man/ddPlot-methods.Rd pkg/RobAStBase/man/infoPlot.Rd pkg/RobAStBase/man/internals.Rd pkg/RobAStBase/man/internals_ddPlot.Rd pkg/RobAStBase/man/kStepEstimator.Rd pkg/RobAStBase/man/makeIC-methods.Rd pkg/RobAStBase/man/outlyingPlotIC.Rd pkg/RobAStBase/man/plot-methods.Rd Log: RandVar und RobAStBase 0.9 in trunk gemerge-t Modified: branches/robast-0.9/pkg/ROptEst/R/00internal.R =================================================================== --- branches/robast-0.9/pkg/ROptEst/R/00internal.R 2013-09-11 08:56:09 UTC (rev 690) +++ branches/robast-0.9/pkg/ROptEst/R/00internal.R 2013-09-11 14:07:52 UTC (rev 691) @@ -5,3 +5,21 @@ .SelectOrderData <- RobAStBase:::.SelectOrderData ### helper function to recursively evaluate list .evalListRec <- RobAStBase:::.evalListRec + + +if(packageVersion("distrMod")<"2.5"){ +.isUnitMatrix <- function(m){ +### checks whether m is unit matrix + m.row <- nrow(m) + isTRUE(all.equal(m, diag(m.row), check.attributes = FALSE)) + } + +.deleteDim <- function(x){ + attribs <- attributes(x) + attribs$dim <- NULL + attribs$dimnames <- NULL + attributes(x) <- attribs + x + } + +} Modified: branches/robast-0.9/pkg/RobAStBase/R/00internal.R =================================================================== --- branches/robast-0.9/pkg/RobAStBase/R/00internal.R 2013-09-11 08:56:09 UTC (rev 690) +++ branches/robast-0.9/pkg/RobAStBase/R/00internal.R 2013-09-11 14:07:52 UTC (rev 691) @@ -6,3 +6,125 @@ paste(format(100 * probs, trim = TRUE, scientific = FALSE, digits = digits), "%") +#------------------------------------------------------------------------------ +### for distrXXX pre 2.5 +#------------------------------------------------------------------------------ + + +if(packageVersion("distr")<"2.5"){ + +.inArgs <- function(arg, fct) + {as.character(arg) %in% names(formals(fct))} + +.fillList <- function(list0, len = length(list0)){ + if(len == length(list0)) + return(list0) + i <- 0 + ll0 <- length(list0) + li0 <- vector("list",len) + if(ll0) + while(i < len){ + j <- 1 + ( i %% ll0) + i <- i + 1 + li0[[i]] <- list0[[j]] + } + return(li0) +} + +.ULC.cast <- function(x){ + if( is(x,"AbscontDistribution")) + x <- as(as(x,"AbscontDistribution"), "UnivarLebDecDistribution") + if(is(x,"DiscreteDistribution")) + x <- as(as(x,"DiscreteDistribution"), "UnivarLebDecDistribution") + if(!is(x,"UnivarLebDecDistribution")) + x <- as(x,"UnivarLebDecDistribution") + return(x) +} + +.isEqual <- function(p0, p1, tol = min( getdistrOption("TruncQuantile")/2, + .Machine$double.eps^.7 + )) + abs(p0-p1)< tol + +.isIn <- function(p0, pmat, tol = min( getdistrOption("TruncQuantile")/2, + .Machine$double.eps^.7 + )) + {list1 <- lapply(1:nrow(pmat), function(x){ + (p0+tol > pmat[x,1]) & (p0-tol < pmat[x,2]) }) + apply(matrix(unlist(list1), ncol = nrow(pmat)), 1, any)} + + +.isEqual01<- function(x) .isEqual(x,0)|.isEqual(x,1) + +.presubs <- function(inp, frompat, topat){ +### replaces in an expression or a string all frompat patterns to topat patterns + +logic <- FALSE +inCx <- sapply(inp, + function(inpx){ + inC <- deparse(inpx) + l <- length(frompat) + for(i in 1:l) + { if (is.language(topat[[i]])){ + totxt <- deparse(topat[[i]]) + totxt <- gsub("expression\\(", "\", ", gsub("\\)$",", \"",totxt)) + if (length(grep(frompat[i],inC))) logic <<- TRUE + inC <- gsub(frompat[i],totxt,inC) + }else inC <- gsub(frompat[i], topat[[i]], inC) + } + return(inC) + }) +if(length(grep("expression",inCx))>0) + inCx <- gsub("expression\\(", "", gsub("\\)$","",inCx)) +if (length(inCx) > 1) { + inCx <- paste(inCx, c(rep(",", length(inCx)-1), ""), + sep = "", collapse = "\"\\n\",") + if ( any(as.logical(c(lapply(inp,is.language)))) | logic ) + inCx <- paste("expression(paste(", gsub("\\\\n"," ", inCx), "))", sep ="") + else + inCx <- paste("paste(",inCx,")", sep ="") +}else inCx <- paste("expression(paste(",inCx,"))",sep="") +outC <- eval(parse(text = eval(inCx))) +return(outC) +} + +.DistrCollapse <- function(support, prob, + eps = getdistrOption("DistrResolution")){ + supp <- support + prob <- as.vector(prob) + suppIncr <- diff(c(supp[1]-2*eps,supp)) < eps + groups <- cumsum(!suppIncr) + prob <- as.vector(tapply(prob, groups, sum)) + supp <- as.vector(tapply(supp, groups, quantile, probs = 0.5, type = 1)) + ### in order to get a "support member" take the leftmost median + return(list(supp = supp, prob = prob)) +# newDistribution <- DiscreteDistribution(supp=supp,prob=prob) +# return(newDistribution) +} + +.makeLenAndOrder <- function(x,ord){ + n <- length(ord) + x <- rep(x, length.out=n) + x[ord] +} + +} + +if(packageVersion("distrMod")<"2.5"){ +.isUnitMatrix <- function(m){ +### checks whether m is unit matrix + m.row <- nrow(m) + isTRUE(all.equal(m, diag(m.row), check.attributes = FALSE)) + } + +.deleteDim <- function(x){ + attribs <- attributes(x) + attribs$dim <- NULL + attribs$dimnames <- NULL + attributes(x) <- attribs + x + } + +} + + Modified: branches/robast-0.9/pkg/RobAStBase/tests/doRUnit.R =================================================================== --- branches/robast-0.9/pkg/RobAStBase/tests/doRUnit.R 2013-09-11 08:56:09 UTC (rev 690) +++ branches/robast-0.9/pkg/RobAStBase/tests/doRUnit.R 2013-09-11 14:07:52 UTC (rev 691) @@ -3,7 +3,7 @@ ## --- Setup --- - pkg <- "RobExtremes" + pkg <- "RobAStBase" if((Sys.getenv("RCMDCHECK") == "") || (Sys.getenv("RCMDCHECK") == "FALSE")) { Modified: branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R =================================================================== --- branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R 2013-09-11 08:56:09 UTC (rev 690) +++ branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R 2013-09-11 14:07:52 UTC (rev 691) @@ -53,7 +53,9 @@ if(vdbg) print(val) return(val) } - xi.0 <- uniroot(q.f,lower=q.lo.0,upper=q.up.0)$root + xi.01 <- try(uniroot(q.f,lower=q.lo.0,upper=q.up.0), silent=TRUE) + if(is(xi.01, "try-error")) stop("Error in calculating LD-estimator: 'uniroot' did not converge.") + xi.0 <- xi.01$root th0 <- c(1,xi.0) names(th0) <- c("scale","shape") distr.new.0 <- ParamFamily.0 at modifyParam(theta=th0)-loc0 Added: pkg/RandVar/.Rbuildignore =================================================================== --- pkg/RandVar/.Rbuildignore (rev 0) +++ pkg/RandVar/.Rbuildignore 2013-09-11 14:07:52 UTC (rev 691) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: pkg/RandVar/DESCRIPTION =================================================================== --- pkg/RandVar/DESCRIPTION 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RandVar/DESCRIPTION 2013-09-11 14:07:52 UTC (rev 691) @@ -1,9 +1,9 @@ Package: RandVar -Version: 0.9.1 -Date: 2013-02-08 +Version: 0.9.2 +Date: 2013-09-11 Title: Implementation of random variables Description: Implementation of random variables by means of S4 classes and methods -Depends: R (>= 2.14.0), methods, startupmsg, distr(>= 2.0), distrEx(>= 2.0) +Depends: R (>= 2.14.0), methods, distr(>= 2.0), distrEx(>= 2.0) Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl ByteCompile: yes @@ -13,4 +13,4 @@ URL: http://robast.r-forge.r-project.org/ LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 591 +SVNRevision: 690 Modified: pkg/RandVar/inst/NEWS =================================================================== --- pkg/RandVar/inst/NEWS 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RandVar/inst/NEWS 2013-09-11 14:07:52 UTC (rev 691) @@ -10,7 +10,23 @@ ####################################### version 0.9 ####################################### + +user-visible CHANGES: + +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + introduced folder vignettes ++ some encoding problems with vignette which now includes "\usepackage[utf8]{inputenc}" ++ update of Rout.save files, added seed for reproducibility ++ suppressed gaps handling and warnings from .makeDNew (annoying with GEVD) in .getImageDistr ++ deleted chm folders --- they are no longer needed ++ RobASt-Pkgs: DESCRIPTION depends become stricter (requiring distrMod, distrEx, distr >=2.4 to be on the safe side) + +BUGFIXES ####################################### Modified: pkg/RandVar/man/0RandVar-package.Rd =================================================================== --- pkg/RandVar/man/0RandVar-package.Rd 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RandVar/man/0RandVar-package.Rd 2013-09-11 14:07:52 UTC (rev 691) @@ -11,14 +11,14 @@ \details{ \tabular{ll}{ Package: \tab RandVar \cr -Version: \tab 0.9.1 \cr -Date: \tab 2013-02-08 \cr +Version: \tab 0.9.2 \cr +Date: \tab 2013-09-11 \cr Depends: \tab R (>= 2.12.0), methods, startupmsg, distr(>= 2.0), distrEx(>= 2.0)\cr LazyLoad: \tab yes \cr License: \tab LGPL-3 \cr URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 591 \cr +SVNRevision: \tab 690 \cr } } \author{ Added: pkg/RobAStBase/.Rbuildignore =================================================================== --- pkg/RobAStBase/.Rbuildignore (rev 0) +++ pkg/RobAStBase/.Rbuildignore 2013-09-11 14:07:52 UTC (rev 691) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: pkg/RobAStBase/DESCRIPTION =================================================================== --- pkg/RobAStBase/DESCRIPTION 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RobAStBase/DESCRIPTION 2013-09-11 14:07:52 UTC (rev 691) @@ -1,11 +1,10 @@ Package: RobAStBase -Version: 0.8.1 -Date: 2011-09-30 +Version: 0.9 +Date: 2013-09-11 Title: Robust Asymptotic Statistics Description: Base S4-classes and functions for robust asymptotic statistics. -Depends: R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0), distrMod(>= 2.0), RandVar(>= - 0.6.3) -Suggests: ROptEst +Depends: R(>= 2.12.0), methods, rrcov, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>= 0.6.3) +Suggests: ROptEst, RUnit (>= 0.4.26) Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl ByteCompile: yes @@ -15,4 +14,4 @@ URL: http://robast.r-forge.r-project.org/ LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 454 +SVNRevision: 690 Modified: pkg/RobAStBase/NAMESPACE =================================================================== --- pkg/RobAStBase/NAMESPACE 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RobAStBase/NAMESPACE 2013-09-11 14:07:52 UTC (rev 691) @@ -1,4 +1,5 @@ import("methods") +importFrom("rrcov", "getCov", "CovMcd") import("distr") import("distrEx") import("distrMod") @@ -19,6 +20,7 @@ "BdStWeight", "HampelWeight") exportClasses("ALEstimate", "kStepEstimate", "MEstimate") exportClasses("cutoff") +exportClasses("interpolRisk", "OMSRRisk","MBRRisk","RMXRRisk") exportClasses("StartClass", "pICList", "OptionalpICList") exportMethods("show", "plot") @@ -57,8 +59,13 @@ "Mroot","kStepEstimator.start") exportMethods("pICList","ICList", "ksteps", "uksteps", "start", "startval", "ustartval") +exportMethods("moveL2Fam2RefParam", + "moveICBackFromRefParam", + "rescaleFunction") exportMethods("ddPlot", "qqplot") exportMethods("cutoff.quantile", "cutoff.quantile<-") +exportMethods("samplesize<-", "samplesize") +exportMethods("getRiskFctBV") export("oneStepEstimator", "kStepEstimator") export("ContNeighborhood", "TotalVarNeighborhood") export("FixRobModel", "InfRobModel") @@ -67,3 +74,8 @@ export("RobAStBaseOptions", "getRobAStBaseOption") export("cutoff","cutoff.chisq","cutoff.sememp") export("outlyingPlotIC", "RobAStBaseMASK") +export("OMSRRisk","MBRRisk","RMXRRisk") +export("getRiskFctBV") +export(".rescalefct",".plotRescaledAxis",".makedotsP",".makedotsLowLevel",".SelectOrderData") +export(".merge.lists") +export("InfoPlot", "ComparePlot", "PlotIC") \ No newline at end of file Added: pkg/RobAStBase/R/00internal.R =================================================================== --- pkg/RobAStBase/R/00internal.R (rev 0) +++ pkg/RobAStBase/R/00internal.R 2013-09-11 14:07:52 UTC (rev 691) @@ -0,0 +1,130 @@ +#------------------------------------------------------------------------------ +# .format.perc : for formatting percentages +#------------------------------------------------------------------------------ +### code borrowed from non-exported code from confint.default from package stats +.format.perc <- function (probs, digits) + paste(format(100 * probs, trim = TRUE, scientific = FALSE, digits = digits), + "%") + +#------------------------------------------------------------------------------ +### for distrXXX pre 2.5 +#------------------------------------------------------------------------------ + + +if(packageVersion("distr")<"2.5"){ + +.inArgs <- function(arg, fct) + {as.character(arg) %in% names(formals(fct))} + +.fillList <- function(list0, len = length(list0)){ + if(len == length(list0)) + return(list0) + i <- 0 + ll0 <- length(list0) + li0 <- vector("list",len) + if(ll0) + while(i < len){ + j <- 1 + ( i %% ll0) + i <- i + 1 + li0[[i]] <- list0[[j]] + } + return(li0) +} + +.ULC.cast <- function(x){ + if( is(x,"AbscontDistribution")) + x <- as(as(x,"AbscontDistribution"), "UnivarLebDecDistribution") + if(is(x,"DiscreteDistribution")) + x <- as(as(x,"DiscreteDistribution"), "UnivarLebDecDistribution") + if(!is(x,"UnivarLebDecDistribution")) + x <- as(x,"UnivarLebDecDistribution") + return(x) +} + +.isEqual <- function(p0, p1, tol = min( getdistrOption("TruncQuantile")/2, + .Machine$double.eps^.7 + )) + abs(p0-p1)< tol + +.isIn <- function(p0, pmat, tol = min( getdistrOption("TruncQuantile")/2, + .Machine$double.eps^.7 + )) + {list1 <- lapply(1:nrow(pmat), function(x){ + (p0+tol > pmat[x,1]) & (p0-tol < pmat[x,2]) }) + apply(matrix(unlist(list1), ncol = nrow(pmat)), 1, any)} + + +.isEqual01<- function(x) .isEqual(x,0)|.isEqual(x,1) + +.presubs <- function(inp, frompat, topat){ +### replaces in an expression or a string all frompat patterns to topat patterns + +logic <- FALSE +inCx <- sapply(inp, + function(inpx){ + inC <- deparse(inpx) + l <- length(frompat) + for(i in 1:l) + { if (is.language(topat[[i]])){ + totxt <- deparse(topat[[i]]) + totxt <- gsub("expression\\(", "\", ", gsub("\\)$",", \"",totxt)) + if (length(grep(frompat[i],inC))) logic <<- TRUE + inC <- gsub(frompat[i],totxt,inC) + }else inC <- gsub(frompat[i], topat[[i]], inC) + } + return(inC) + }) +if(length(grep("expression",inCx))>0) + inCx <- gsub("expression\\(", "", gsub("\\)$","",inCx)) +if (length(inCx) > 1) { + inCx <- paste(inCx, c(rep(",", length(inCx)-1), ""), + sep = "", collapse = "\"\\n\",") + if ( any(as.logical(c(lapply(inp,is.language)))) | logic ) + inCx <- paste("expression(paste(", gsub("\\\\n"," ", inCx), "))", sep ="") + else + inCx <- paste("paste(",inCx,")", sep ="") +}else inCx <- paste("expression(paste(",inCx,"))",sep="") +outC <- eval(parse(text = eval(inCx))) +return(outC) +} + +.DistrCollapse <- function(support, prob, + eps = getdistrOption("DistrResolution")){ + supp <- support + prob <- as.vector(prob) + suppIncr <- diff(c(supp[1]-2*eps,supp)) < eps + groups <- cumsum(!suppIncr) + prob <- as.vector(tapply(prob, groups, sum)) + supp <- as.vector(tapply(supp, groups, quantile, probs = 0.5, type = 1)) + ### in order to get a "support member" take the leftmost median + return(list(supp = supp, prob = prob)) +# newDistribution <- DiscreteDistribution(supp=supp,prob=prob) +# return(newDistribution) +} + +.makeLenAndOrder <- function(x,ord){ + n <- length(ord) + x <- rep(x, length.out=n) + x[ord] +} + +} + +if(packageVersion("distrMod")<"2.5"){ +.isUnitMatrix <- function(m){ +### checks whether m is unit matrix + m.row <- nrow(m) + isTRUE(all.equal(m, diag(m.row), check.attributes = FALSE)) + } + +.deleteDim <- function(x){ + attribs <- attributes(x) + attribs$dim <- NULL + attribs$dimnames <- NULL + attributes(x) <- attribs + x + } + +} + + Modified: pkg/RobAStBase/R/AllClass.R =================================================================== --- pkg/RobAStBase/R/AllClass.R 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RobAStBase/R/AllClass.R 2013-09-11 14:07:52 UTC (rev 691) @@ -312,3 +312,13 @@ prototype = prototype(name = "empirical", fct = function(data) quantile(data), cutoff.quantile = 0.95)) + + +################################################# +# new risk classes +################################################# +setClass("interpolRisk", representation = representation(samplesize="numeric"), + contains = c("VIRTUAL", "RiskType")) +setClass("OMSRRisk", contains = "interpolRisk", prototype=prototype(type=".OMSE", samplesize=100)) +setClass("RMXRRisk", contains = "interpolRisk", prototype=prototype(type=".RMXE", samplesize=100)) +setClass("MBRRisk", contains = "interpolRisk", prototype=prototype(type=".MBRE",samplesize=100)) Modified: pkg/RobAStBase/R/AllGeneric.R =================================================================== --- pkg/RobAStBase/R/AllGeneric.R 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RobAStBase/R/AllGeneric.R 2013-09-11 14:07:52 UTC (rev 691) @@ -214,3 +214,29 @@ setGeneric("kStepEstimator.start", function(start,...) standardGeneric("kStepEstimator.start")) } +if(!isGeneric("radius")){ + setGeneric("radius", function(object) standardGeneric("radius")) +} + +if(!isGeneric("samplesize<-")){ + setGeneric("samplesize<-", + function(object, value) standardGeneric("samplesize<-")) +} +if(!isGeneric("getRiskFctBV")){ + setGeneric("getRiskFctBV", function(risk, biastype) standardGeneric("getRiskFctBV")) +} + +if(!isGeneric("moveL2Fam2RefParam")){ + setGeneric("moveL2Fam2RefParam", function(L2Fam, ...) + standardGeneric("moveL2Fam2RefParam")) +} + +if(!isGeneric("moveICBackFromRefParam")){ + setGeneric("moveICBackFromRefParam", function(IC, L2Fam, ...) + standardGeneric("moveICBackFromRefParam")) +} + +if(!isGeneric("rescaleFunction")){ + setGeneric("rescaleFunction", function(L2Fam, ...) + standardGeneric("rescaleFunction")) +} Modified: pkg/RobAStBase/R/AllPlot.R =================================================================== --- pkg/RobAStBase/R/AllPlot.R 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RobAStBase/R/AllPlot.R 2013-09-11 14:07:52 UTC (rev 691) @@ -1,26 +1,37 @@ setMethod("plot", signature(x = "IC", y = "missing"), - function(x,...,withSweave = getdistrOption("withSweave"), + function(x, ...,withSweave = getdistrOption("withSweave"), main = FALSE, inner = TRUE, sub = FALSE, col.inner = par("col.main"), cex.inner = 0.8, bmar = par("mar")[1], tmar = par("mar")[3], + with.legend = FALSE, legend = NULL, legend.bg = "white", + legend.location = "bottomright", legend.cex = 0.8, + withMBR = FALSE, MBRB = NA, MBR.fac = 2, col.MBR = par("col"), + lty.MBR = "dashed", lwd.MBR = 0.8, + scaleX = FALSE, scaleX.fct, scaleX.inv, + scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, + scaleN = 9, x.ticks = NULL, y.ticks = NULL, mfColRow = TRUE, to.draw.arg = NULL){ xc <- match.call(call = sys.call(sys.parent(1)))$x dots <- match.call(call = sys.call(sys.parent(1)), expand.dots = FALSE)$"..." + dotsLeg <- dotsT <- dotsL <- .makedotsLowLevel(dots) - if(!is.logical(inner)){ if(!is.list(inner)) inner <- as.list(inner) #stop("Argument 'inner' must either be 'logical' or a 'list'") - inner <- distr:::.fillList(inner,4) + inner <- .fillList(inner,4) innerD <- inner[1:3] innerL <- inner[4] }else{innerD <- innerL <- inner} L2Fam <- eval(x at CallL2Fam) + if(missing(scaleX.fct)){ + scaleX.fct <- p(L2Fam) + scaleX.inv <- q(L2Fam) + } trafO <- trafo(L2Fam at param) dims <- nrow(trafO) @@ -39,7 +50,15 @@ nrows <- trunc(sqrt(dims0)) ncols <- ceiling(dims0/nrows) + if(!is.null(x.ticks)) dots$xaxt <- "n" + if(!is.null(y.ticks)){ + y.ticks <- .fillList(list(y.ticks), dims0) + dots$yaxt <- "n" + } + MBRB <- matrix(rep(t(MBRB), length.out=dims0*2),ncol=2, byrow=T) + MBRB <- MBRB * MBR.fac + e1 <- L2Fam at distribution if(!is(e1, "UnivariateDistribution")) stop("not yet implemented") @@ -48,6 +67,9 @@ if(!is.null(xlim)){ xm <- min(xlim) xM <- max(xlim) + if(!length(xlim) %in% c(2,2*dims0)) + stop("Wrong length of Argument xlim"); + xlim <- matrix(xlim, 2,dims0) } if(is(e1, "AbscontDistribution")){ lower0 <- getLow(e1, eps = getdistrOption("TruncQuantile")*2) @@ -74,7 +96,7 @@ plty <- "p" lty <- "dotted" if(!is.null(dots$xlim)) x.vec <- x.vec[(x.vec>=xm) & (x.vec<=xM)] - + } } ylim <- eval(dots$ylim) @@ -87,8 +109,9 @@ if(!is.null(dots[["lty"]])) dots["lty"] <- NULL if(!is.null(dots[["type"]])) dots["type"] <- NULL - if(!is.null(dots[["xlab"]])) dots["xlab"] <- NULL - if(!is.null(dots[["ylab"]])) dots["ylab"] <- NULL + xlab <- dots$xlab; if(is.null(xlab)) xlab <- "x" + ylab <- dots$ylab; if(is.null(ylab)) ylab <- "(partial) IC" + dots$xlab <- dots$ylab <- NULL IC1 <- as(diag(dims) %*% x at Curve, "EuclRandVariable") @@ -97,7 +120,7 @@ lineT <- NA .mpresubs <- function(inx) - distr:::.presubs(inx, c("%C", "%D", "%A"), + .presubs(inx, c("%C", "%D", "%A"), c(as.character(class(x)[1]), as.character(date()), as.character(deparse(xc)))) @@ -162,14 +185,28 @@ } }else{ innerT <- lapply(inner, .mpresubs) - innerT <- distr:::.fillList(innerT,dims) + innerT <- .fillList(innerT,dims) if(dims01) 3/4 else .75/.8 + if(missing(legend.location)){ + legend.location <- .fillList(list("bottomright"), dims0) + }else{ + legend.location <- as.list(legend.location) + legend.location <- .fillList(legend.location, dims0) + } + if(is.null(legend)){ + legend <- vector("list",dims0) + legend <- .fillList(as.list(xc),dims0) + } + } + w0 <- getOption("warn") options(warn = -1) on.exit(options(warn = w0)) @@ -188,37 +225,64 @@ do.call(par,args=parArgs) - dotsT <- dots - dotsT["main"] <- NULL - dotsT["cex.main"] <- NULL - dotsT["col.main"] <- NULL - dotsT["line"] <- NULL + dotsT["pch"] <- dotsT["cex"] <- NULL + dotsT["col"] <- dotsT["lwd"] <- NULL + dotsL["cex"] <- dotsLeg["bg"] <- dotsLeg["cex"] <- NULL + dots$ylim <- NULL - dots$ylim <- NULL for(i in 1:dims0){ indi <- to.draw[i] if(!is.null(ylim)) dots$ylim <- ylim[,i] - do.call(plot, args=c(list(x.vec, sapply(x.vec, IC1 at Map[[indi]]), - type = plty, lty = lty, - xlab = "x", ylab = "(partial) IC"), - dots)) + fct <- function(x) sapply(x, IC1 at Map[[indi]]) + print(xlim[,i]) + resc <-.rescalefct(x.vec, fct, scaleX, scaleX.fct, + scaleX.inv, scaleY, scaleY.fct, xlim[,i], + ylim[,i], dots) + dots <- resc$dots + dots$xlim <- xlim[,i] + dots$ylim <- ylim[,i] + x.vec1 <- resc$X + y.vec1 <- resc$Y + do.call(plot, args=c(list(x=x.vec1, y=y.vec1, type = plty, lty = lty, + xlab = xlab, ylab = ylab), dots)) + .plotRescaledAxis(scaleX, scaleX.fct, scaleX.inv, + scaleY,scaleY.fct, scaleY.inv, + xlim[,i], ylim[,i], x.vec1, ypts = 400, n = scaleN, + x.ticks = x.ticks, y.ticks = y.ticks[[i]]) + if(withMBR){ + MBR.i <- MBRB[i,] + if(scaleY) MBR.i <- scaleY.fct(MBR.i) + abline(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR) + } if(is(e1, "DiscreteDistribution")){ - x.vec1 <- seq(from = min(x.vec), to = max(x.vec), length = 1000) - do.call(lines,args=c(list(x.vec1, sapply(x.vec1, IC1 at Map[[indi]]), - lty = "dotted"), dots)) + x.vec1D <- seq(from = min(x.vec), to = max(x.vec), length = 1000) + rescD <-.rescalefct(x.vec1D, fct, scaleX, scaleX.fct, + scaleX.inv, scaleY, scaleY.fct, xlim[,i], + ylim[,i], dots) + x.vecD <- rescD$X + y.vecD <- rescD$Y + + dotsL$lty <- NULL + do.call(lines,args=c(list(x.vecD, y.vecD, + lty = "dotted"), dotsL)) } do.call(title,args=c(list(main = innerT[indi]), dotsT, line = lineT, cex.main = cex.inner, col.main = col.inner)) + if(with.legend) + legend(.legendCoord(legend.location[[i]], scaleX, scaleX.fct, + scaleY, scaleY.fct), bg = legend.bg, + legend = legend[[i]], dotsLeg, cex = legend.cex*fac.leg) + } - if(!hasArg(cex.main)) cex.main <- par("cex.main") else cex.main <- dots$"cex.main" - if(!hasArg(col.main)) col.main <- par("col.main") else col.main <- dots$"col.main" + cex.main <- if(!hasArg(cex.main)) par("cex.main") else dots$"cex.main" + col.main <- if(!hasArg(col.main)) par("col.main") else dots$"col.main" if (mainL) mtext(text = main, side = 3, cex = cex.main, adj = .5, outer = TRUE, padj = 1.4, col = col.main) - if(!hasArg(cex.sub)) cex.sub <- par("cex.sub") else cex.sub <- dots$"cex.sub" - if(!hasArg(col.sub)) col.sub <- par("col.sub") else col.sub <- dots$"col.sub" + cex.sub <- if(!hasArg(cex.sub)) par("cex.sub") else dots$"cex.sub" + col.sub <- if(!hasArg(col.sub)) par("col.sub") else dots$"col.sub" if (subL) mtext(text = sub, side = 1, cex = cex.sub, adj = .5, outer = TRUE, line = -1.6, col = col.sub) @@ -230,20 +294,15 @@ setMethod("plot", signature(x = "IC",y = "numeric"), function(x, y, ..., cex.pts = 1, col.pts = par("col"), pch.pts = 1, jitter.fac = 1, with.lab = FALSE, - lab.pts = NULL, lab.font = NULL, - which.lbs = NULL, which.Order = NULL, return.Order = FALSE){ + lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, + which.lbs = NULL, which.Order = NULL, return.Order = FALSE){ + dots <- match.call(call = sys.call(sys.parent(1)), expand.dots = FALSE)$"..." n <- if(!is.null(dim(y))) nrow(y) else length(y) - oN0 <- NULL - if(is.null(which.lbs)) - which.lbs <- 1:n - which.lbs0 <- (1:n) %in% which.lbs - which.lbx <- rep(which.lbs0, length.out=length(y)) - y0 <- y[which.lbx] - n <- if(!is.null(dim(y0))) nrow(y0) else length(y0) - oN <- (1:n)[which.lbs0] + pch.pts <- rep(pch.pts, length.out=n) + lab.pts <- if(is.null(lab.pts)) paste(1:n) else rep(lab.pts,n) L2Fam <- eval(x at CallL2Fam) @@ -259,50 +318,52 @@ absInfo <- t(IC1) %*% QF %*% IC1 ICMap <- IC1 at Map - absInfo <- sapply(y, absInfo at Map[[1]]) - absInfo0 <- absInfo[which.lbs]/max(absInfo) + sel <- .SelectOrderData(y, function(x)sapply(x, absInfo at Map[[1]]), + which.lbs, which.Order) + i.d <- sel$ind + i0.d <- sel$ind1 + n <- length(i.d) - if (n==length(y0)) { - oN <- order(absInfo0) - oN0 <- order(absInfo) - oN0 <- oN0[oN0 %in% which.lbs] - y0 <- y0[oN] - if(!is.null(which.Order)){ - oN <- oN0[(n+1)-which.Order] - y0 <- y[oN] - absInfo0 <- absInfo[oN]/max(absInfo[oN]) - } - } - if(is.null(lab.pts)) lab.pts <- paste(oN) - else {lab.pts <- rep(lab.pts, length.out=length(y)) - lab.pts <- lab.pts[oN]} - dots.without <- dots dots.without$col <- dots.without$cex <- dots.without$pch <- NULL + pL <- expression({}) if(!is.null(dots$panel.last)) pL <- dots$panel.last dots$panel.last <- NULL pL <- substitute({ + y1 <- y0s ICy <- sapply(y0s,ICMap0[[indi]]) + print(xlim[,i]) + resc.dat <-.rescalefct(y0s, function(x) sapply(x,ICMap0[[indi]]), + scaleX, scaleX.fct, scaleX.inv, + scaleY, scaleY.fct, xlim[,i], ylim[,i], + dwo0) + y1 <- resc.dat$X + ICy <- resc.dat$Y + if(is(e1, "DiscreteDistribution")) ICy <- jitter(ICy, factor = jitter.fac0) - do.call(points, args=c(list(y0s, ICy, cex = log(absy0+1)*3*cex0, - col = col0, pch = pch0), dwo0)) + + col.pts <- if(!is.na(al0)) sapply(col0, addAlphTrsp2col,alpha=al0) else col0 + + do.call(points, args=c(list(y1, ICy, cex = log(absy0+1)*3*cex0, + col = col.pts, pch = pch0), dwo0)) if(with.lab0){ text(x = y0s, y = ICy, labels = lab.pts0, cex = log(absy0+1)*1.5*cex0, col = col0) } pL0 - }, list(pL0 = pL, ICMap0 = ICMap, y0s = y0, absy0 = absInfo0, - dwo0 = dots.without, cex0 = cex.pts, pch0 = pch.pts, - col0 = col.pts, with.lab0 = with.lab, lab.pts0 = lab.pts, - jitter.fac0 = jitter.fac + }, list(pL0 = pL, ICMap0 = ICMap, y0s = sel$data, absy0 = sel$y, + dwo0 = dots.without, cex0 = cex.pts, pch0 = pch.pts[i.d], + col0 = col.pts, with.lab0 = with.lab, lab.pts0 = lab.pts[i.d], + al0 = alpha.trsp, jitter.fac0 = jitter.fac )) do.call("plot", args = c(list(x = x, panel.last = pL), dots)) - if(return.Order) return(oN0) + if(return.Order) return(i0.d) invisible() }) + Modified: pkg/RobAStBase/R/bALEstimate.R =================================================================== --- pkg/RobAStBase/R/bALEstimate.R 2013-09-11 08:56:09 UTC (rev 690) +++ pkg/RobAStBase/R/bALEstimate.R 2013-09-11 14:07:52 UTC (rev 691) @@ -22,7 +22,7 @@ ### code borrowed from confint.default from package stats a <- (1 - level)/2 a <- c(a, 1 - a) - pct <- stats:::format.perc(a, 3) + pct <- .format.perc(a, 3) fac <- qnorm(a) ci <- array(NA, dim = c(length(object at estimate), 2), dimnames = list(names(object at estimate), pct)) @@ -58,7 +58,7 @@ ### code borrowed from confint.default from package stats a <- (1 - level)/2 a <- c(a, 1 - a) - pct <- stats:::format.perc(a, 3) + pct <- .format.perc(a, 3) fac <- qnorm(a, mean = c(-object at asbias, object at asbias)) ci <- array(NA, dim = c(length(object at estimate), 2), dimnames = list(names(object at estimate), pct)) @@ -97,7 +97,7 @@ ### code borrowed from confint.default from package stats a <- (1 - level)/2 a <- c(a, 1 - a) - pct <- stats:::format.perc(a, 3) + pct <- .format.perc(a, 3) if(method at sign == -1) [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 691 From noreply at r-forge.r-project.org Wed Sep 11 16:21:01 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 16:21:01 +0200 (CEST) Subject: [Robast-commits] r692 - in pkg/RobAStBase: R tests/Examples Message-ID: <20130911142101.B16F21844BF@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 16:21:01 +0200 (Wed, 11 Sep 2013) New Revision: 692 Modified: pkg/RobAStBase/R/IC.R pkg/RobAStBase/R/InfluenceCurve.R pkg/RobAStBase/R/ddPlot_utils.R pkg/RobAStBase/R/infoPlot.R pkg/RobAStBase/R/kStepEstimator.R pkg/RobAStBase/R/oneStepEstimator.R pkg/RobAStBase/R/qqplot.R pkg/RobAStBase/tests/Examples/RobAStBase-Ex.Rout.save Log: forgot some files in trunk RobAStBase Modified: pkg/RobAStBase/R/IC.R =================================================================== --- pkg/RobAStBase/R/IC.R 2013-09-11 14:07:52 UTC (rev 691) +++ pkg/RobAStBase/R/IC.R 2013-09-11 14:21:01 UTC (rev 692) @@ -75,6 +75,8 @@ if(out){ cat("precision of Fisher consistency:\n") print(consist) + cat("precision of Fisher consistency - relativ error [%]:\n") + print(100*consist/trafo) } prec <- max(abs(cent), abs(consist)) Modified: pkg/RobAStBase/R/InfluenceCurve.R =================================================================== --- pkg/RobAStBase/R/InfluenceCurve.R 2013-09-11 14:07:52 UTC (rev 691) +++ pkg/RobAStBase/R/InfluenceCurve.R 2013-09-11 14:21:01 UTC (rev 692) @@ -28,10 +28,27 @@ return(IC1) } +### helper function to recursively evaluate list +.evalListRec <- function(list0){ ## a list + len <- length(list0) + if(len==0L) return(list0) + for(i in 1:len) { + if(is.list(list0[[i]])){ list0[[i]] <- .evalListRec(list0[[i]]) + }else list0[[i]] <- eval(list0[[i]]) + } + return(list0) +} + ## access methods setMethod("name", "InfluenceCurve", function(object) object at name) setMethod("Curve", "InfluenceCurve", function(object) object at Curve) -setMethod("Risks", "InfluenceCurve", function(object) object at Risks) +setMethod("Risks", "InfluenceCurve", function(object){ + risks <- object at Risks + risks <- .evalListRec(risks) + eval.parent(object at Risks <- risks) + risks +}) + setMethod("Infos", "InfluenceCurve", function(object) object at Infos) ## add risk or information Modified: pkg/RobAStBase/R/ddPlot_utils.R =================================================================== --- pkg/RobAStBase/R/ddPlot_utils.R 2013-09-11 14:07:52 UTC (rev 691) +++ pkg/RobAStBase/R/ddPlot_utils.R 2013-09-11 14:21:01 UTC (rev 692) @@ -1,23 +1,34 @@ -.presubs <- distr:::.presubs +.ddPlot.MatNtNtCoCo <- function(data, ..., + dist.x = NormType(), + dist.y = NormType(), + cutoff.x = cutoff(norm = dist.x, cutoff.quantile = cutoff.quantile.x), + cutoff.y = cutoff(norm = dist.y, cutoff.quantile = cutoff.quantile.y), + cutoff.quantile.x = 0.95, + cutoff.quantile.y = cutoff.quantile.x, + transform.x, + transform.y = transform.x, + id.n, + lab.pts, + adj =0, + cex.idn = 1, + col.idn = par("col"), + lty.cutoff, + lwd.cutoff, + col.cutoff = "red", + text.abline = TRUE, + text.abline.x = NULL, text.abline.y = NULL, + cex.abline = par("cex"), col.abline = col.cutoff, + font.abline = par("font"), adj.abline = c(0,0), + text.abline.x.x = NULL, text.abline.x.y = NULL, + text.abline.y.x = NULL, text.abline.y.y = NULL, + text.abline.x.fmt.cx = "%7.2f", + text.abline.x.fmt.qx = "%4.2f%%", + text.abline.y.fmt.cy = "%7.2f", + text.abline.y.fmt.qy = "%4.2f%%", + jitt.fac = 10){ -.ddPlot.MatNtNtCoCo <- function(data, ..., dist.x = NormType(), dist.y = NormType(), - cutoff.x = cutoff(norm = dist.x, cutoff.quantile = cutoff.quantile.x), - cutoff.y = cutoff(norm = dist.y, cutoff.quantile = cutoff.quantile.y), - cutoff.quantile.x = 0.95, cutoff.quantile.y = cutoff.quantile.x, - transform.x, transform.y = transform.x, - id.n, lab.pts, adj =0, cex.idn, - col.idn, lty.cutoff, - lwd.cutoff, col.cutoff = "red", text.abline = TRUE, - text.abline.x = NULL, text.abline.y = NULL, - cex.abline = par("cex"), col.abline = col.cutoff, - font.abline = par("font"), adj.abline = c(0,0), - text.abline.x.x = NULL, text.abline.x.y = NULL, - text.abline.y.x = NULL, text.abline.y.y = NULL, - text.abline.x.fmt.cx = "%7.2f", text.abline.x.fmt.qx = "%4.2f%%", - text.abline.y.fmt.cy = "%7.2f", text.abline.y.fmt.qy = "%4.2f%%"){ + dots <- match.call(expand.dots = FALSE)$"..." - dots <- match.call(expand.dots = FALSE)$"..." - print(dots) id.n1 <- 1:ncol(data) if(missing(id.n) || is.null(id.n)) @@ -25,7 +36,7 @@ if(missing(lab.pts)|| is.null(lab.pts)){ - lab.pts <- if(!is.null(colnames(data))) colnames(data) else 1:ncol(data) + lab.pts <- if(!is.null(colnames(data))) colnames(data) else id.n1 } data <- data[,id.n, drop = FALSE] @@ -46,9 +57,17 @@ if(is.null(dist.x)) dist.x <- NormType() if(is.null(dist.y)) dist.y <- NormType() + if(is.null(dots$xlab)) dots$xlab <- name(dist.x) if(is.null(dots$ylab)) dots$ylab <- name(dist.y) + if(!is.null(dots$log)){ + if(grepl("x",dots$log)) dots$xlab <- paste(dots$xlab, "(log-scale)", + sep=" ") + if(grepl("y",dots$log)) dots$ylab <- paste(dots$ylab, "(log-scale)", + sep=" ") + } + if(is.null(cutoff.quantile.x)) cutoff.quantile.x <- 0.95 @@ -72,106 +91,116 @@ ndata.x <- fct(dist.x)(data.x) ndata.y <- fct(dist.y)(data.y) + +# print(head(ndata.x)) co.x <- fct(cutoff.x)(data.x) co.y <- fct(cutoff.y)(data.y) - if(is.null(adj)) adj <- 0 - if(missing(cex.idn)||is.null(cex.idn)) cex.idn <- if(is.null(dots$cex)) 1 else dots$cex - if(missing(col.idn)||is.null(col.idn)) col.idn <- if(is.null(dots$col)) par("col") else dots$col - if(is.null(col.cutoff)) col.cutoff <- "red" - print(cex.idn) - print(col.idn) + if(missing(cex.idn)||is.null(cex.idn)) + cex.idn <- if(is.null(dots$cex)) 1 else dots$cex + if(missing(col.idn)||is.null(col.idn)) + col.idn <- if(is.null(dots$col)) par("col") else dots$col + if(is.null(dots$lwd)) dots$lwd <- par("lwd") if(is.null(dots$lty)) dots$lty <- par("lty") + col.cutoff <- rep(col.cutoff,length.out=2) + if(missing(lty.cutoff) && !is.null(dots$lty)) lty.cutoff <- dots$lty + if(missing(lwd.cutoff) && !is.null(dots$lwd)) lwd.cutoff <- dots$lwd + if(missing(cex.abline) && !is.null(dots$cex)) cex.abline <- dots$cex + if(missing(adj.abline) && !is.null(dots$adj)) lty.abline <- dots$adj + if(missing(font.abline) && !is.null(dots$font)) font.abline <- dots$font - pdots <- dots - pdots$type <- NULL + pdots <- .makedotsLowLevel(dots) + pdots$xlab <- dots$xlab + pdots$ylab <- dots$ylab + pdots$nsim <- NULL pdots$x <- NULL pdots$y <- NULL pdots$offset <- NULL pdots$pos <- NULL - pdots$log <- NULL pdots$untf <- NULL - abdots <- pdots - col.cutoff <- rep(col.cutoff,length.out=2) - - - if(missing(lty.cutoff) && !is.null(dots$lty)) lty.cutoff <- dots$lty - if(missing(lwd.cutoff) && !is.null(dots$lwd)) lwd.cutoff <- dots$lwd - if(missing(cex.abline) && !is.null(dots$cex)) cex.abline <- dots$cex - if(missing(adj.abline) && !is.null(dots$adj)) lty.abline <- dots$adj - if(missing(font.abline) && !is.null(dots$font)) font.abline <- dots$font - + abdots <- .makedotsAB(dots) if(!missing(lty.cutoff)) abdots$lty <- lty.cutoff[[1]] if(!missing(lwd.cutoff)) abdots$lwd <- lwd.cutoff[1] abdots$col <- col.cutoff[1] - abdots$pos <- NULL - abdots$untf <- dots$untf - abdots$adj <- NULL + abdots$jitt.fac <- dots$jitt.fac abdots <- list(abdots,abdots) - - if(!is.null(abdots$lty)) - if(is.list(lty.cutoff)) abdots[[2]]$lty <- lty.cutoff[[2]] - if(!is.null(abdots$lwd)) - if(length(lwd.cutoff)>1) abdots[[2]]$lwd <- lwd.cutoff[2] - + abdots$jitt.fac <- pdots$jitt.fac + + if(!is.null(abdots$lty)) + if(is.list(lty.cutoff)) abdots[[2]]$lty <- lty.cutoff[[2]] + if(!is.null(abdots$lwd)) + if(length(lwd.cutoff)>1) abdots[[2]]$lwd <- lwd.cutoff[2] + ab.textL <- rep(text.abline,length.out=2) - abtdots.x <- abtdots.y <- vector("list",0) - cex.abline <- rep(cex.abline, length.out = 2) - col.abline <- rep(if(!is.null(col.abline)) col.abline else "red", length.out = 2) + abtdots.x <- abtdots.y <- vector("list",0) + cex.abline <- rep(cex.abline, length.out = 2) + col.abline <- rep(if(!is.null(col.abline)) + col.abline else "red", length.out = 2) font.abline <- rep(font.abline, length.out = 2) adj.abline <- matrix(rep(adj.abline,length.out=4),2,2) - .mpresubs <- function(inx) + .mpresubs <- function(inx) .presubs(inx, c("%qx", "%qy", "%cx", "%cy"), - c(gettextf(text.abline.x.fmt.qx, round(cutoff.quantile.x*100,1)), - gettextf(text.abline.y.fmt.qy, round(cutoff.quantile.y*100,1)), - gettextf(text.abline.x.fmt.cx, round(co.x,2)), - gettextf(text.abline.y.fmt.cy, round(co.y,2)))) + c(gettextf(text.abline.x.fmt.qx, + round(cutoff.quantile.x*100,1)), + gettextf(text.abline.y.fmt.qy, + round(cutoff.quantile.y*100,1)), + gettextf(text.abline.x.fmt.cx, + round(co.x,2)), + gettextf(text.abline.y.fmt.cy, + round(co.y,2)))) + + if(!missing(lwd.cutoff)) abdots$lwd <- lwd.cutoff + if(!missing(lty.cutoff)) abdots$lty <- lty.cutoff + abdots$jitt.fac <- dots$jitt.fac - abtdots.x$labels <- if(! is.null(text.abline.x)) .mpresubs(text.abline.x) else - gettextf(paste(text.abline.x.fmt.qx,"-cutoff = ", - text.abline.x.fmt.cx,sep=""), - cutoff.quantile.x*100,round(co.x,digits=2)) + abtdots.x$labels <- if(! is.null(text.abline.x)) + .mpresubs(text.abline.x) else gettextf( + paste(text.abline.x.fmt.qx,"-cutoff = ", + text.abline.x.fmt.cx,sep=""), + cutoff.quantile.x*100,round(co.x,digits=2)) abtdots.x$cex <- cex.abline[1] - abtdots.x$col <- col.abline[1] - abtdots.x$font <- font.abline[1] - abtdots.x$srt <- NULL - abtdots.x$adj <- adj.abline[,1] + abtdots.x$col <- col.abline[1] + abtdots.x$font <- font.abline[1] + abtdots.x$srt <- NULL + abtdots.x$adj <- adj.abline[,1] - abtdots.y$labels <- if(! is.null(text.abline.y)) .mpresubs(text.abline.y) else - gettextf(paste(text.abline.y.fmt.qy,"-cutoff = ", - text.abline.y.fmt.cy,sep=""), - cutoff.quantile.y*100,round(co.y,digits=2)) - abtdots.y$cex <- cex.abline[2] - abtdots.y$col <- col.abline[2] - abtdots.y$font <- font.abline[2] - abtdots.y$srt <- NULL - abtdots.y$adj <- adj.abline[,2] - - adots <- pdots - adots$col <- pdots$col.axis - adots$lty <- pdots$lty.axis - adots$adj <- par("adj") + abtdots.y$labels <- if(! is.null(text.abline.y)) + .mpresubs(text.abline.y) else gettextf( + paste(text.abline.y.fmt.qy,"-cutoff = ", + text.abline.y.fmt.cy,sep=""), + cutoff.quantile.y*100,round(co.y,digits=2)) + abtdots.y$cex <- cex.abline[2] + abtdots.y$col <- col.abline[2] + abtdots.y$font <- font.abline[2] + abtdots.y$srt <- NULL + abtdots.y$adj <- adj.abline[,2] - tdots <- pdots + tdots <- .makedotsT(dots) tdots$cex <- cex.idn tdots$col <- col.idn tdots$offset <- dots$offset tdots$pos <- dots$pos tdots$adj <- adj - pdots$axes <- FALSE pdots$log <- dots$log pdots$adj <- par("adj") + adots <- pdots + adots$col <- pdots$col.axis + adots$lty <- pdots$lty.axis + adots$adj <- par("adj") + + pdots$axes <- FALSE + pdots$adj <- par("adj") #### # print(quantile(ndata.x)) @@ -201,27 +230,32 @@ id0.xy <- id.n1[id.xy] id0.x <- id.n1[id.x] id0.y <- id.n1[id.y] + do.call(plot, args = c(list(x = ndata.x, y=ndata.y, type = "p"), pdots)) + do.call(box,args=c(adots)) - do.call(plot, args = c(list(x = ndata.x,ndata.y, type = "p"), pdots)) - do.call(box,args=c(adots)) - do.call(abline, args = c(list(v=co.x), abdots[[1]])) - do.call(abline, args = c(list(h=co.y), abdots[[2]])) - pusr <- par("usr") - mid.x = mean(pusr[c(1,2)]) - mid.y = mean(pusr[c(3,4)]) + mid.x <- mean(pusr[c(1,2)]) + mid.y <- mean(pusr[c(3,4)]) abtdots.y$x <- if(is.null(text.abline.y.x)) mid.x else text.abline.y.x abtdots.x$y <- if(is.null(text.abline.x.y)) mid.y else text.abline.x.y - + do.call(abline, args = c(list(v=co.x), abdots[[1]])) + do.call(abline, args = c(list(h=co.y), abdots[[2]])) + if(ab.textL[1]) do.call(text, args = c(list(y=co.y*1.03), abtdots.y)) +# do.call(text, args = c(list(co.x-5,mid.y,paste(cutoff.quantile.y*100,"%-cutoff = ",round(co.x,digits=2)),srt=90))) if(ab.textL[2]) do.call(text, args = c(list(x=co.x*1.03), abtdots.x,srt=90)) +# do.call(text, args = c(list(mid.x,co.y+5,paste(cutoff.quantile.x*100," %-cutoff = ",round(co.y,digits=2))))) if(length(id.xy)) - do.call(text, args = c(list(ndata.x[id.xy], ndata.y[id.xy], + do.call(text, args = c(list(jitter(ndata.x[id.xy],factor=jitt.fac), + jitter(ndata.y[id.xy],factor=jitt.fac), labels=lab.pts[id.xy]), tdots)) + #axis(side=4) +# axis(side=1) + return(list(id.x=id0.x, id.y= id0.y, id.xy = id0.xy, qtx = quantile(ndata.x), qty = quantile(ndata.y), cutoff.x.v = co.x, cutoff.y.v = co.y Modified: pkg/RobAStBase/R/infoPlot.R =================================================================== --- pkg/RobAStBase/R/infoPlot.R 2013-09-11 14:07:52 UTC (rev 691) +++ pkg/RobAStBase/R/infoPlot.R 2013-09-11 14:21:01 UTC (rev 692) @@ -6,12 +6,15 @@ main = FALSE, inner = TRUE, sub = FALSE, col.inner = par("col.main"), cex.inner = 0.8, bmar = par("mar")[1], tmar = par("mar")[3], - with.legend = TRUE, legend.bg = "white", + with.legend = TRUE, legend = NULL, legend.bg = "white", legend.location = "bottomright", legend.cex = 0.8, + scaleX = FALSE, scaleX.fct, scaleX.inv, + scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, + scaleN = 9, x.ticks = NULL, y.ticks = NULL, mfColRow = TRUE, to.draw.arg = NULL, cex.pts = 1, col.pts = par("col"), pch.pts = 1, jitter.fac = 1, with.lab = FALSE, - lab.pts = NULL, lab.font = NULL, + lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, which.lbs = NULL, which.Order = NULL, return.Order = FALSE, ylab.abs = "absolute information", ylab.rel= "relative information"){ @@ -20,16 +23,22 @@ dots <- match.call(call = sys.call(sys.parent(1)), expand.dots = FALSE)$"..." - L2Fam <- eval(object at CallL2Fam) - - if(!is.null(dots[["type"]])) dots["type"] <- NULL - if(!is.null(dots[["xlab"]])) dots["xlab"] <- NULL - if(!is.null(dots[["ylab"]])) dots["ylab"] <- NULL - + if(missing(scaleX.fct)){ + scaleX.fct <- p(L2Fam) + scaleX.inv <- q(L2Fam) + } + + withbox <- TRUE + if(!is.null(dots[["withbox"]])) withbox <- dots[["withbox"]] + dots["withbox"] <- NULL + dots["type"] <- NULL + xlab <- dots$xlab; if(is.null(xlab)) xlab <- "x" + dots$xlab <- dots$ylab <- NULL + trafO <- trafo(L2Fam at param) - dims <- nrow(trafO) + dimsA <- dims <- nrow(trafO) dimm <- ncol(trafO) to.draw <- 1:(dims+1) @@ -50,29 +59,41 @@ ncols <- ceiling(dims0/nrows) in1to.draw <- (1%in%to.draw) - if(missing(legend.location)){ - legend.location <- distr:::.fillList(list("topright"), dims0+in1to.draw ) - if (in1to.draw) legend.location[[1]] <- "bottomright" - }else{ - legend.location <- as.list(legend.location) - legend.location <- distr:::.fillList(legend.location, dims0+in1to.draw ) + if(!is.null(x.ticks)) dots$xaxt <- "n" + if(!is.null(y.ticks)){ + y.ticks <- .fillList(list(y.ticks), dims0+in1to.draw) + dots$yaxt <- "n" } - e1 <- L2Fam at distribution - if(!is(e1, "UnivariateDistribution") | is(e1, "CondDistribution")) + if(with.legend){ + if(missing(legend.location)){ + legend.location <- .fillList(list("topright"), dims0+in1to.draw ) + if (in1to.draw) legend.location[[1]] <- "bottomright" + }else{ + legend.location <- as.list(legend.location) + legend.location <- .fillList(legend.location, dims0+in1to.draw ) + } + if(is.null(legend)){ + legend <- vector("list",dims0+in1to.draw) + legend <- .fillList(list(as.list(c("class. opt. IC", objectc))), + dims0+in1to.draw) + } + } + distr <- L2Fam at distribution + if(!is(distr, "UnivariateDistribution") | is(distr, "CondDistribution")) stop("not yet implemented") - if(is(e1, "UnivariateDistribution")){ + if(is(distr, "UnivariateDistribution")){ xlim <- eval(dots$xlim) if(!is.null(xlim)){ xm <- min(xlim) xM <- max(xlim) dots$xlim <- NULL } - if(is(e1, "AbscontDistribution")){ - lower0 <- getLow(e1, eps = getdistrOption("TruncQuantile")*2) - upper0 <- getUp(e1, eps = getdistrOption("TruncQuantile")*2) - me <- median(e1); s <- IQR(e1) + if(is(distr, "AbscontDistribution")){ + lower0 <- getLow(distr, eps = getdistrOption("TruncQuantile")*2) + upper0 <- getUp(distr, eps = getdistrOption("TruncQuantile")*2) + me <- median(distr); s <- IQR(distr) lower1 <- me - 6 * s upper1 <- me + 6 * s lower <- max(lower0, lower1) @@ -86,9 +107,9 @@ plty <- "l" if(missing(lty)) lty <- "solid" }else{ - if(is(e1, "DiscreteDistribution")) x.vec <- support(e1) + if(is(distr, "DiscreteDistribution")) x.vec <- support(distr) else{ - x.vec <- r(e1)(1000) + x.vec <- r(distr)(1000) x.vec <- sort(unique(x.vec)) } plty <- "p" @@ -104,9 +125,14 @@ dots$ylim <- NULL } - dotsP <- dotsL <- dotsT <- dots - dotsL$lwd <- dotsL$col <- dotsL$lty <- NULL - dotsP$lwd <- dotsP$col <- dotsP$lty <- NULL + dotsP <- dots + dotsP$type <- dotsP$lty <- dotsP$col <- dotsP$lwd <- NULL + dotsP$xlab <- dotsP$ylab <- NULL + + dotsL <- .makedotsLowLevel(dotsP) + dotsT <- dotsL + dotsT["main"] <- dotsT["cex.main"] <- dotsT["col.main"] <- NULL + dotsT["line"] <- NULL dotsP$xlim <- xlim trafo <- trafo(L2Fam at param) @@ -117,7 +143,7 @@ lineT <- NA .mpresubs <- function(inx) - distr:::.presubs(inx, c("%C", "%D", "%A"), + .presubs(inx, c("%C", "%D", "%A"), c(as.character(class(object)[1]), as.character(date()), as.character(deparse(objectc)))) @@ -127,7 +153,7 @@ if (is.logical(main)){ if (!main) mainL <- FALSE else - main <- gettextf("Plot for IC %%A") ### + main <- gettextf("Information Plot for IC %%A") ### ### double %% as % is special for gettextf } main <- .mpresubs(main) @@ -179,7 +205,7 @@ #stop("Argument 'inner' must either be 'logical' or a 'list'") if(!is.list(inner)) inner <- as.list(inner) - innerT <- distr:::.fillList(inner,1+dims) + innerT <- .fillList(inner,1+dims) if(dims01 ) + QFc <- diag(dimsA) + if(is(object,"ContIC") & dimsA>1 ) {if (is(normtype(object),"QFNorm")) QFc <- QuadForm(normtype(object)) QFc0 <- solve( trafo %*% solve(L2Fam at FisherInfo) %*% t(trafo )) if (is(normtype(object),"SelfNorm")|is(normtype(object),"InfoNorm")) @@ -222,12 +248,12 @@ absInfoClass.f <- t(classIC) %*% QFc %*% classIC absInfoClass <- absInfoEval(x.vec, absInfoClass.f) - QF <- diag(dims) - if(is(object,"ContIC") & dims>1 ) + QF <- diag(dimsA) + if(is(object,"ContIC") & dimsA>1 ) {if (is(normtype(object),"QFNorm")) QF <- QuadForm(normtype(object))} QF.5 <- sqrt(PosSemDefSymmMatrix(QF)) - IC1 <- as(diag(dims) %*% object at Curve, "EuclRandVariable") + IC1 <- as(diag(dimsA) %*% object at Curve, "EuclRandVariable") absInfo.f <- t(IC1) %*% QF %*% IC1 absInfo <- absInfoEval(x.vec, absInfo.f) @@ -242,28 +268,50 @@ # devNew() omar <- par("mar") - parArgs <- list(mar = c(bmar,omar[2],tmar,omar[4])) - do.call(par,args=parArgs) + lpA <- max(length(to.draw),1) + parArgsL <- vector("list",lpA) + bmar <- rep(bmar, length.out=lpA) + tmar <- rep(tmar, length.out=lpA) + xaxt0 <- if(is.null(dots$xaxt)) { + if(is.null(dots$axes)||eval(dots$axes)) + rep(par("xaxt"),lpA) else rep("n",lpA) + }else rep(eval(dots$xaxt),lpA) + yaxt0 <- if(is.null(dots$yaxt)) { + if(is.null(dots$axes)||eval(dots$axes)) + rep(par("yaxt"),lpA) else rep("n",lpA) + }else rep(eval(dots$yaxt),lpA) + for( i in 1:lpA){ + parArgsL[[i]] <- list(mar = c(bmar[i],omar[2],tmar[i],omar[4]) + ,xaxt=xaxt0[i], yaxt= yaxt0[i] + ) + } + pL.rel <- pL.abs <- pL <- expression({}) - if(!is.null(dotsP$panel.last)) - {pL.rel <- pL.abs <- pL <- dotsP$panel.last} - dotsP$panel.last <- NULL + if(!is.null(dots$panel.last)) + {pL.rel <- pL.abs <- pL <- dots$panel.last} if(!is.null(data)){ n <- if(!is.null(dim(data))) nrow(data) else length(data) - oN0 <- oN0Class <- NULL - if(is.null(which.lbs)) - which.lbs <- 1:n - which.lbs0 <- (1:n) %in% which.lbs - which.lbx <- rep(which.lbs0, length.out=length(data)) - data0C <- data0 <- data[which.lbx] - n <- if(!is.null(dim(data0))) nrow(data0) else length(data0) - oNC <- oN <- (1:n)[which.lbs0] + if(!is.null(lab.pts)) + lab.pts <- matrix(rep(lab.pts, length.out=2*n),n,2) - cex.pts <- rep(cex.pts, length.out=2) + sel <- .SelectOrderData(data, function(x)absInfoEval(x,absInfo.f), + which.lbs, which.Order) + sel.C <- .SelectOrderData(data, function(x)absInfoEval(x,absInfoClass.f), + which.lbs, which.Order) + i.d <- sel$ind + i.dC <- sel.C$ind + i0.d <- sel$ind1 + i0.dC <- sel.C$ind1 + y.d <- sel$y + y.dC <- sel.C$y + x.d <- sel$data + x.dC <- sel.C$data + n <- length(i.d) + if(missing(col.pts)) col.pts <- c(col, colI) col.pts <- rep(col.pts, length.out=2) pch.pts <- matrix(rep(pch.pts, length.out=2*n),n,2) @@ -271,158 +319,192 @@ with.lab <- rep(with.lab, length.out=2) lab.font <- rep(lab.font, length.out=2) - absInfoClass.data <- absInfoEval(data,absInfoClass.f) - absInfo.data <- absInfoEval(data,absInfo.f) - absInfo0.data <- absInfo.data[which.lbs] - absInfo0Class.data <- absInfoClass.data[which.lbs] - aIC.data.m <- max(absInfo0Class.data) - aI.data.m <- max(absInfo0.data) + resc.dat <-.rescalefct(x.d, function(x) absInfoEval(x,absInfo.f), + scaleX, scaleX.fct, scaleX.inv, + scaleY, scaleY.fct, dots$xlim, dots$ylim, dots) + resc.datC <-.rescalefct(x.d, function(x) absInfoEval(x,absInfoClass.f), + scaleX, scaleX.fct, scaleX.inv, + scaleY, scaleY.fct, dots$xlim, dots$ylim, dots) - if (n==length(data0)) { - oN <- order(absInfo0.data) - oNC <- order(absInfo0Class.data) + x.dr <- resc.dat$X + x.dCr <- resc.datC$X + y.dr <- resc.dat$Y + y.dCr <- resc.datC$Y - oN0 <- order(absInfo.data) - oN0 <- oN0[oN0 %in% which.lbs] - oN0Class <- order(absInfoClass.data) - oN0Class <- oN0Class[oN0Class %in% which.lbs] + lab.pts <- if(is.null(lab.pts)) + cbind(i.d, i.dC) + else cbind(lab.pts[i.d],lab.pts[i.dC]) - data0 <- data0[oN0] - data0C <- data0[oN0Class] - if(!is.null(which.Order)){ - oN <- oN0[(n+1)-which.Order] - oNC <- oN0Class[(n+1)-which.Order] - data0 <- data[oN] - data0C <- data[oNC] - absInfo0.data <- absInfo.data[oN] - absInfo0Class.data <- absInfoClass.data[oNC] - } - n <- length(oN) - } - lab.pts <- if(is.null(lab.pts)) - matrix(paste(c(oN,oNC)),n,2) - else matrix(rep(lab.pts, length.out=2*n),n,2) + dots.points <- .makedotsPt(dots) + do.pts <- function(x,y,cxa,ca,pa) + do.call(points,args=c(list(x,y,cex=cxa,col=ca,pch=pa), + dots.points)) + tx <- function(xa,ya,lb,cx,ca) + text(x=xa,y=ya,labels=lb,cex=cx, col=ca) - dots.points <- dots - dots.points$col <- dots.points$cex <- dots.points$pch <- NULL + alp.v <- rep(alpha.trsp, length.out = dims0+in1to.draw) + pL.abs <- substitute({ - if(is(e1, "DiscreteDistribution")){ + if(is(distr, "DiscreteDistribution")){ ICy0 <- jitter(ICy0, factor = jitter.fac0[1]) ICy0c <- jitter(ICy0c, factor = jitter.fac0[2]) } - do.call(points, args=c(list(y0, ICy0, cex = log(ICy0+1)*3*cex0[1], - col = col0[1], pch = pch0[,1]), dwo0)) - do.call(points, args=c(list(y0c, ICy0c, cex = log(ICy0c+1)*3*cex0[2], - col = col0[2], pch = pch0[,2]), dwo0)) + f1 <- log(ICy0+1)*3*cex0[1] + f1c <- log(ICy0c+1)*3*cex0[2] + + col.pts <- if(!is.na(al0)) sapply(col0, + addAlphTrsp2col, alpha=al0) else col0 + + do.pts(y0, ICy0r, f1,col.pts[1],pch0[,1]) + do.pts(y0c, ICy0cr, f1c,col.pts[2],pch0[,2]) if(with.lab0){ - text(x = y0, y = ICy0, labels = lab.pts0[,1], - cex = log(ICy0+1)*1.5*cex0[1], col = col0[1]) - text(x = y0c, y = ICy0c, labels = lab.pts0[,2], - cex = log(ICy0+1)*1.5*cex0[2], col = col0[2]) + tx(y0, ICy0r, lab.pts0, f1/2, col0[1]) + tx(y0c, ICy0cr, lab.pts0C, f1c/2, col0[2]) } pL0 - }, list(ICy0 = absInfo0.data, ICy0c = absInfo0Class.data, - pL0 = pL, y0 = data0, y0c = data0C, - dwo0 = dots.points, cex0 = cex.pts, pch0 = pch.pts, - col0 = col.pts, with.lab0 = with.lab, - lab.pts0 = lab.pts, n0 = n, - jitter.fac0 = jitter.fac, aIC.data.m0=aIC.data.m, - aI.data.m0=aI.data.m - )) + }, list(ICy0c = y.dC, ICy0 = y.d, + ICy0r = y.dr, ICy0cr = y.dCr, + pL0 = pL, y0 = x.dr, y0c = x.dCr, + cex0 = cex.pts, pch0 = pch.pts, al0 = alp.v[1], + col0 = col.pts, with.lab0 = with.lab, n0 = n, + lab.pts0 = lab.pts[i.d], lab.pts0C = lab.pts[i.dC], + jitter.fac0 = jitter.fac) + ) pL.rel <- substitute({ - y0.vec <- sapply(y0, IC1.i.5 at Map[[indi]])^2/ICy0 - y0c.vec <- sapply(y0c, classIC.i.5 at Map[[indi]])^2/ICy0c - if(is(e1, "DiscreteDistribution")){ + y0.vec <- sapply(y0, IC1.i.5 at Map[[indi]])^2/ICy0 + y0c.vec <- sapply(y0c, classIC.i.5 at Map[[indi]])^2/ICy0c + if(is(distr, "DiscreteDistribution")){ y0.vec <- jitter(y0.vec, factor = jitter.fac0[1]) y0c.vec <- jitter(y0c.vec, factor = jitter.fac0[2]) } - do.call(points, args=c(list(y0, y0.vec, cex = log(ICy0+1)*3*cex0[1], - col = col0[1], pch = pch0[,1]), dwo0)) - do.call(points, args=c(list(y0, y0c.vec, cex = log(ICy0c+1)*3*cex0[2], - col = col0[2], pch = pch0[,2]), dwo0)) + + col.pts <- if(!is.na(al0)) sapply(col0, + addAlphTrsp2col, alpha=al0[i1]) else col0 + dotsP0 <- dotsP + resc.rel <- .rescalefct(y0, cbind(y0.vec,ICy0), + scaleX, scaleX.fct, scaleX.inv, + FALSE, scaleY.fct, dots$xlim, dots$ylim, dotsP0) + resc.rel.c <- .rescalefct(y0c, cbind(y0c.vec,ICy0c), + scaleX, scaleX.fct, scaleX.inv, + FALSE, scaleY.fct, dots$xlim, dots$ylim, dotsP0) + + f1 <- resc.rel$scy*0.3*cex0[1] + f1c <- resc.rel.c$scy*0.3*cex0[2] + + do.pts(resc.rel$X, resc.rel$Y, f1,col.pts[1],pch0[,1]) + do.pts(resc.rel.c$X, resc.rel.c$Y, f1c,col.pts[2],pch0[,2]) if(with.lab0){ - text(x = y0, y = y0.vec, labels = lab.pts0[,1], - cex = log(ICy0+1)*1.5*cex0[1], col = col0[1]) - text(x = y0, y = y0c.vec, labels = lab.pts0[,2], - cex = log(ICy0c+1)*1.5*cex0[2], col = col0[2]) [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 692 From noreply at r-forge.r-project.org Wed Sep 11 16:31:28 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 16:31:28 +0200 (CEST) Subject: [Robast-commits] r693 - in pkg/RobAStBase: R man Message-ID: <20130911143128.378BC1844BF@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 16:31:27 +0200 (Wed, 11 Sep 2013) New Revision: 693 Added: pkg/RobAStBase/R/getRiskBV.R pkg/RobAStBase/R/interpolRisks.R pkg/RobAStBase/R/makedots.R pkg/RobAStBase/R/move2bckRefParam.R pkg/RobAStBase/R/plotRescaledAxis.R pkg/RobAStBase/R/plotWrapper.R pkg/RobAStBase/R/rescaleFct.R pkg/RobAStBase/R/selectorder.R Modified: pkg/RobAStBase/R/ddPlot.R pkg/RobAStBase/R/outlyingPlot.R pkg/RobAStBase/man/0RobAStBase-package.Rd Log: next try: RobAStBase in trunc Modified: pkg/RobAStBase/R/ddPlot.R =================================================================== --- pkg/RobAStBase/R/ddPlot.R 2013-09-11 14:21:01 UTC (rev 692) +++ pkg/RobAStBase/R/ddPlot.R 2013-09-11 14:31:27 UTC (rev 693) @@ -8,14 +8,15 @@ text.abline.x = NULL, text.abline.y = NULL, cex.abline = par("cex"), col.abline = col.cutoff, font.abline = par("font"), adj.abline = c(0,0), - text.abline.x.x = NULL, text.abline.x.y = NULL, + text.abline.x.x = NULL, text.abline.x.y = NULL, text.abline.y.x = NULL, text.abline.y.y = NULL, text.abline.x.fmt.cx = "%7.2f", text.abline.x.fmt.qx = "%4.2f%%", - text.abline.y.fmt.cy = "%7.2f", text.abline.y.fmt.qy = "%4.2f%%"){ + text.abline.y.fmt.cy = "%7.2f", text.abline.y.fmt.qy = "%4.2f%%", + jitt.fac){ mc <- as.list(match.call(expand.dots = TRUE, call = sys.call(sys.parent(1)))[-1]) mc$data <- data - do.call(.ddPlot.MatNtNtCoCo, args = mc) + do.call(RobAStBase:::.ddPlot.MatNtNtCoCo, args = mc) }) setMethod("ddPlot", signature = signature(data = "data.frame"), @@ -28,10 +29,11 @@ text.abline.x = NULL, text.abline.y = NULL, cex.abline = par("cex"), col.abline = col.cutoff, font.abline = par("font"), adj.abline = c(0,0), - text.abline.x.x = NULL, text.abline.x.y = NULL, + text.abline.x.x = NULL, text.abline.x.y = NULL, text.abline.y.x = NULL, text.abline.y.y = NULL, text.abline.x.fmt.cx = "%7.2f", text.abline.x.fmt.qx = "%4.2f%%", - text.abline.y.fmt.cy = "%7.2f", text.abline.y.fmt.qy = "%4.2f%%"){ + text.abline.y.fmt.cy = "%7.2f", text.abline.y.fmt.qy = "%4.2f%%", + jitt.fac){ mc <- match.call(call = sys.call(sys.parent(1))) mc$data <- t(as.matrix(data)) @@ -44,14 +46,16 @@ cutoff.quantile.x = 0.95, cutoff.quantile.y = cutoff.quantile.x, transform.x, transform.y = transform.x, id.n, lab.pts, adj, cex.idn, - col.idn, lty.cutoff, lwd.cutoff, col.cutoff, text.abline = TRUE, + col.idn, lty.cutoff, lwd.cutoff, col.cutoff, + text.abline = TRUE, text.abline.x = NULL, text.abline.y = NULL, cex.abline = par("cex"), col.abline = col.cutoff, font.abline = par("font"), adj.abline = c(0,0), - text.abline.x.x = NULL, text.abline.x.y = NULL, + text.abline.x.x = NULL, text.abline.x.y = NULL, text.abline.y.x = NULL, text.abline.y.y = NULL, text.abline.x.fmt.cx = "%7.2f", text.abline.x.fmt.qx = "%4.2f%%", - text.abline.y.fmt.cy = "%7.2f", text.abline.y.fmt.qy = "%4.2f%%"){ + text.abline.y.fmt.cy = "%7.2f", text.abline.y.fmt.qy = "%4.2f%%", + jitt.fac){ mc <- match.call(call = sys.call(sys.parent(1))) mc$data <- matrix(data,nrow=1) Added: pkg/RobAStBase/R/getRiskBV.R =================================================================== --- pkg/RobAStBase/R/getRiskBV.R (rev 0) +++ pkg/RobAStBase/R/getRiskBV.R 2013-09-11 14:31:27 UTC (rev 693) @@ -0,0 +1,24 @@ +setMethod("getRiskFctBV", signature(risk = "asGRisk", biastype = "ANY"), + function(risk) function(bias, var)stop("not yet implemented")) + +setMethod("getRiskFctBV", signature(risk = "asMSE", biastype = "ANY"), + function(risk) function(bias, var) bias^2+var) + +setMethod("getRiskFctBV", signature(risk = "asSemivar", biastype = "onesidedBias"), + function(risk, biastype=biastype(risk)) + function(bias,var){ + v <- var^.5 + b <- if(sign(biastype)>0) bias else -bias + w <- b/v + return((v^2+b^2)*pnorm(w)-b*v*dnorm(w))}) + +setMethod("getRiskFctBV", signature(risk = "asSemivar", biastype = "asymmetricBias"), + function(risk, biastype=biastype(risk)){ + nu1 <- nu(biastype)[1] + nu2 <- nu(biastype)[2] + function(bias,var){ + v <- var^.5 + b <- if(sign(biastype)>0) bias else -bias + w <- b/v + return((v^2+b^2)*(nu1*pnorm(w)+nu2*pnorm(-w))+(nu2-nu1)*b*v*dnorm(w))}}) + Added: pkg/RobAStBase/R/interpolRisks.R =================================================================== --- pkg/RobAStBase/R/interpolRisks.R (rev 0) +++ pkg/RobAStBase/R/interpolRisks.R 2013-09-11 14:31:27 UTC (rev 693) @@ -0,0 +1,7 @@ +#### Generating functions for subclasses of interpolRisk +OMSRRisk <- function(samplesize = 100) new("OMSRRisk",type=".OMSE", samplesize = samplesize) +MBRRisk <- function(samplesize = 100) new("MBRRisk",type=".MBRE", samplesize = samplesize) +RMXRRisk <- function(samplesize = 100) new("RMXRRisk",type=".RMXE", samplesize = samplesize) +setMethod("samplesize","interpolRisk", function(object)object at samplesize) +setReplaceMethod("samplesize","interpolRisk", function(object, value){ + object at samplesize <- value; object}) \ No newline at end of file Added: pkg/RobAStBase/R/makedots.R =================================================================== --- pkg/RobAStBase/R/makedots.R (rev 0) +++ pkg/RobAStBase/R/makedots.R 2013-09-11 14:31:27 UTC (rev 693) @@ -0,0 +1,42 @@ +## dots modifications +.makedotsLowLevel <- function(dots){ + dots$sub <- dots$xlab <- dots$ylab <- dots$main <- dots$type <- NULL + dots$xlim <- dots$ylim <- dots$yaxt <- dots$axes <- dots$xaxt <- NULL + dots$panel.last <- dots$panel.first <- dots$frame.plot <- dots$ann <-NULL + dots$log <- dots$asp <- NULL + return(dots) +} +.deleteDotsABLINE <- function(dots){ + dots$reg <- dots$a <- dots$b <- NULL + dots$untf <- dots$h <- dots$v <- NULL + dots +} +.deleteDotsTEXT <- function(dots){ + dots$labels <- dots$offset <- dots$vfont <- dots$pos <- dots$font <- NULL + dots +} +.makedotsL <- function(dots){ + dots <- .makedotsLowLevel(dots) + dots$pch <- dots$cex <- NULL + .deleteDotsABLINE(.deleteDotsTEXT(dots)) +} +.makedotsP <- function(dots){ + dots <- .makedotsLowLevel(dots) + dots$lwd <- NULL + .deleteDotsABLINE(.deleteDotsTEXT(dots)) +} +.makedotsPt <- function(dots){ + dots <- dots[names(dots) %in% c("bg", "lwd", "lty")] + if (length(dots) == 0 ) dots <- NULL + return(dots) +} +.makedotsAB <- function(dots){ + dots <- .makedotsLowLevel(dots) + dots <- .deleteDotsTEXT(dots) + dots$pch <- dots$cex <- NULL +} +.makedotsT <- function(dots){ + dots <- .makedotsLowLevel(dots) + dots <- .deleteDotsABLINE(dots) + dots +} Added: pkg/RobAStBase/R/move2bckRefParam.R =================================================================== --- pkg/RobAStBase/R/move2bckRefParam.R (rev 0) +++ pkg/RobAStBase/R/move2bckRefParam.R 2013-09-11 14:31:27 UTC (rev 693) @@ -0,0 +1,114 @@ +setMethod("moveL2Fam2RefParam", signature(L2Fam = "L2ParamFamily"), + function(L2Fam, ...) L2Fam) + +setMethod("moveL2Fam2RefParam", signature(L2Fam = "L2LocationFamily"), + function(L2Fam, ...){ param <- param(L2Fam) + par0 <- 0; names(par0) <- L2Fam at locscalename + main(param) <- par0 + modifyModel(L2Fam, param)}) + +setMethod("moveL2Fam2RefParam", signature(L2Fam = "L2ScaleFamily"), + function(L2Fam, ...){ param <- param(L2Fam) + locscalename <- L2Fam at locscalename + param0 <- 1 + names(param0) <- locscalename["scale"] + param1 <- 0 + names(param1) <- locscalename["loc"] + main(param) <- param0 + fixed(param) <- param1 + modifyModel(L2Fam, param)}) + +setMethod("moveL2Fam2RefParam", signature(L2Fam = "L2LocationScaleFamily"), + function(L2Fam, ...){ + param <- param(L2Fam) + lcsname <- L2Fam at locscalename + lc <- lcsname["loc"]; sc <- lcsname["scale"] + nms.main <- names(main(param)) + w <- which(length(lc%in% nms.main)) + if(length(w)){ + mp <- main(param); mp[lc] <- 0; main(param) <- mp } + w <- which(length(sc%in% nms.main)) + if(length(w)){ + mp <- main(param); mp[sc] <- 0; main(param) <- mp } + nms.nuis <- names(nuisance(param)) + w <- which(length(lc%in% nms.nuis)) + if(length(w)){ + mp <- nuisance(param); mp[lc] <- 0; nuisance(param) <- mp } + w <- which(length(sc%in% nms.nuis)) + if(length(w)){ + mp <- nuisance(param); mp[sc] <- 0; nuisance(param) <- mp } + nms.fixed <- names(fixed(param)) + w <- which(length(lc%in% nms.fixed)) + if(length(w)){ + mp <- fixed(param); mp[lc] <- 0; fixed(param) <- mp } + w <- which(length(sc%in% nms.fixed)) + if(length(w)){ + mp <- fixed(param); mp[sc] <- 0; fixed(param) <- mp } + modifyModel(L2Fam, param)}) + + +################################################################################ + +### remains to be done: Risk trafo !!! + +setMethod("moveICBackFromRefParam", signature(IC = "IC", L2Fam = "L2ParamFamily"), + function(IC, L2Fam,...) IC) + + +setMethod("moveICBackFromRefParam", signature(IC = "IC", + L2Fam = "L2LocationFamily"), function(IC, L2Fam, ...){ + L2call <- L2Fam at fam.call + param <- param(L2Fam) + mu <- main(param) + IC.cf <- IC at Curve[[1]]@Map[[1]] + IC at Curve[[1]]@Map[[1]] <- function(x) IC.cf(x-mu) + CallL2Fam(IC) <- L2call + return(IC)}) + +setMethod("moveICBackFromRefParam", signature(IC = "IC", + L2Fam = "L2ScaleFamily"), function(IC, L2Fam, ...){ + L2call <- L2Fam at fam.call + param <- param(L2Fam) + mu <- fixed(param) + sig <- main(param) + IC.cf <- IC at Curve[[1]]@Map[[1]] + IC at Curve[[1]]@Map[[1]] <- function(x) sig*IC.cf((x-mu)/sig) + CallL2Fam(IC) <- L2call + return(IC)}) + +setMethod("moveICBackFromRefParam", signature(IC = "IC", + L2Fam = "L2LocationScaleFamily"), function(IC, L2Fam, ...){ + L2call <- L2Fam at fam.call + param <- param(L2Fam) + lcsname <- L2Fam at locscalename + lc <- lcsname["loc"]; sc <- lcsname["scale"] + nms.main <- names(main(param)) + w <- which(length(lc%in% nms.main)) + if(length(w)) mu<- main(param)[lc] + w <- which(length(sc%in% nms.main)) + if(length(w)) sig <- main(param)[sc] + nms.nuis <- names(nuisance(param)) + w <- which(length(lc%in% nms.nuis)) + if(length(w)) mu<- nuisance(param)[lc] + w <- which(length(sc%in% nms.nuis)) + if(length(w)) sig<- nuisance(param)[sc] + nms.fixed <- names(fixed(param)) + w <- which(length(lc%in% nms.fixed)) + if(length(w)) mu<- fixed(param)[lc] + w <- which(length(sc%in% nms.fixed)) + if(length(w)) sig<- fixed(param)[sc] + IC.cf1 <- IC at Curve[[1]]@Map[[1]] + IC at Curve[[1]]@Map[[1]] <- function(x) sig*IC.cf1((x-mu)/sig) + if(length(IC at Curve[[1]]@Map)==2){ + IC.cf2 <- IC at Curve[[1]]@Map[[2]] + IC at Curve[[1]]@Map[[2]] <- function(x) sig*IC.cf2((x-mu)/sig) + } + CallL2Fam(IC) <- L2call + return(IC)}) + +setMethod("moveICBackFromRefParam", signature(IC = "HampIC", + L2Fam = "L2ParamFamily"), function(IC, L2Fam, ...){ + IC <- moveICBackFromRefParam(as(IC,"IC"), L2Fam,...) + IC at modifyIC(L2Fam, IC) + return(IC)}) + Modified: pkg/RobAStBase/R/outlyingPlot.R =================================================================== --- pkg/RobAStBase/R/outlyingPlot.R 2013-09-11 14:21:01 UTC (rev 692) +++ pkg/RobAStBase/R/outlyingPlot.R 2013-09-11 14:31:27 UTC (rev 693) @@ -1,11 +1,28 @@ -outlyingPlotIC <- function(data, IC.x, IC.y = IC.x, dist.x = NormType(), - dist.y, cutoff.y = cutoff.chisq(), cutoff.x = cutoff.sememp(), ..., - cutoff.quantile.x = 0.95, - cutoff.quantile.y = cutoff.quantile.x, - id.n, lab.pts, adj, cex.idn, - col.idn, lty.cutoff, lwd.cutoff, col.cutoff, - main = gettext("Outlyingness by means of a distance-distance plot") - ){ +outlyingPlotIC <- function(data, + IC.x, + IC.y = IC.x, + dist.x = NormType(), + dist.y, + cutoff.y = cutoff.chisq(), + cutoff.x = cutoff.sememp(), + ..., + cutoff.quantile.x = 0.95, + cutoff.quantile.y = cutoff.quantile.x, + id.n, + lab.pts, + adj, + cex.idn, + col.idn, + lty.cutoff, + lwd.cutoff, + col.cutoff, + robCov.x = TRUE, + robCov.y = TRUE, + tf.x = data, + tf.y = data, + jitt.fac=10, + main = gettext("Outlyingness \n by means of a distance-distance plot") + ){ mc <- as.list(match.call(expand.dots = FALSE))[-1] dots <- mc$"..." if(is.null(dots$xlim)) dots$xlim <- TRUE @@ -16,33 +33,94 @@ if(is.null(mc$cutoff.y)) mc$cutoff.y <- cutoff.chisq() if(missing(IC.x)) stop("Argument 'IC.x' must be given as argument to 'outlyingPlot'") if(missing(data)) stop("Argument 'data' must be given as argument to 'outlyingPlot'") - + if(missing(dist.y)){ - if("asCov" %in% names(Risks(IC.y))) - if(is.matrix(Risks(IC.y)$asCov) || length(Risks(IC.y)$asCov) == 1) - asVar <- Risks(IC.y)$asCov - else - asVar <- Risks(IC.y)$asCov$value - else - asVar <- getRiskIC(IC.y, risk = asCov())$asCov$value - + if(robCov.y){ + evIC = evalIC(IC.y,as.matrix(data)) + asVar = solve(getCov(CovMcd(data.frame(evIC[1,],evIC[2,]),alpha=0.5))) + cat("\n", sep="", gettext("Robust asVar"), ":\n") + print(asVar) + }else{ + if("asCov" %in% names(Risks(IC.y))) + if(is.matrix(Risks(IC.y)$asCov) || length(Risks(IC.y)$asCov) == 1) + {asVar <- Risks(IC.y)$asCov + cat("\n", sep="", gettext("asVar"));# print("HHHH"); + print(asVar) + } + else{asVar <- Risks(IC.y)$asCov$value + cat("\n", sep="", gettext("asVar"));#print("HHHH"); + print(asVar) + } + else{asVar <- getRiskIC(IC.y, risk = asCov())$asCov$value + cat("\n", sep="", gettext("Classic asVar")); + # print("HHHH"); + print(asVar) + }} + asVar <- PosSemDefSymmMatrix(solve(asVar)) mc$dist.y <- QFNorm(name = gettext("Mahalonobis-Norm"), QuadForm = asVar) } - if(missing(dist.x)) - mc$dist.x <- NormType() + if(missing(dist.x)){ + #mc$dist.x <- NormType() + if(robCov.x){ + evIC = evalIC(IC.x,as.matrix(data)) + asVar = getCov(CovMcd(data.frame(evIC[1,],evIC[2,]),alpha=0.5)) + #cat("\nRobust asVar:") ;print("KKKKK") + #print(asVar) + } + else{ + if("asCov" %in% names(Risks(IC.y))) + if(is.matrix(Risks(IC.x)$asCov) || length(Risks(IC.y)$asCov) == 1) + {asVar <- Risks(IC.x)$asCov + cat("\n", sep="", gettext("asVar")); + #print("KKKKK2"); + print(asVar) + } + else + {asVar <- Risks(IC.x)$asCov$value + cat("\n", sep="", gettext("asVar")); + # print("KKKKK3"); + print(asVar) + } + else + {asVar <- getRiskIC(IC.x, risk = asCov())$asCov$value + cat("\n", sep="", gettext("Classic asVar")); + #print("KKKKK4"); + print(asVar) + } + } + + asVar <- PosSemDefSymmMatrix(solve(asVar)) + mc$dist.x <- QFNorm(name = gettext("Mahalonobis-Norm"), QuadForm = asVar) + } + + if(missing(tf.x)){ tf.x <- function(x) apply(x,2,function(xx) evalIC(IC.x,xx)) + }else{tf.x <- mc$tf.x} + if(missing(tf.y)){ tf.y <- function(x) apply(x,2,function(xx) evalIC(IC.y,xx)) + }else{tf.y <- mc$tf.y} + do.call(ddPlot,args=c(list(data=data),dots, + list(dist.x = mc$dist.x, + dist.y = mc$dist.y, + cutoff.x = mc$cutoff.x, + cutoff.y = mc$cutoff.y, + cutoff.quantile.x = mc$cutoff.quantile.x, + cutoff.quantile.y = mc$cutoff.quantile.y, + transform.x = tf.x, + transform.y = tf.y, + id.n = mc$id.n, + lab.pts = mc$lab.pts, + adj = mc$adj, + cex.idn = mc$cex.idn, + col.idn = mc$col.idn, + lty.cutoff = mc$lty.cutoff, + lwd.cutoff = mc$lwd.cutoff, + col.cutoff = mc$col.cutoff, + jitt.fac = mc$jitt.fac, + main = main))) - do.call(ddPlot,args=c(list(data=data), dots, list(dist.x = mc$dist.x, - dist.y = mc$dist.y, cutoff.x = mc$cutoff.x, cutoff.y = mc$cutoff.y, - cutoff.quantile.x = mc$cutoff.quantile.x, cutoff.quantile.y = mc$cutoff.quantile.y, - transform.x = tf.x, transform.y = tf.y, - id.n = mc$id.n, lab.pts = mc$lab.pts, adj = mc$adj, cex.idn = mc$cex.idn, - col.idn = mc$col.idn, lty.cutoff = mc$lty.cutoff, - lwd.cutoff = mc$lwd.cutoff, col.cutoff = mc$col.cutoff, main = main))) - } Added: pkg/RobAStBase/R/plotRescaledAxis.R =================================================================== --- pkg/RobAStBase/R/plotRescaledAxis.R (rev 0) +++ pkg/RobAStBase/R/plotRescaledAxis.R 2013-09-11 14:31:27 UTC (rev 693) @@ -0,0 +1,216 @@ +## helper functions for rescaling x and y axis in various diagnostic plots + +.rescalefct <- function(x, fct, + scaleX = FALSE, scaleX.fct, scaleX.inv, + scaleY = FALSE, scaleY.fct = pnorm, + xlim, ylim, dots){ + +# if scaleX rescales x, if scaleY rescales fct(x); +# to this end uses trafos scaleX.fct with inverse scale.inv +# resp. scaleY.fct; it respects xlim and ylim (given in orig. scale) +# thins out the scaled values if necessary and accordingly modifies +# slots xaxt, yaxt, axes of dots to indicate the new axes have to be drawn +# paradigm small letters = orig. scale, capital letters = transformed scale +# return value: list with (thinned out) x and y, X and Y and modified dots + + X <- x + wI <- 1:length(x) + if(scaleX){ + if(!is.null(xlim)){ + dots$xlim <- scaleX.fct(xlim) + x <- x[x>=xlim[1] & x<=xlim[2]] + } + Xo <- X <- scaleX.fct(x) + X <- .DistrCollapse(X, 0*X)$supp + wI <- sapply(X, function(uu){ w<- which(uu==Xo); if(length(w)>0) w[1] else NA}) + wI <- wI[!is.na(wI)] + x <- scaleX.inv(X) + dots$axes <- NULL + dots$xaxt <- "n" + } + Y <- y <- if(is.function(fct)) fct(x) else fct[wI,1] + scy <- if(is.function(fct)) NA else fct[wI,2] + if(scaleY){ + Y <- scaleY.fct(y) + if(!is.null(ylim)) dots$ylim <- scaleY.fct(ylim) + dots$axes <- NULL + dots$yaxt <- "n" + } + return(list(x=x,y=y,X=X,Y=Y,scy=scy,dots=dots)) +} + +if(FALSE){ + set.seed(1); x<- sort(rnorm(10)) + res <- .rescalefct(x, fct=function(s) sin(s), xlim=c(-2,1),ylim=c(0,1),dots=list(NULL)) + res2 <- .rescalefct(x, fct=function(s) sin(s), scaleY=T, xlim=c(-2,1),ylim=c(0,1),dots=list(NULL)) + res3 <- .rescalefct(x, fct=function(s) sin(s), + scaleX=T, scaleX.fct=function(x)exp(x)/(exp(x)+1), + scaleX.inv = function(x)log(x/(1-x)), scaleY=T, + xlim=c(-2,1),ylim=c(0,1),dots=list(NULL)) + distroptions("DistrResolution"=0.05) + res4 <- .rescalefct(x, fct=function(s) sin(s), + scaleX=T, scaleX.fct=function(x)exp(x)/(exp(x)+1), + scaleX.inv = function(x)log(x/(1-x)), scaleY=T, + xlim=c(-2,1),ylim=c(0,1),dots=list(NULL)) +} + +.plotRescaledAxis <- function(scaleX,scaleX.fct, scaleX.inv, + scaleY,scaleY.fct, scaleY.inv, + xlim, ylim, X, ypts = 400, n = 11, + x.ticks = NULL, y.ticks = NULL, withbox = TRUE){ +# plots rescaled axes acc. to logicals scaleX, scaleY +# to this end uses trafos scaleX.fct with inverse scale.inv +# resp. scaleY.fct; it respects xlim and ylim (given in orig. scale) +# return value: none + if(scaleX){ + if(is.null(x.ticks)){ + x <- pretty(scaleX.inv(X)) + if(!is.null(xlim)) x <- pmax(x, xlim[1]) + if(!is.null(xlim)) x <- pmin(x, xlim[2]) + X <- .DistrCollapse(scaleX.fct(x),0*x)$supp + x <- scaleX.inv(X) + x <- x[is.finite(x)] + x <- pretty(x,n=n) + X <- .DistrCollapse(scaleX.fct(x),0*x)$supp + x <- scaleX.inv(X) + x <- x[is.finite(x)] + x <- pretty(x,n=length(x)) + x[.isEqual01(x)&x<0.4] <- 0 + X <- scaleX.fct(x) + xf <- prettyNum(x) + i01 <- !.isEqual01(X) + xf <- xf[i01] + Xi <- X + X <- X[i01] + i0 <- any(!i01&Xi<0.5) + i1 <- any(!i01&Xi>0.5) + if(i0){ xf <- c(NA,xf); X <- c(0, X)} + if(i1){ xf <- c(xf,NA); X <- c(X, 1)} + axis(1,at=X,labels=xf) + if(i0) axis(1,at=0,labels=expression(-infinity)) + if(i1) axis(1,at=1,labels=expression(infinity)) + }else{ + if(is.null(xlim)){ xlim <- c(-Inf,Inf)}else{ + if(is.na(xlim[1])) xlim[1] <- -Inf + if(is.na(xlim[2])) xlim[2] <- Inf } + x.ticks <- sort(unique(x.ticks[!is.na(x.ticks)])) + xf <- pmin(pmax(x.ticks[is.finite(x.ticks)],xlim[1]),xlim[2]) + Xf <- scaleX.fct(xf) + axis(1,at=Xf,labels=xf) + if(-Inf %in% x.ticks) axis(1,at=0,labels=expression(-infinity)) + if(Inf %in% x.ticks) axis(1,at=1,labels=expression(infinity)) + } + box() + }else{ + if(!is.null(x.ticks)){ + if(is.null(xlim)){ xlim <- c(-Inf,Inf)}else{ + if(is.na(xlim[1])) xlim[1] <- -Inf + if(is.na(xlim[2])) xlim[2] <- Inf } + x.ticks <- sort(unique(x.ticks[!is.na(x.ticks)])) + xf <- pmin(pmax(x.ticks[is.finite(x.ticks)],xlim[1]),xlim[2]) + axis(1,at=xf,labels=xf) + if(-Inf %in% x.ticks) axis(1,at=0,labels=expression(-infinity)) + if(Inf %in% x.ticks) axis(1,at=1,labels=expression(infinity)) + box() + } + } + if(scaleY){ + if(is.null(y.ticks)){ + Y0 <- if(!is.null(ylim)) max(0, scaleY.fct(ylim[1])) else 0 + Y1 <- if(!is.null(ylim)) min(1, scaleY.fct(ylim[2])) else 1 + Y <- seq(Y0,Y1, length=ypts) + y <- pretty(scaleY.inv(Y),n=n) + Y <- .DistrCollapse(scaleY.fct(y),0*y)$supp + y <- scaleY.inv(Y) + y <- y[is.finite(y)] + y <- pretty(y,n=length(y)) + y[.isEqual01(y)&y<0.4] <- 0 + Y <- scaleX.fct(y) + yf <- prettyNum(y) + Y <- scaleY.fct(y) + i01 <- !.isEqual01(Y) + yf <- yf[i01] + Yi <- Y + Y <- Y[i01] + i0 <- any(!i01&Yi<0.5) + i1 <- any(!i01&Yi>0.5) + if(i0){ yf <- c(NA,yf); Y <- c(0, Y)} + if(i1){ yf <- c(yf,NA); Y <- c(Y, 1)} + axis(2,at=Y,labels=yf) + if(i0) axis(2,at=0,labels=expression(-infinity)) + if(i1) axis(2,at=1,labels=expression(infinity)) + }else{ + if(is.null(ylim)){ ylim <- c(-Inf,Inf)}else{ + if(is.na(ylim[1])) ylim[1] <- -Inf + if(is.na(ylim[2])) ylim[2] <- Inf } + y.ticks <- sort(unique(y.ticks[!is.na(y.ticks)])) + yf <- pmin(pmax(y.ticks[is.finite(y.ticks)],ylim[1]),ylim[2]) + Yf <- scaleY.fct(yf) + axis(2,at=Yf,labels=yf) + if(-Inf %in% y.ticks) axis(2,at=0,labels=expression(-infinity)) + if(Inf %in% y.ticks) axis(2,at=1,labels=expression(infinity)) + } + box() + }else{ + if(!is.null(y.ticks)){ + if(is.null(ylim)){ ylim <- c(-Inf,Inf)}else{ + if(is.na(ylim[1])) ylim[1] <- -Inf + if(is.na(ylim[2])) ylim[2] <- Inf } + y.ticks <- sort(unique(y.ticks[!is.na(y.ticks)])) + yf <- pmin(pmax(y.ticks[is.finite(y.ticks)],ylim[1]),ylim[2]) + axis(2,at=yf,labels=yf) + if(-Inf %in% y.ticks) axis(2,at=0,labels=expression(-infinity)) + if(Inf %in% y.ticks) axis(2,at=1,labels=expression(infinity)) + box() + } + } + return(invisible(NULL)) +} +if(FALSE){ + set.seed(1); x<- sort(c(-10,rnorm(100),10)) + xlim0 <- c(-2,1.6) + ylim0 <- c(-0.8,1) + xlim01 <- ex0(xlim0) + ylim01 <- ex0(ylim0) + xlim0 <- NULL + ylim0 <- NULL + xlim01 <- NULL + ylim01 <-NULL + distroptions("DistrResolution"=0.000001) + res3 <- .rescalefct(x, fct=function(s) sin(s), + scaleX=T, scaleX.fct=function(x)exp(x)/(exp(x)+1), + scaleX.inv = function(x)log(x/(1-x)), scaleY=T, + xlim=xlim0,ylim=ylim0,dots=list(NULL)) + ex1 <- function(x)log(x/(1-x)) + ex0 <- function(x)exp(x)/(exp(x)+1) + res4 <- .rescalefct(x, fct=function(s) sin(s), + scaleX=T, scaleX.fct=ex0, + scaleX.inv = ex1, scaleY=T, + xlim=xlim0,ylim=ylim0,dots=list(NULL)) + plot(res3$X,res3$Y,axes=F, xlim=xlim01,ylim=ylim01) + .plotRescaledAxis(scaleX=T, scaleX.fct=function(x)exp(x)/(exp(x)+1), + scaleX.inv = function(x)log(x/(1-x)), scaleY=T, scaleY.fct=pnorm, + scaleY.inv = qnorm, X= res3$X, xlim=xlim0,ylim=ylim0, m = 19) + plot(res3$X,res3$Y,axes=F, xlim=xlim01,ylim=ylim01) + .plotRescaledAxis(scaleX=T, scaleX.fct=function(x)exp(x)/(exp(x)+1), + scaleX.inv = function(x)log(x/(1-x)), scaleY=T, scaleY.fct=pnorm, + scaleY.inv = qnorm, X= res3$X, xlim=xlim0,ylim=ylim0, + x.ticks = c(-100,-3,-1,-0.3,0,0.5,2,5,100), + y.ticks = c(-1,-0.7,-0.1,0,0.2,.5,1)) + plot(res3$X,res3$Y,axes=F, xlim=xlim01,ylim=ylim01) + .plotRescaledAxis(scaleX=T, scaleX.fct=function(x)exp(x)/(exp(x)+1), + scaleX.inv = function(x)log(x/(1-x)), scaleY=T, scaleY.fct=pnorm, + scaleY.inv = qnorm, X= res3$X, xlim=xlim0,ylim=ylim0, + x.ticks = c(-Inf,-3,-1,-0.3,0,0.5,2,5,Inf), + y.ticks = c(-1,-0.7,-0.1,0,0.2,.5,1)) + +} + +.legendCoord <- function(x, scaleX, scaleX.fct, scaleY, scaleY.fct){ +# rescaled legend coordinates axes acc. to logicals scaleX, scaleY +# return value: transformed legend coordinates + if (is.character(x)) return(x) + x1 <- if(scaleX) scaleX.fct(x[1]) else x[1] + x2 <- if(scaleY) scaleY.fct(x[2]) else x[2] + return(c(x1,x2)) + } Added: pkg/RobAStBase/R/plotWrapper.R =================================================================== --- pkg/RobAStBase/R/plotWrapper.R (rev 0) +++ pkg/RobAStBase/R/plotWrapper.R 2013-09-11 14:31:27 UTC (rev 693) @@ -0,0 +1,557 @@ +########################################## +## ## +## Wrapper for infoPlot.R ## +## (infoPlot method for IC) ## +## ## +########################################## + +############################################################## +#' Merging Lists +#' +#' \code{.merge.lists} takes two lists and merges them. +#' +#' @param a the first list +#' +#' @param b the second list +#' +#' @return the merged list +#' +#' @keywords internal +#' @rdname mergelists +#' +############################################################## + +### aditional function +.merge.lists <- function(a, b){ + a.names <- names(a) + b.names <- names(b) + m.names <- sort(unique(c(a.names, b.names), fromLast = TRUE)) + sapply(m.names, function(i) { + if (is.list(a[[i]]) & is.list(b[[i]])) .merge.lists(a[[i]], b[[i]]) + else if (i %in% b.names) b[[i]] + else a[[i]] + }, simplify = FALSE) +} + +############################################################## +#' Wrapper function for information plot method +#' +#' The wrapper takes most of arguments to the plot method +#' by default and gives a user possibility to run the +#' function with low number of arguments +#' +#' @param IC object of class \code{IC} +#' +#' @param data optional data argument --- for plotting observations into the plot +#' +#' @param ... additional parameters (in particular to be passed on to \code{plot}) +#' +#' @param alpha.trsp the transparency argument (0 to 100) for ploting the data +#' +#' @param with.legend the flag for showing the legend of the plot +#' +#' @param rescale the flag for rescaling the axes for better view of the plot +#' +#' @param withCall the flag for the call output +#' +#' @return invisible(NULL) +# +#' @section Details: Calls \code{infoPlot} with suitably chosen defaults. If \code{withCall == TRUE}, the call to \code{infoPlot} is returned +#' +#' @export +#' @rdname InfoPlotWrapper +#' +#' +#' @examples +#' # Gamma +#' fam <- GammaFamily() +#' IC <- optIC(model = fam, risk = asCov()) +#' Y <- distribution(fam) +#' data <- r(Y)(1000) +#' InfoPlot(IC, data, withCall = FALSE) +#' +############################################################## + +##IC - influence curve +##data - dataset +## with.legend - optional legend indicator +## withCall - optional indicator of the function call +# +InfoPlot <- function(IC, data,...,alpha.trsp = 100,with.legend = TRUE, rescale = FALSE ,withCall = TRUE){ + ### + ### 1. grab the dots (and manipulate it within the wrapper function) + ### + ### + ### do something to fix the good default arguments + ### + if(missing(IC)) stop("Argument 'IC' must be given as argument to 'InfoPlot'") + if(missing(data)) data <- NULL + mc <- as.list(match.call(expand.dots = FALSE))[-1] + dots <- mc$"..." + if(missing(data)){ + alpha.trsp <- 100 + } else { + if(is.null(mc$alpha.trsp)){ + alpha.trsp <- 30 + if(length(data) < 1000){ + alpha.trsp <- 50 + } + if(length(data) < 100){ + alpha.trsp <- 100 + } + } + } + if(is.null(mc$with.legend)) mc$with.legend <- TRUE + if(is.null(mc$rescale)) mc$rescale <- FALSE + if(is.null(mc$withCall)) mc$withCall <- TRUE + ### + ### 2. build up the argument list for the (powerful/fullfledged) + ### graphics/diagnostics function; + ## + + ## Scaling of the axes + scaleList <- rescaleFunction(eval(IC at CallL2Fam), FALSE, mc$rescale) + + argsList <- c(list(object = substitute(IC) + ,data = substitute(data) + ,withSweave = substitute(getdistrOption("withSweave")) + ,lwd = substitute(par("lwd")) + ,lty = substitute("solid") + ,colI = substitute(grey(0.5)) + ,lwdI = substitute(0.7*par("lwd")) + ,ltyI = substitute("dotted") + ,main = substitute(FALSE) + ,inner = substitute(TRUE) + ,sub = substitute(FALSE) + ,col.inner = substitute(par("col.main")) + ,cex.inner = substitute(0.8) + ,bmar = substitute(par("mar")[1]) + ,tmar = substitute(par("mar")[3]) + ,with.legend = substitute(TRUE) + ,legend = substitute(NULL) + ,legend.bg = substitute("white") + ,legend.location = substitute("bottomright") + ,legend.cex = substitute(0.8) + ,scaleN = substitute(9) + ,mfColRow = substitute(TRUE) + ,to.draw.arg = substitute(NULL) [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 693 From noreply at r-forge.r-project.org Wed Sep 11 19:32:41 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 19:32:41 +0200 (CEST) Subject: [Robast-commits] r694 - branches/robast-0.9/pkg/RandVar branches/robast-0.9/pkg/RobAStBase pkg pkg/ROptEst pkg/ROptEst/R pkg/ROptEst/inst pkg/ROptEst/inst/scripts pkg/ROptEst/man pkg/RandVar pkg/RandVar/man pkg/RobAStBase pkg/RobAStBase/man pkg/RobAStRDA pkg/RobAStRDA/R pkg/RobAStRDA/inst pkg/RobAStRDA/inst/AddMaterial pkg/RobAStRDA/inst/AddMaterial/interpolation pkg/RobAStRDA/man pkg/RobExtremes pkg/RobExtremes/R pkg/RobExtremes/inst pkg/RobExtremes/inst/AddMaterial pkg/RobExtremes/inst/AddMaterial/interpolation pkg/RobExtremes/inst/scripts pkg/RobExtremes/inst/unitTests pkg/RobExtremes/man pkg/RobExtremes/src pkg/RobExtremes/tests Message-ID: <20130911173242.0713F18424F@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 19:32:41 +0200 (Wed, 11 Sep 2013) New Revision: 694 Added: pkg/ROptEst/.Rbuildignore pkg/ROptEst/R/00internal.R pkg/ROptEst/R/AllPlot.R pkg/ROptEst/R/comparePlot.R pkg/ROptEst/R/getInfRad.R pkg/ROptEst/R/getRadius.R pkg/ROptEst/R/getRiskBV.R pkg/ROptEst/R/getStartIC.R pkg/ROptEst/R/internal.roptest.R pkg/ROptEst/R/interpolLM.R pkg/ROptEst/R/plotWrapper.R pkg/ROptEst/R/roptest.new.R pkg/ROptEst/R/versionSuff.R pkg/ROptEst/man/CniperPointPlotWrapper.Rd pkg/ROptEst/man/comparePlot.Rd pkg/ROptEst/man/getInfRad.Rd pkg/ROptEst/man/getRadius.Rd pkg/ROptEst/man/getRiskFctBV-methods.Rd pkg/ROptEst/man/getStartIC-methods.Rd pkg/ROptEst/man/inputGenerator.Rd pkg/ROptEst/man/internal-interpolate.Rd pkg/ROptEst/man/internalMBRE.Rd pkg/ROptEst/man/internalRobestHelpers.Rd pkg/ROptEst/man/internal_Cniperplots.Rd pkg/ROptEst/man/plot-methods.Rd pkg/ROptEst/man/robest.Rd pkg/RobAStRDA/ pkg/RobAStRDA/.Rbuildignore pkg/RobAStRDA/DESCRIPTION pkg/RobAStRDA/NAMESPACE pkg/RobAStRDA/R/ pkg/RobAStRDA/R/Comment.R pkg/RobAStRDA/R/interpolAux.R pkg/RobAStRDA/R/sysdata.rda pkg/RobAStRDA/inst/ pkg/RobAStRDA/inst/AddMaterial/ pkg/RobAStRDA/inst/AddMaterial/interpolation/ pkg/RobAStRDA/inst/AddMaterial/interpolation/WriteUp-Interpolators.txt pkg/RobAStRDA/inst/AddMaterial/interpolation/interpolationscripts.R pkg/RobAStRDA/inst/NEWS pkg/RobAStRDA/inst/TOBEDONE pkg/RobAStRDA/man/ pkg/RobAStRDA/man/0RobRDA-package.Rd pkg/RobAStRDA/man/internal-interpolate.Rd pkg/RobExtremes/ pkg/RobExtremes/.Rbuildignore pkg/RobExtremes/DESCRIPTION pkg/RobExtremes/NAMESPACE pkg/RobExtremes/R/ pkg/RobExtremes/R/00fromRobAStRDA.R pkg/RobExtremes/R/AllClass.R pkg/RobExtremes/R/AllGeneric.R pkg/RobExtremes/R/AllInitialize.R pkg/RobExtremes/R/AllShow.R pkg/RobExtremes/R/Expectation.R pkg/RobExtremes/R/Functionals.R pkg/RobExtremes/R/GEV.R pkg/RobExtremes/R/GEVFamily.R pkg/RobExtremes/R/GEVFamily.R.bak pkg/RobExtremes/R/GEVFamilyMuUnknown.R pkg/RobExtremes/R/GPareto.R pkg/RobExtremes/R/GParetoFamily.R pkg/RobExtremes/R/Gumbel.R pkg/RobExtremes/R/GumbelLocationFamily.R pkg/RobExtremes/R/Kurtosis.R pkg/RobExtremes/R/LDEstimator.R pkg/RobExtremes/R/Pareto.R pkg/RobExtremes/R/ParetoFamily.R pkg/RobExtremes/R/PickandsEstimator.R pkg/RobExtremes/R/QBCC.R pkg/RobExtremes/R/Skewness.R pkg/RobExtremes/R/SnQn.R pkg/RobExtremes/R/WeibullFamily.R pkg/RobExtremes/R/asvarMedkMAD.R pkg/RobExtremes/R/asvarPickands.R pkg/RobExtremes/R/bdpPickands.R pkg/RobExtremes/R/getStartIC.R pkg/RobExtremes/R/internal-getpsi.R pkg/RobExtremes/R/interpolLM.R pkg/RobExtremes/R/interpolSn.R pkg/RobExtremes/R/kMAD.R pkg/RobExtremes/R/move2bckRefParam.R pkg/RobExtremes/R/plotOutlyingness.R pkg/RobExtremes/R/rescaleFct.R pkg/RobExtremes/inst/ pkg/RobExtremes/inst/AddMaterial/ pkg/RobExtremes/inst/AddMaterial/comment.txt pkg/RobExtremes/inst/AddMaterial/interpolation/ pkg/RobExtremes/inst/AddMaterial/interpolation/SnTest.Rdata pkg/RobExtremes/inst/AddMaterial/interpolation/Snplot.pdf pkg/RobExtremes/inst/AddMaterial/interpolation/WriteUp-Interpolators.txt pkg/RobExtremes/inst/AddMaterial/interpolation/checkSn.R pkg/RobExtremes/inst/AddMaterial/interpolation/getLMInterpol.R pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R pkg/RobExtremes/inst/CITATION pkg/RobExtremes/inst/NEWS pkg/RobExtremes/inst/TOBEDONE pkg/RobExtremes/inst/scripts/ pkg/RobExtremes/inst/scripts/ExamplesForDiagnosticsWrappersWithGEVGPD.R pkg/RobExtremes/inst/scripts/GumbelLocationModel.R pkg/RobExtremes/inst/unitTests/ pkg/RobExtremes/inst/unitTests/runit.GEV.R pkg/RobExtremes/inst/unitTests/runit.GEV_family.R pkg/RobExtremes/inst/unitTests/runit.GPareto.R pkg/RobExtremes/inst/unitTests/runit.GPareto_family.R pkg/RobExtremes/inst/unitTests/runit.Gumbel.R pkg/RobExtremes/inst/unitTests/runit.Gumbel_location_family.R pkg/RobExtremes/inst/unitTests/runit.LD_estimator.R pkg/RobExtremes/inst/unitTests/runit.Pareto.R pkg/RobExtremes/inst/unitTests/runit.SnQn.R pkg/RobExtremes/inst/unitTests/runit.expectation.R pkg/RobExtremes/inst/unitTests/runit.functionals.R pkg/RobExtremes/inst/unitTests/runit.kMAD.R pkg/RobExtremes/inst/unitTests/runit.kurtosis.R pkg/RobExtremes/inst/unitTests/runit.skewness.R pkg/RobExtremes/man/ pkg/RobExtremes/man/0RobExtremes-package.Rd pkg/RobExtremes/man/E.Rd pkg/RobExtremes/man/GEV-class.Rd pkg/RobExtremes/man/GEV.Rd pkg/RobExtremes/man/GEVFamily.Rd pkg/RobExtremes/man/GEVFamilyMuUnknown.Rd pkg/RobExtremes/man/GEVParameter-class.Rd pkg/RobExtremes/man/GPareto-class.Rd pkg/RobExtremes/man/GPareto.Rd pkg/RobExtremes/man/GParetoFamily.Rd pkg/RobExtremes/man/GParetoParameter-class.Rd pkg/RobExtremes/man/Gumbel-class.Rd pkg/RobExtremes/man/Gumbel.Rd pkg/RobExtremes/man/GumbelLocationFamily.Rd pkg/RobExtremes/man/GumbelParameter-class.Rd pkg/RobExtremes/man/InternalReturnClasses-class.Rd pkg/RobExtremes/man/LDEstimate-class.Rd pkg/RobExtremes/man/LDEstimator.Rd pkg/RobExtremes/man/Pareto-class.Rd pkg/RobExtremes/man/Pareto.Rd pkg/RobExtremes/man/ParetoFamily.Rd pkg/RobExtremes/man/ParetoParameter-class.Rd pkg/RobExtremes/man/PickandsEstimator.Rd pkg/RobExtremes/man/QuantileBCCEstimator.Rd pkg/RobExtremes/man/RobExtremesConstants.Rd pkg/RobExtremes/man/Var.Rd pkg/RobExtremes/man/WeibullFamily.Rd pkg/RobExtremes/man/asvarMedkMAD.Rd pkg/RobExtremes/man/asvarPickands.Rd pkg/RobExtremes/man/asvarQBCC.Rd pkg/RobExtremes/man/getStartIC-methods.Rd pkg/RobExtremes/man/internal-interpolate.Rd pkg/RobExtremes/man/internalldeHelpers.Rd pkg/RobExtremes/man/interpolateSn.Rd pkg/RobExtremes/man/kMAD.Rd pkg/RobExtremes/man/mov2bckRef-methods.Rd pkg/RobExtremes/man/rescaleFunction-methods.Rd pkg/RobExtremes/man/validParameter-methods.Rd pkg/RobExtremes/src/ pkg/RobExtremes/src/kMad.c pkg/RobExtremes/tests/ pkg/RobExtremes/tests/doRUnit.R Removed: pkg/ROptEst/chm/ Modified: branches/robast-0.9/pkg/RandVar/DESCRIPTION branches/robast-0.9/pkg/RobAStBase/DESCRIPTION pkg/ROptEst/DESCRIPTION pkg/ROptEst/NAMESPACE pkg/ROptEst/R/AllGeneric.R pkg/ROptEst/R/LowerCaseMultivariate.R pkg/ROptEst/R/cniperCont.R pkg/ROptEst/R/getIneffDiff.R pkg/ROptEst/R/getInfClip.R pkg/ROptEst/R/getInfRobIC_asAnscombe.R pkg/ROptEst/R/getInfRobIC_asBias.R pkg/ROptEst/R/getInfRobIC_asGRisk.R pkg/ROptEst/R/getInfRobIC_asHampel.R pkg/ROptEst/R/getInfRobIC_asUnOvShoot.R pkg/ROptEst/R/getInfV.R pkg/ROptEst/R/getRiskIC.R pkg/ROptEst/R/leastFavorableRadius.R pkg/ROptEst/R/optIC.R pkg/ROptEst/R/radiusMinimaxIC.R pkg/ROptEst/R/roptest.R pkg/ROptEst/inst/NEWS pkg/ROptEst/inst/scripts/NormalLocationModel.R pkg/ROptEst/man/0ROptEst-package.Rd pkg/ROptEst/man/cniperCont.Rd pkg/ROptEst/man/getAsRisk.Rd pkg/ROptEst/man/getIneffDiff.Rd pkg/ROptEst/man/getInfClip.Rd pkg/ROptEst/man/getInfRobIC.Rd pkg/ROptEst/man/getMaxIneff.Rd pkg/ROptEst/man/getReq.Rd pkg/ROptEst/man/getRiskIC.Rd pkg/ROptEst/man/internals.Rd pkg/ROptEst/man/optIC.Rd pkg/ROptEst/man/optRisk.Rd pkg/ROptEst/man/radiusMinimaxIC.Rd pkg/ROptEst/man/roptest.Rd pkg/RandVar/DESCRIPTION pkg/RandVar/man/0RandVar-package.Rd pkg/RobAStBase/DESCRIPTION pkg/RobAStBase/man/0RobAStBase-package.Rd Log: merged RobAStRDA, RandVar, RobAStBase, ROptEst, RobExtremes to trunk Modified: branches/robast-0.9/pkg/RandVar/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/RandVar/DESCRIPTION 2013-09-11 14:31:27 UTC (rev 693) +++ branches/robast-0.9/pkg/RandVar/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) @@ -1,5 +1,5 @@ Package: RandVar -Version: 0.9.2 +Version: 0.9.3 Date: 2013-09-06 Title: Implementation of random variables Description: Implementation of random variables by means of S4 classes and methods Modified: branches/robast-0.9/pkg/RobAStBase/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/RobAStBase/DESCRIPTION 2013-09-11 14:31:27 UTC (rev 693) +++ branches/robast-0.9/pkg/RobAStBase/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) @@ -1,5 +1,5 @@ Package: RobAStBase -Version: 0.9 +Version: 0.9.1 Date: 2012-06-05 Title: Robust Asymptotic Statistics Description: Base S4-classes and functions for robust asymptotic statistics. Added: pkg/ROptEst/.Rbuildignore =================================================================== --- pkg/ROptEst/.Rbuildignore (rev 0) +++ pkg/ROptEst/.Rbuildignore 2013-09-11 17:32:41 UTC (rev 694) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: pkg/ROptEst/DESCRIPTION =================================================================== --- pkg/ROptEst/DESCRIPTION 2013-09-11 14:31:27 UTC (rev 693) +++ pkg/ROptEst/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) @@ -1,12 +1,10 @@ Package: ROptEst -Version: 0.8.1 -Date: 2011-09-30 +Version: 0.9 +Date: 2013-09-11 Title: Optimally robust estimation -Description: Optimally robust estimation in general smoothly parameterized models using S4 - classes and methods. -Depends: R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0), distrMod(>= 2.0), RandVar(>= - 0.6.4), RobAStBase -Suggests: MASS, RobLox +Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods. +Depends: R(>= 2.10.0), methods, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>= 0.6.4), RobAStBase +Suggests: RobLox, MASS Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl ByteCompile: yes @@ -16,4 +14,4 @@ Encoding: latin1 LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 454 +SVNRevision: 693 Modified: pkg/ROptEst/NAMESPACE =================================================================== --- pkg/ROptEst/NAMESPACE 2013-09-11 14:31:27 UTC (rev 693) +++ pkg/ROptEst/NAMESPACE 2013-09-11 17:32:41 UTC (rev 694) @@ -11,6 +11,7 @@ "getFixRobIC", "getAsRisk", "getFiRisk", + "getInfRad", "getInfClip", "getFixClip", "getInfGamma", @@ -25,11 +26,17 @@ "lowerCaseRadius", "minmaxBias", "getBiasIC", "getL1normL2deriv", - "getModifyIC", - "cniperCont", "cniperPoint", "cniperPointPlot") + "getModifyIC") exportMethods("updateNorm", "scaleUpdateIC", "eff", - "get.asGRisk.fct") + "get.asGRisk.fct", "getStartIC", "plot", + "comparePlot", "getRiskFctBV") export("getL2normL2deriv", "asAnscombe", "asL1", "asL4", - "getReq", "getMaxIneff") -export("roptest","getLagrangeMultByOptim","getLagrangeMultByIter") + "getReq", "getMaxIneff", "getRadius") +export("roptest","roptest.old", "robest", + "getLagrangeMultByOptim","getLagrangeMultByIter") +export("genkStepCtrl", "genstartCtrl", "gennbCtrl") +export("cniperCont", "cniperPoint", "cniperPointPlot") +export(".generateInterpGrid",".getLMGrid",".saveGridToCSV", ".readGridFromCSV") +export(".RMXE.th",".OMSE.th", ".MBRE.th") +export("CniperPointPlot") \ No newline at end of file Added: pkg/ROptEst/R/00internal.R =================================================================== --- pkg/ROptEst/R/00internal.R (rev 0) +++ pkg/ROptEst/R/00internal.R 2013-09-11 17:32:41 UTC (rev 694) @@ -0,0 +1,25 @@ +.rescalefct <- RobAStBase:::.rescalefct +.plotRescaledAxis <- RobAStBase:::.plotRescaledAxis +.makedotsP <- RobAStBase:::.makedotsP +.makedotsLowLevel <- RobAStBase:::.makedotsLowLevel +.SelectOrderData <- RobAStBase:::.SelectOrderData +### helper function to recursively evaluate list +.evalListRec <- RobAStBase:::.evalListRec + + +if(packageVersion("distrMod")<"2.5"){ +.isUnitMatrix <- function(m){ +### checks whether m is unit matrix + m.row <- nrow(m) + isTRUE(all.equal(m, diag(m.row), check.attributes = FALSE)) + } + +.deleteDim <- function(x){ + attribs <- attributes(x) + attribs$dim <- NULL + attribs$dimnames <- NULL + attributes(x) <- attribs + x + } + +} Modified: pkg/ROptEst/R/AllGeneric.R =================================================================== --- pkg/ROptEst/R/AllGeneric.R 2013-09-11 14:31:27 UTC (rev 693) +++ pkg/ROptEst/R/AllGeneric.R 2013-09-11 17:32:41 UTC (rev 694) @@ -18,6 +18,10 @@ setGeneric("getInfClip", function(clip, L2deriv, risk, neighbor, ...) standardGeneric("getInfClip")) } +if(!isGeneric("getInfRad")){ + setGeneric("getInfRad", + function(clip, L2deriv, risk, neighbor, ...) standardGeneric("getInfRad")) +} if(!isGeneric("getFixClip")){ setGeneric("getFixClip", function(clip, Distr, risk, neighbor, ...) standardGeneric("getFixClip")) @@ -77,18 +81,12 @@ if(!isGeneric("scaleUpdateIC")){ setGeneric("scaleUpdateIC", function(neighbor, ...) standardGeneric("scaleUpdateIC")) } -if(!isGeneric("cniperCont")){ - setGeneric("cniperCont", function(IC1, IC2, L2Fam, neighbor, risk, ...) standardGeneric("cniperCont")) -} -if(!isGeneric("cniperPoint")){ - setGeneric("cniperPoint", function(L2Fam, neighbor, risk, ...) standardGeneric("cniperPoint")) -} -if(!isGeneric("cniperPointPlot")){ - setGeneric("cniperPointPlot", function(L2Fam, neighbor, risk, ...) standardGeneric("cniperPointPlot")) -} if(!isGeneric("eff")){ setGeneric("eff", function(object) standardGeneric("eff")) } if(!isGeneric("get.asGRisk.fct")){ setGeneric("get.asGRisk.fct", function(Risk) standardGeneric("get.asGRisk.fct")) } +if(!isGeneric("getStartIC")){ + setGeneric("getStartIC", function(model, risk, ...) standardGeneric("getStartIC")) +} Added: pkg/ROptEst/R/AllPlot.R =================================================================== --- pkg/ROptEst/R/AllPlot.R (rev 0) +++ pkg/ROptEst/R/AllPlot.R 2013-09-11 17:32:41 UTC (rev 694) @@ -0,0 +1,52 @@ +setMethod("plot", signature(x = "IC", y = "missing"), + function(x, ...,withSweave = getdistrOption("withSweave"), + main = FALSE, inner = TRUE, sub = FALSE, + col.inner = par("col.main"), cex.inner = 0.8, + bmar = par("mar")[1], tmar = par("mar")[3], + with.legend = FALSE, legend = NULL, legend.bg = "white", + legend.location = "bottomright", legend.cex = 0.8, + withMBR = FALSE, MBRB = NA, MBR.fac = 2, col.MBR = par("col"), + lty.MBR = "dashed", lwd.MBR = 0.8, n.MBR = 10000, + scaleX = FALSE, scaleX.fct, scaleX.inv, + scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, + scaleN = 9, x.ticks = NULL, y.ticks = NULL, + mfColRow = TRUE, to.draw.arg = NULL){ + + mcl <- match.call(call = sys.call(sys.parent(1)), expand.dots = TRUE) + + L2Fam <- eval(x at CallL2Fam); trafO <- trafo(L2Fam at param) + dims <- nrow(trafO); to.draw <- 1:dims + dimnms <- c(rownames(trafO)) + if(is.null(dimnms)) + dimnms <- paste("dim",1:dims,sep="") + if(! is.null(to.draw.arg)){ + if(is.character(to.draw.arg)) + to.draw <- pmatch(to.draw.arg, dimnms) + else if(is.numeric(to.draw.arg)) + to.draw <- to.draw.arg + } + dims0 <- length(to.draw) + + MBRB <- matrix(rep(t(MBRB), length.out=dims0*2),ncol=2, byrow=T) + if(withMBR && all(is.na(MBRB))){ + robModel <- InfRobModel(center = L2Fam, neighbor = + ContNeighborhood(radius = 0.5)) + ICmbr <- try(optIC(model = robModel, risk = asBias()), silent=TRUE) + if(!is(ICmbr,"try-error")) + MBRB <- .getExtremeCoordIC(ICmbr, distribution(L2Fam), to.draw, + n = n.MBR) + else withMBR <- FALSE + } + mcl$MBRB <- MBRB + mcl$withMBR <- withMBR + plm <- getMethod("plot", signature(x = "IC", y = "missing"), + where="RobAStBase") + do.call(plm, as.list(mcl[-1]), envir=parent.frame(2)) + return(invisible()) + }) + +.getExtremeCoordIC <- function(IC, D, indi, n = 10000){ + x <- q(D)(seq(1/2/n,1-1/2/n, length=n)) + y <- (matrix(evalIC(IC,matrix(x,ncol=1)),ncol=n))[indi,] + return(cbind(min=apply(y,1,min),max=apply(y,1,max))) +} \ No newline at end of file Modified: pkg/ROptEst/R/LowerCaseMultivariate.R =================================================================== --- pkg/ROptEst/R/LowerCaseMultivariate.R 2013-09-11 14:31:27 UTC (rev 693) +++ pkg/ROptEst/R/LowerCaseMultivariate.R 2013-09-11 17:32:41 UTC (rev 694) @@ -70,7 +70,7 @@ w <<- w0 if(verbose && itermin %% 15 == 1){ # if(verbose && itermin %% 2 == 1){ - cat("trying to find lower case solution;\n") + cat("trying to find lower case solution;\n") cat("current Lagrange Multiplier value:\n") print(list(A=A, z=z,erg=erg)) } @@ -86,13 +86,15 @@ erg <- optim(p.vec, bmin.fct, method = "Nelder-Mead", control = list(reltol = tol, maxit = 100*maxiter), L2deriv = L2deriv, Distr = Distr, trafo = trafo) + problem <- (erg$convergence > 0) A.max <- max(abs(stand(w))) stand(w) <- stand(w)/A.max weight(w) <- minbiasweight(w, neighbor = neighbor, biastype = biastype, normW = normtype) - return(list(erg=erg, w=w, normtype = normtype, z.comp = z.comp, itermin = itermin)) + return(list(erg=erg, w=w, normtype = normtype, z.comp = z.comp, itermin = itermin, + problem = problem )) } @@ -132,6 +134,7 @@ control = list(reltol = tol, maxit = 100*maxiter), L2deriv = L2deriv, Distr = Distr, trafo = trafo) + problem <- (erg$convergence > 0) A <- matrix(erg$par, ncol = k, nrow = 1) b <- 1/erg$value stand(w) <- A @@ -153,6 +156,6 @@ weight(w) <- minbiasweight(w, neighbor = neighbor, biastype = biastype, normW = normtype) - return(list(A=A,b=b, w=w, a=a, itermin = itermin)) + return(list(A=A,b=b, w=w, a=a, itermin = itermin, problem = problem)) } Modified: pkg/ROptEst/R/cniperCont.R =================================================================== --- pkg/ROptEst/R/cniperCont.R 2013-09-11 14:31:27 UTC (rev 693) +++ pkg/ROptEst/R/cniperCont.R 2013-09-11 17:32:41 UTC (rev 694) @@ -1,74 +1,153 @@ -setMethod("cniperCont", signature(IC1 = "IC", - IC2 = "IC", - L2Fam = "L2ParamFamily", - neighbor = "ContNeighborhood", - risk = "asMSE"), - function(IC1, IC2, L2Fam, neighbor, risk, lower, upper, n = 101){ - R1 <- Risks(IC1)[["trAsCov"]] - if(is.null(R1)) R1 <- getRiskIC(IC1, risk = trAsCov(), L2Fam = L2Fam) - if(length(R1) > 1) R1 <- R1$value - R2 <- Risks(IC2)[["trAsCov"]] - if(is.null(R2)) R2 <- getRiskIC(IC2, risk = trAsCov(), L2Fam = L2Fam) - if(length(R2) > 1) R2 <- R2$value +.plotData <- function( + ## helper function for cniper-type plots to plot in data + data, # data to be plot in + dots, # dots from the calling function + origCl, # call from the calling function + fun, # function to determine risk difference + L2Fam, # L2Family + IC # IC1 in cniperContPlot and eta in cniperPointPlot +){ + dotsP <- .makedotsP(dots) + dotsP$col <- rep(eval(origCl$col.pts), length.out=n) + dotsP$pch <- rep(eval(origCl$pch.pts), length.out=n) - r <- neighbor at radius + al <- eval(origCl$alpha.trsp) + if(!is.na(al)) + dotsP$col <- sapply(dotsP$col, addAlphTrsp2col, alpha=al) - fun <- function(x){ - y1 <- evalIC(IC1, x) - y2 <- evalIC(IC2, x) - R1 - R2 + r^2*(as.vector(y1 %*% y1) - as.vector(y2 %*% y2)) + n <- if(!is.null(dim(data))) nrow(data) else length(data) + if(!is.null(lab.pts)) + lab.pts <- rep(origCl$lab.pts, length.out=n) + + sel <- .SelectOrderData(data, function(x)sapply(x,fun), + eval(origCl$which.lbs), + eval(origCl$which.Order)) + i.d <- sel$ind + i0.d <- sel$ind1 + y.d <- sel$y + x.d <- sel$data + n <- length(i.d) + + resc.dat <- .rescalefct(x.d, function(x) sapply(x,fun), + eval(origCl$scaleX), origCl$scaleX.fct, origCl$scaleX.inv, + eval(origCl$scaleY), origCl$scaleY.fct, + dots$xlim, dots$ylim, dots) + + dotsP$x <- resc.dat$X + dotsP$y <- resc.dat$Y + + trafo <- trafo(L2Fam at param) + dims <- nrow(trafo) + QF <- diag(dims) + if(is(IC,"ContIC") & dims>1 ) + {if (is(normtype(IC),"QFNorm")) + QF <- QuadForm(normtype(IC))} + + absInfoEval <- function(x,y) sapply(x, y at Map[[1]]) + IC.rv <- as(diag(dims) %*% IC at Curve, "EuclRandVariable") + absy.f <- t(IC.rv) %*% QF %*% IC.rv + absy <- absInfoEval(x.d, absy.f) + + if(is.null(origCl$cex.pts)) origCl$cex.pts <- par("cex") + dotsP$cex <- log(absy+1)*3*rep(origCl$cex.pts, length.out=n) + + dotsT <- dotsP + dotsT$pch <- NULL + dotsT$cex <- dotsP$cex/2 + dotsT$labels <- if(is.null(lab.pts)) i.d else lab.pts[i.d] + do.call(points,dotsP) + if(!is.null(origCl$with.lab)) + if(origCl$with.lab) do.call(text,dotsT) + if(!is.null(origCl$return$order)) + if(origCl$return.Order) return(i0.d) + return(invisible(NULL)) } - x <- seq(from = lower, to = upper, length = n) - y <- sapply(x, fun) - plot(x, y, type = "l", main = "Cniper region plot", - xlab = "Dirac point", ylab = "Asymptotic MSE difference (IC1 - IC2)") -# text(min(x), max(y)/2, "IC2", pos = 4) -# text(min(x), min(y)/2, "IC1", pos = 4) - abline(h = 0) - invisible() - }) -setMethod("cniperPoint", signature(L2Fam = "L2ParamFamily", - neighbor = "ContNeighborhood", - risk = "asMSE"), - function(L2Fam, neighbor, risk, lower, upper){ - D <- trafo(L2Fam at param) - tr.invF <- sum(diag(D %*% solve(FisherInfo(L2Fam)) %*% t(D))) - psi <- optIC(model = L2Fam, risk = asCov()) - robMod <- InfRobModel(center = L2Fam, neighbor = neighbor) - eta <- optIC(model = robMod, risk = asMSE()) - maxMSE <- Risks(eta)$asMSE$value - Delta <- sqrt(maxMSE - tr.invF)/neighbor at radius - fun <- function(x){ - y <- evalIC(psi, x) - sqrt(as.vector(y %*% y)) - Delta + + +.getFunCnip <- function(IC1,IC2, risk, L2Fam, r, b20=NULL){ + + riskfct <- getRiskFctBV(risk, biastype(risk)) + + .getTrVar <- function(IC){ + R <- Risks(IC)[["trAsCov"]] + if(is.null(R)) R <- getRiskIC(IC, risk = trAsCov(), L2Fam = L2Fam) + if(length(R) > 1) R <- R$value + return(R) } - res <- uniroot(fun, lower = lower, upper = upper)$root - names(res) <- "cniper point" - res - }) -setMethod("cniperPointPlot", signature(L2Fam = "L2ParamFamily", - neighbor = "ContNeighborhood", - risk = "asMSE"), - function(L2Fam, neighbor, risk, lower, upper, n = 101, ...){ - dots <- as.list(match.call(call = sys.call(sys.parent(1)), - expand.dots = FALSE)$"...") - D <- trafo(L2Fam at param) - tr.invF <- sum(diag(D %*% solve(FisherInfo(L2Fam)) %*% t(D))) - psi <- optIC(model = L2Fam, risk = asCov()) - robMod <- InfRobModel(center = L2Fam, neighbor = neighbor) - eta <- optIC(model = robMod, risk = asMSE()) - maxMSE <- Risks(eta)$asMSE$value + R1 <- .getTrVar (IC1) + R2 <- .getTrVar (IC2) + + fun <- function(x){ - y <- evalIC(psi, x) - tr.invF + as.vector(y %*% y)*neighbor at radius^2 - maxMSE + y1 <- evalIC(IC1,as.matrix(x,ncol=1)) + r1 <- riskfct(var=R1,bias=r*fct(normtype(risk))(y1)) + if(!is.null(b20)) + r2 <- riskfct(var=R1,bias=b20) else{ + y2 <- sapply(x,function(x0) evalIC(IC2,x0)) + r2 <- riskfct(var=R2,bias=r*fct(normtype(risk))(y2)) + } + r1 - r2 } - dots$x <- x <- seq(from = lower, to = upper, length = n) - dots$y <- sapply(x, fun) + + return(fun) +} + +cniperCont <- function(IC1, IC2, data = NULL, ..., + neighbor, risk, lower=getdistrOption("DistrResolution"), + upper=1-getdistrOption("DistrResolution"), n = 101, + scaleX = FALSE, scaleX.fct, scaleX.inv, + scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, + scaleN = 9, x.ticks = NULL, y.ticks = NULL, + cex.pts = 1, col.pts = par("col"), + pch.pts = 19, jitter.fac = 1, with.lab = FALSE, + lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, + which.lbs = NULL, which.Order = NULL, + return.Order = FALSE){ + + mc <- match.call(expand.dots = FALSE) + dots <- as.list(mc$"...") + if(!is(IC1,"IC")) stop ("IC1 must be of class 'IC'") + if(!is(IC2,"IC")) stop ("IC2 must be of class 'IC'") + if(!identical(IC1 at CallL2Fam, IC2 at CallL2Fam)) + stop("IC1 and IC2 must be defined on the same model") + + L2Fam <- eval(IC1 at CallL2Fam) + + b20 <- NULL + fCpl <- eval(dots$fromCniperPlot) + if(!is.null(fCpl)) + if(fCpl) b20 <- neighbor at radius*Risks(IC2)$asBias$value + dots$fromCniperPlot <- NULL + + fun <- .getFunCnip(IC1,IC2, risk, L2Fam, neighbor at radius, b20) + + if(missing(scaleX.fct)){ + scaleX.fct <- p(L2Fam) + scaleX.inv <- q(L2Fam) + } + + if(!is.null(as.list(mc)$lower)) lower <- p(L2Fam)(lower) + if(!is.null(as.list(mc)$upper)) upper <- p(L2Fam)(upper) + x <- q(L2Fam)(seq(lower,upper,length=n)) + if(is(distribution(L2Fam), "DiscreteDistribution")) + x <- seq(q(L2Fam)(lower),q(L2Fam)(upper),length=n) + resc <- .rescalefct(x, fun, scaleX, scaleX.fct, + scaleX.inv, scaleY, scaleY.fct, dots$xlim, dots$ylim, dots) + dots$x <- resc$X + dots$y <- resc$Y + + + dots$type <- "l" + if(is.null(dots$main)) dots$main <- gettext("Cniper region plot") + if(is.null(dots$xlab)) dots$xlab <- gettext("Dirac point") + if(is.null(dots$ylab)) + dots$ylab <- gettext("Asymptotic Risk difference (IC1 - IC2)") + colSet <- ltySet <- lwdSet <- FALSE if(!is.null(dots$col)) {colSet <- TRUE; colo <- eval(dots$col)} if(colSet) { - colo <- rep(colo,length.out=2) + colo <- rep(colo,length.out=2) dots$col <- colo[1] } if(!is.null(dots$lwd)) {lwdSet <- TRUE; lwdo <- eval(dots$lwd)} @@ -78,29 +157,87 @@ } if(!is.null(dots$lty)) {ltySet <- TRUE; ltyo <- eval(dots$lty)} if(ltySet && ((!is.numeric(ltyo) && length(ltyo)==1)|| - is.numeric(ltyo))){ + is.numeric(ltyo))){ ltyo <- list(ltyo,ltyo) dots$lty <- ltyo[[1]] }else{ if (ltySet && !is.numeric(ltyo) && length(ltyo)==2){ dots$lty <- ltyo[[1]] } } - if(is.null(dots$main)) dots$main <- gettext("Cniper point plot") - if(is.null(dots$xlab)) dots$xlab <- gettext("Dirac point") - if(is.null(dots$ylab)) - dots$ylab <- gettext("Asymptotic MSE difference (classic - robust)") - dots$type <- "l" - do.call(plot, dots) -# text(min(x), max(y)/2, "Robust", pos = 4) -# text(min(x), min(y)/2, "Classic", pos = 4) - dots$x <- dots$y <- dots$xlab <- dots$ylab <- dots$main <- dots$type <- NULL - dots$h <- 0 + do.call(plot,dots) + + dots <- .makedotsLowLevel(dots) + dots$x <- dots$y <- NULL if(colSet) dots$col <- colo[2] if(lwdSet) dots$lwd <- lwdo[2] if(ltySet) dots$lty <- ltyo[[2]] + + dots$h <- if(scaleY) scaleY.fct(0) else 0 do.call(abline, dots) - invisible() - }) -# -#cniperPointPlot(L2Fam=N0, neighbor=ContNeighborhood(radius = 0.5), risk=asMSE(),lower=-12, n =30, upper=8, lwd=c(2,4),lty=list(c(5,1),3),col=c(2,4)) - \ No newline at end of file + + .plotRescaledAxis(scaleX, scaleX.fct, scaleX.inv, scaleY,scaleY.fct, + scaleY.inv, dots$xlim, dots$ylim, resc$X, ypts = 400, + n = scaleN, x.ticks = x.ticks, y.ticks = y.ticks) + if(!is.null(data)) + return(.plotData(data, dots, mc, fun, L2Fam, IC1)) + invisible(NULL) +} + +cniperPoint <- function(L2Fam, neighbor, risk= asMSE(), + lower=getdistrOption("DistrResolution"), + upper=1-getdistrOption("DistrResolution")){ + + + mc <- match.call(expand.dots = FALSE) + + if(!is.null(as.list(mc)$lower)) lower <- p(L2Fam)(lower) + if(!is.null(as.list(mc)$upper)) upper <- p(L2Fam)(upper) + lower <- q(L2Fam)(lower) + upper <- q(L2Fam)(upper) + + robMod <- InfRobModel(center = L2Fam, neighbor = neighbor) + + psi <- optIC(model = L2Fam, risk = asCov()) + eta <- optIC(model = robMod, risk = risk) + + fun <- .getFunCnip(psi,eta, risk, L2Fam, neighbor at radius) + + res <- uniroot(fun, lower = lower, upper = upper)$root + names(res) <- "cniper point" + res +} + +cniperPointPlot <- function(L2Fam, data=NULL, ..., neighbor, risk= asMSE(), + lower=getdistrOption("DistrResolution"), + upper=1-getdistrOption("DistrResolution"), n = 101, + withMaxRisk = TRUE, + scaleX = FALSE, scaleX.fct, scaleX.inv, + scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, + scaleN = 9, x.ticks = NULL, y.ticks = NULL, + cex.pts = 1, col.pts = par("col"), + pch.pts = 19, jitter.fac = 1, with.lab = FALSE, + lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, + which.lbs = NULL, which.Order = NULL, + return.Order = FALSE){ + + mc <- match.call(#call = sys.call(sys.parent(1)), + expand.dots = FALSE) + mcl <- as.list(mc[-1]) + dots <- as.list(mc$"...") + + robMod <- InfRobModel(center = L2Fam, neighbor = neighbor) + + mcl$IC1 <- optIC(model = L2Fam, risk = asCov()) + mcl$IC2 <- optIC(model = robMod, risk = risk) + mcl$L2Fam <- NULL + if(is.null(dots$ylab)) + mcl$ylab <- gettext("Asymptotic Risk difference (classic - robust)") + if(is.null(dots$main)) + mcl$main <- gettext("Cniper point plot") + + if(withMaxRisk) mcl$fromCniperPlot <- TRUE + do.call(cniperCont, mcl) +} + + + Added: pkg/ROptEst/R/comparePlot.R =================================================================== --- pkg/ROptEst/R/comparePlot.R (rev 0) +++ pkg/ROptEst/R/comparePlot.R 2013-09-11 17:32:41 UTC (rev 694) @@ -0,0 +1,52 @@ +setMethod("comparePlot", signature("IC","IC"), + function(obj1,obj2, obj3 = NULL, obj4 = NULL, data = NULL, + ..., withSweave = getdistrOption("withSweave"), + main = FALSE, inner = TRUE, sub = FALSE, + col = par("col"), lwd = par("lwd"), lty, + col.inner = par("col.main"), cex.inner = 0.8, + bmar = par("mar")[1], tmar = par("mar")[3], + with.legend = FALSE, legend = NULL, legend.bg = "white", + legend.location = "bottomright", legend.cex = 0.8, + withMBR = FALSE, MBRB = NA, MBR.fac = 2, col.MBR = par("col"), + lty.MBR = "dashed", lwd.MBR = 0.8, n.MBR = 10000, + scaleX = FALSE, scaleX.fct, scaleX.inv, + scaleY = FALSE, scaleY.fct = pnorm, scaleY.inv=qnorm, + scaleN = 9, x.ticks = NULL, y.ticks = NULL, + mfColRow = TRUE, to.draw.arg = NULL, + cex.pts = 1, col.pts = par("col"), + pch.pts = 1, jitter.fac = 1, with.lab = FALSE, + lab.pts = NULL, lab.font = NULL, alpha.trsp = NA, + which.lbs = NULL, which.Order = NULL, return.Order = FALSE){ + + mcl <- match.call(call = sys.call(sys.parent(1)), expand.dots = TRUE) + + L2Fam <- eval(obj1 at CallL2Fam); trafO <- trafo(L2Fam at param) + dims <- nrow(trafO); to.draw <- 1:dims + dimnms <- c(rownames(trafO)) + if(is.null(dimnms)) + dimnms <- paste("dim",1:dims,sep="") + if(! is.null(to.draw.arg)){ + if(is.character(to.draw.arg)) + to.draw <- pmatch(to.draw.arg, dimnms) + else if(is.numeric(to.draw.arg)) + to.draw <- to.draw.arg + } + dims0 <- length(to.draw) + + MBRB <- matrix(rep(t(MBRB), length.out=dims0*2),ncol=2, byrow=T) + if(withMBR && all(is.na(MBRB))){ + robModel <- InfRobModel(center = L2Fam, neighbor = + ContNeighborhood(radius = 0.5)) + ICmbr <- try(optIC(model = robModel, risk = asBias()), silent=TRUE) + if(!is(ICmbr,"try-error")) + MBRB <- .getExtremeCoordIC(ICmbr, distribution(L2Fam), to.draw, + n=n.MBR) + else withMBR <- FALSE + } + mcl$MBRB <- MBRB + mcl$withMBR <- withMBR + do.call(getMethod("comparePlot", signature("IC","IC"), + where="RobAStBase"), as.list(mcl[-1]), + envir=parent.frame(2)) + return(invisible()) + }) Modified: pkg/ROptEst/R/getIneffDiff.R =================================================================== --- pkg/ROptEst/R/getIneffDiff.R 2013-09-11 14:31:27 UTC (rev 693) +++ pkg/ROptEst/R/getIneffDiff.R 2013-09-11 17:32:41 UTC (rev 694) @@ -9,10 +9,10 @@ z.start = NULL, A.start = NULL, upper.b = NULL, lower.b = NULL, OptOrIter = "iterate", MaxIter, eps, warn, loNorm = NULL, upNorm = NULL, - verbose = NULL, ...){ - + verbose = NULL, ..., withRetIneff = FALSE){ if(missing(verbose)|| is.null(verbose)) verbose <- getRobAStBaseOption("all.verbose") + L2derivDim <- numberOfMaps(L2Fam at L2deriv) if(L2derivDim == 1){ ##print(radius) @@ -35,9 +35,10 @@ ineffUp <- res$b^2/upRisk else ineffUp <- (as.vector(res$A)*trafo - res$b^2*(radius^2-upRad^2))/upRisk - assign("ineff", ineffUp, envir = sys.frame(which = -4)) + ##assign("ineff", ineffUp, envir = sys.frame(which = -5)) ##print(c(ineffUp,ineffLo,ineffUp - ineffLo)) - return(ineffUp - ineffLo) + if(withRetIneff) return(c(lo= ineffLo, up=ineffUp)) + else return(ineffUp - ineffLo) }else{ if(is(L2Fam at distribution, "UnivariateDistribution")){ if((length(L2Fam at L2deriv) == 1) & is(L2Fam at L2deriv[[1]], "RealRandVariable")){ @@ -94,12 +95,12 @@ }else{ ineffLo <- (sum(diag(std%*%res$A%*%t(trafo))) - biasLo^2*(radius^2-loRad^2))/loRisk - if(upRad == Inf) - ineffUp <- biasUp^2/upRisk - else - ineffUp <- (sum(diag(std%*%res$A%*%t(trafo))) - - biasUp^2*(radius^2-upRad^2))/upRisk} - assign("ineff", ineffUp, envir = sys.frame(which = -4)) + if(upRad == Inf) + ineffUp <- biasUp^2/upRisk + else + ineffUp <- (sum(diag(std%*%res$A%*%t(trafo))) - + biasUp^2*(radius^2-upRad^2))/upRisk + } if(verbose) cat(paste(rep("-",75), sep = "", collapse = ""),"\n", "current radius: ", round(radius,4), @@ -109,7 +110,8 @@ collapse = ""),"\n",sep="") ) - return(ineffUp - ineffLo) + if(withRetIneff) return(c(lo= ineffLo, up=ineffUp)) + else return(ineffUp - ineffLo) }else{ stop("not yet implemented") } Modified: pkg/ROptEst/R/getInfClip.R =================================================================== --- pkg/ROptEst/R/getInfClip.R 2013-09-11 14:31:27 UTC (rev 693) +++ pkg/ROptEst/R/getInfClip.R 2013-09-11 17:32:41 UTC (rev 694) @@ -155,7 +155,7 @@ L2deriv = "UnivariateDistribution", risk = "asSemivar", neighbor = "ContNeighborhood"), - function(clip, L2deriv, risk, neighbor, cent, symm, trafo){ + function(clip, L2deriv, risk, neighbor, biastype, cent, symm, trafo){ biastype <- if(sign(risk)==1) positiveBias() else negativeBias() z0 <- getInfCent(L2deriv = L2deriv, risk = risk, neighbor = neighbor, biastype = biastype, Added: pkg/ROptEst/R/getInfRad.R =================================================================== --- pkg/ROptEst/R/getInfRad.R (rev 0) +++ pkg/ROptEst/R/getInfRad.R 2013-09-11 17:32:41 UTC (rev 694) @@ -0,0 +1,175 @@ +############################################################################### +## optimal radius for given clipping bound for asymptotic MSE +############################################################################### + +setMethod("getInfRad", signature(clip = "numeric", + L2deriv = "UnivariateDistribution", + risk = "asMSE", + neighbor = "ContNeighborhood"), + function(clip, L2deriv, risk, neighbor, biastype, + cent, symm, trafo){ + gamm <- getInfGamma(L2deriv = L2deriv, risk = risk, neighbor = neighbor, + biastype = biastype, cent = cent, clip = clip) + return((-gamm/clip)^.5) + }) + +setMethod("getInfRad", signature(clip = "numeric", + L2deriv = "UnivariateDistribution", + risk = "asMSE", + neighbor = "TotalVarNeighborhood"), + function(clip, L2deriv, risk, neighbor, biastype, + cent, symm, trafo){ + gamm <- getInfGamma(L2deriv = sign(as.vector(trafo))*L2deriv, risk = risk, + neighbor = neighbor, biastype = biastype, + cent = if(symm) -clip/2 else cent , clip = clip) + return((-gamm/clip)^.5) + }) + +setMethod("getInfRad", signature(clip = "numeric", + L2deriv = "EuclRandVariable", + risk = "asMSE", + neighbor = "UncondNeighborhood"), + function(clip, L2deriv, risk, neighbor, biastype, + Distr, stand, cent, trafo){ + gamm <- getInfGamma(L2deriv = L2deriv, risk = risk, neighbor = neighbor, + biastype = biastype, Distr = Distr, stand = stand, + cent = cent, clip = clip) + return((-gamm/clip)^.5) + }) + [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 694 From noreply at r-forge.r-project.org Wed Sep 11 19:35:04 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 19:35:04 +0200 (CEST) Subject: [Robast-commits] r695 - in pkg: ROptEst ROptEst/man RandVar RandVar/man RobAStBase RobAStBase/man RobAStRDA RobAStRDA/man RobExtremes RobExtremes/man Message-ID: <20130911173505.10ACB18424F@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 19:35:04 +0200 (Wed, 11 Sep 2013) New Revision: 695 Modified: pkg/ROptEst/DESCRIPTION pkg/ROptEst/man/0ROptEst-package.Rd pkg/RandVar/DESCRIPTION pkg/RandVar/man/0RandVar-package.Rd pkg/RobAStBase/DESCRIPTION pkg/RobAStBase/man/0RobAStBase-package.Rd pkg/RobAStRDA/DESCRIPTION pkg/RobAStRDA/man/0RobRDA-package.Rd pkg/RobExtremes/DESCRIPTION pkg/RobExtremes/man/0RobExtremes-package.Rd Log: updated versions in DESCRIPTION and -package.Rd files Modified: pkg/ROptEst/DESCRIPTION =================================================================== --- pkg/ROptEst/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/ROptEst/DESCRIPTION 2013-09-11 17:35:04 UTC (rev 695) @@ -14,4 +14,4 @@ Encoding: latin1 LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 693 +SVNRevision: 694 Modified: pkg/ROptEst/man/0ROptEst-package.Rd =================================================================== --- pkg/ROptEst/man/0ROptEst-package.Rd 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/ROptEst/man/0ROptEst-package.Rd 2013-09-11 17:35:04 UTC (rev 695) @@ -19,7 +19,7 @@ LazyLoad: \tab yes \cr License: \tab LGPL-3 \cr URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 693 \cr +SVNRevision: \tab 694 \cr } } \author{ Modified: pkg/RandVar/DESCRIPTION =================================================================== --- pkg/RandVar/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RandVar/DESCRIPTION 2013-09-11 17:35:04 UTC (rev 695) @@ -13,4 +13,4 @@ URL: http://robast.r-forge.r-project.org/ LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 693 +SVNRevision: 694 Modified: pkg/RandVar/man/0RandVar-package.Rd =================================================================== --- pkg/RandVar/man/0RandVar-package.Rd 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RandVar/man/0RandVar-package.Rd 2013-09-11 17:35:04 UTC (rev 695) @@ -18,7 +18,7 @@ LazyLoad: \tab yes \cr License: \tab LGPL-3 \cr URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 693 \cr +SVNRevision: \tab 694 \cr } } \author{ Modified: pkg/RobAStBase/DESCRIPTION =================================================================== --- pkg/RobAStBase/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RobAStBase/DESCRIPTION 2013-09-11 17:35:04 UTC (rev 695) @@ -14,4 +14,4 @@ URL: http://robast.r-forge.r-project.org/ LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 693 +SVNRevision: 694 Modified: pkg/RobAStBase/man/0RobAStBase-package.Rd =================================================================== --- pkg/RobAStBase/man/0RobAStBase-package.Rd 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RobAStBase/man/0RobAStBase-package.Rd 2013-09-11 17:35:04 UTC (rev 695) @@ -18,7 +18,7 @@ LazyLoad: \tab yes \cr License: \tab LGPL-3 \cr URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 693 \cr +SVNRevision: \tab 694 \cr } } \author{ Modified: pkg/RobAStRDA/DESCRIPTION =================================================================== --- pkg/RobAStRDA/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RobAStRDA/DESCRIPTION 2013-09-11 17:35:04 UTC (rev 695) @@ -13,4 +13,4 @@ URL: http://robast.r-forge.r-project.org/ LastChangedDate: {$LastChangedDate: 2011-09-30 11:10:33 +0200 (Fr, 30 Sep 2011) $} LastChangedRevision: {$LastChangedRevision: 453 $} -SVNRevision: 693 +SVNRevision: 694 Modified: pkg/RobAStRDA/man/0RobRDA-package.Rd =================================================================== --- pkg/RobAStRDA/man/0RobRDA-package.Rd 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RobAStRDA/man/0RobRDA-package.Rd 2013-09-11 17:35:04 UTC (rev 695) @@ -40,7 +40,7 @@ ByteCompile: \tab yes \cr License: \tab LGPL-3 \cr URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 693 \cr +SVNRevision: \tab 694 \cr } } Modified: pkg/RobExtremes/DESCRIPTION =================================================================== --- pkg/RobExtremes/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RobExtremes/DESCRIPTION 2013-09-11 17:35:04 UTC (rev 695) @@ -16,4 +16,4 @@ URL: http://robast.r-forge.r-project.org/ LastChangedDate: {$LastChangedDate: 2011-09-30 11:10:33 +0200 (Fr, 30 Sep 2011) $} LastChangedRevision: {$LastChangedRevision: 453 $} -SVNRevision: 693 +SVNRevision: 694 Modified: pkg/RobExtremes/man/0RobExtremes-package.Rd =================================================================== --- pkg/RobExtremes/man/0RobExtremes-package.Rd 2013-09-11 17:32:41 UTC (rev 694) +++ pkg/RobExtremes/man/0RobExtremes-package.Rd 2013-09-11 17:35:04 UTC (rev 695) @@ -42,7 +42,7 @@ ByteCompile: \tab yes \cr License: \tab LGPL-3 \cr URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 693 \cr +SVNRevision: \tab 694 \cr } } \section{Classes}{ From noreply at r-forge.r-project.org Wed Sep 11 19:40:27 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 11 Sep 2013 19:40:27 +0200 (CEST) Subject: [Robast-commits] r696 - branches/robast-0.9/pkg/Mail Message-ID: <20130911174027.C860718424F@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-11 19:40:27 +0200 (Wed, 11 Sep 2013) New Revision: 696 Added: branches/robast-0.9/pkg/Mail/Notes.txt branches/robast-0.9/pkg/Mail/new_versions_packages_distr-distrEx-distrSim-distrTEst.txt Log: concepts / drafts for Mail and Notes to CRAN Added: branches/robast-0.9/pkg/Mail/Notes.txt =================================================================== --- branches/robast-0.9/pkg/Mail/Notes.txt (rev 0) +++ branches/robast-0.9/pkg/Mail/Notes.txt 2013-09-11 17:40:27 UTC (rev 696) @@ -0,0 +1,287 @@ +notes obtained: +========================================================== +distr_2.5 oK -> submitted -> Peter Maintainer +========================================================== +***** +R-3.0.1patched r63805 && R-3.1.0dev r63824 +***** + +* checking CRAN incoming feasibility ... NOTE +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +-- +has already been discussed along our last submissions, with attached mail +"new package distrRmetrics (version 2.4) uploaded", Feb 07, 2013. + +* checking foreign function calls ... WARNING +Foreign function calls with 'PACKAGE' argument in a base package: +.C("pkolmogorov2x", ..., PACKAGE = "stats") +.C("pkstwo", ..., PACKAGE = "stats") +Packages should not make .C/.Call/.Fortran calls to base packages. They +are not part of the API, for use only by R itself and subject to change +without notice. +-- + +We are aware of it and have already had the same issue +in mail "distr 2.4 uploaded" to CRAN at R-project.org on 07.02.2013 18:51 +As far as we can see, nothing has changed on R-side inbetween. + +========================================================== +distrMod_2.5 oK -> submitted -> Peter Maintainer +========================================================== +***** +R-3.0.1patched r63805 && R-3.1.0dev r63824 +***** + +* checking CRAN incoming feasibility ... NOTE +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +-- +has already been discussed along our last submissions, with attached mail +"new package distrRmetrics (version 2.4) uploaded", Feb 07, 2013. + + +========================================================== +distrSim_2.5 oK -> submitted -> Peter Maintainer +========================================================== +***** +R-3.0.1patched r63805 && R-3.1.0dev r63824 +***** + +* checking CRAN incoming feasibility ... NOTE +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +-- +has already been discussed along our last submissions, with attached mail +"new package distrRmetrics (version 2.4) uploaded", Feb 07, 2013. + +========================================================== +RandVar_0.9.2 oK -> Matthias Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +========================================================== +RobAStBase_0.9 oK -> Matthias Maintainer +========================================================== +needs (in addition to _0.8.1: install.packages(c("rrcov", "RUnit")) +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +========================================================== +RobAStRDA_0.9 oK -> Peter Maintainer +========================================================== +%---------------- +New submission +%---------------- +License: LGPL-3 +%---------------- +as agreed upon in the mail thread "large sysdata.rda file --- strategies?" +on r-devel, R-devel Digest, Vol 120, Issue 8, to save space in our other, +more frequently updated packages, this is a mere rda package containing +only a sysdata.rda file with interpolation grids and respective interpolating +functions and is documented accordingly. + +We have read and agree with the CRAN Repository Policy as of 2013/07/10 from +http://cran.r-project.org/web/packages/policies.html + +Our licence is LGPL-3, as with the other pkgs of the RobASt family + +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +* checking installed package size ... NOTE + installed size is 7.9Mb + sub-directories of 1Mb or more: + R 7.9Mb + +***** +R-3.1.0dev r63824 +***** +* Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +* checking installed package size ... NOTE + installed size is 7.9Mb + sub-directories of 1Mb or more: + R 7.9Mb +========================================================== +ROptEst_0.9 oK -> Matthias Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +========================================================== +RobExtremes_0.9 oK -> Peter Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +* checking package dependencies ... NOTE +Depends: includes the non-default packages: + 'distr' 'distrEx' 'RandVar' 'distrMod' 'RobAStBase' 'ROptEst' + 'robustbase' 'evd' 'actuar' +Adding so many packages to the search path is excessive and importing +selectively is preferable. +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +* checking package dependencies ... NOTE +Depends: includes the non-default packages: + 'distr' 'distrEx' 'RandVar' 'distrMod' 'RobAStBase' 'ROptEst' + 'robustbase' 'evd' 'actuar' +Adding so many packages to the search path is excessive and importing +selectively is preferable. + +Not sure how to deal with this. How can we enforce certain versions +only needed by this package then while still making available all +exported objects to the user? + +========================================================== +RobLox_0.9 oK -> Matthias Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +* checking package dependencies ... NOTE +Depends: includes the non-default packages: + 'lattice' 'RColorBrewer' 'RandVar' 'Biobase' 'distr' 'distrMod' + 'RobAStBase' +Adding so many packages to the search path is excessive and importing +selectively is preferable. +Not sure how to deal with this. How can we enforce certain versions +only needed by this package then while still making available all +exported objects to the user? + +========================================================== +RobLoxBioC_0.9 oK -> Matthias Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' + +* checking package dependencies ... NOTE +Depends: includes the non-default packages: + 'Biobase' 'affy' 'beadarray' 'distr' 'RobLox' 'lattice' + 'RColorBrewer' 'BiocGenerics' 'distrMod' +Adding so many packages to the search path is excessive and importing +selectively is preferable. + +Adding so many packages to the search path is excessive and importing +selectively is preferable. +Not sure how to deal with this. How can we enforce certain versions +only needed by this package then while still making available all +exported objects to the user? + +========================================================== +RobRex_0.9 oK -> Matthias Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +========================================================== +ROptEstOld_0.9.1 oK -> Matthias Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +========================================================== +ROptRegTS_0.9.1 -> Matthias Maintainer +========================================================== +***** +R-3.0.1patched r63805 +***** +Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' +***** +R-3.1.0dev r63824 +***** ++ Maintainer: 'Matthias Kohl ' +Possibly mis-spelled fields in DESCRIPTION: + 'SVNRevision' ++ \usage lines wider than 90 characters: + Rd file 'getAsRiskRegTS.Rd': + Rd file 'getFiRiskRegTS.Rd': + Rd file 'getInfClipRegTS.Rd': + Rd file 'getInfGammaRegTS.Rd': + Rd file 'getInfRobRegTypeIC.Rd': + Rd file 'getInfStandRegTS.Rd': + cannot be avoided, because signature is longer than 90 chars and + within signature argument of \S4method no linebreak is allowed + \ No newline at end of file Added: branches/robast-0.9/pkg/Mail/new_versions_packages_distr-distrEx-distrSim-distrTEst.txt =================================================================== --- branches/robast-0.9/pkg/Mail/new_versions_packages_distr-distrEx-distrSim-distrTEst.txt (rev 0) +++ branches/robast-0.9/pkg/Mail/new_versions_packages_distr-distrEx-distrSim-distrTEst.txt 2013-09-11 17:40:27 UTC (rev 696) @@ -0,0 +1,225 @@ + + + + + new versions of packages "distr", "distrEx", "distrSim", +"distrTEst"; new package "startupmsg" + + + + + + +
We would like to announce the availability on CRAN of a new versions 
+of our packages "distr", "distrEx", "distrSim", "distrTEst", as well 
as a new package "startupmsg"

-----------------------------------------------------------------------------------------
************ new package "startupmsg" *****************
-----------------------------------------------------------------------------------------

### startupmsg  -- v0.2 

Utilities for start-up messages for packages:

provides: 

+functions:  to display a NEWS file (if existing) and tags from the 
             DESCRIPTION file of a package 

+conditions: a new sub-condition to 'message'  (with a 'types' slot) 
             is introduced, allowing for scalable startup messages by 
             condition "catchers" muffleMessage() [for StartupMessage], 
             onlytypeMessage(), and custom()  

additionally: 
+ buildStartupMessage: automatically generates a 'complete' start-up message including 
         *a start-up message of type "version" as to the version information.
         *a start-up message of type "notabene" (optionally)
         *a start-up message of "information" mentioning
            -?"<pkg-name>",  
            -NEWS("<pkg-name>"), if there is a \file{NEWS} file,   
            -the URL tag of the package DESCRIPTION file, (if existing),   
            -a file / a URL to a manual (optional)
(to be called in the .onAttach() / .First.lib() function of a package)


+ takes up thread "Wishlist: 'quietly' argument for .onAttach() / .First.lib()"
  on r-devel, April 2006, more precisely:
  Brian Ripley: https://stat.ethz.ch/pipermail/r-devel/2006-April/037281.html
  Andy Liaw:    https://stat.ethz.ch/pipermail/r-devel/2006-April/037286.html
  Seth Falcon:  https://stat.ethz.ch/pipermail/r-devel/2006-April/037317.html
  and           https://stat.ethz.ch/pipermail/r-devel/2006-April/037367.html

  also compare  https://stat.ethz.ch/pipermail/r-devel/2006-April/037382.html

-----------------------------------------------------------------------------------------
+************ Changes *****************
+-----------------------------------------------------------------------------------------
+
+### distr  -- v1.7 
+Changes from 1.6 to 1.7
+
++ taking up a suggestion by Martin Maechler, we now issue warnings as to the
+  intepretation of arithmetics applied to distributions, as well as to the
+  accuracy of slots p,d,q filled by means of simulations;
+  these warnings are issued at two places:
+  (1) on attaching the package
+  (2) at every show/print of a distribution
++ (2) can be cancelled by switching off a corresponding global option
+  in distroptions() (see ?distroptions)    
++ distroptions() now behaves like options --- also compare mail
+  "Re: [Rd] How to implement package-specific options?" by Brian Ripley on 
+  r-devel, Fri 09 Dec 2005 - 11:52:46, see 
+       http://tolstoy.newcastle.edu.au/R/devel/05/12/3408.html 
++ all specific distributions (those realized as [r|d|p|q]<name> like rnorm in stats)
+  now have valid prototypes
++ fixed arguments xlim and ylim for plot(signature("AbscontDistribution" 
+  or "DiscreteDistribution")) thus: plot(Cauchy(),xlim=c(-4,4)) gives 
+  reasonable result (and plot(Cauchy()) does not)
++ Internationalization: use of gettext, gettextf for output
++ explicitly implemented is() relations:  R "knows" that:
+  * an Exponential(lambda) distribution also is 
+    a Weibull(shape =1, scale = 1/lambda) distribution, 
+    as well as a Gamma(shape = 1, scale = 1/lambda) distribution
+  * a Geometric(p) distribution also is 
+    a Negativ Binomial(size = 1,p) distribution
+  * a Uniform(0,1) distribution also is a Beta(1,1) distribution
+  * a Cauchy(0,1) distribution also is a T(df=1, ncp=0) distribution
+  * a Chisq(df=n, ncp=0) distribution also is a Gamma(shape=n/2,scale=2) distribution 
++ noncentrality parameter included for Beta, T, F distribution
+
### distrEx  -- v0.4-3 
+Changes from 0.4-2 to 0.4-3 
+
+* Implementation of functionals:
++ evaluation of exact expressions of E (expectation functional) 
+  for most specific distributions
++ var, sd methods for UnivariateDistributions: these include calls like 
+  N <- Norm()
+  var(N,function(t)abs(t)^(1/2))   # calculates Var[|N|^(1/2)] 
+  also (factorized) conditional variance is available
++ evaluation of exact expressions of var for most specific distributions
++ median, IQR, mad methods for UnivariateDistributions  
++ for var, sd, median, IQR, mad:
+  *all* functionality/arguments of stats methods is/are preserved and 
+  only if first argument / argument x is of class UnivariateDistribution 
+  (or descendant) a different method is applied
+* Demos are included
++ an illustration of the use of these functionals in programming
++ an illustration of the (iid-setup)-CLT (for [almost] arbitrary summand distribution)
++ a deconvolution expample: let X and E be independet univariate random variables with
+  [almost] arbitrary, given absolsutely continuous distributions. We generate the
+  (factorized) conditional distribution of X given X+E=y.
++ Internationalization: use of gettext, gettextf in output
++ C-interface .GLaw() to replace respective R-Code in distrExintegrate.R
++ exact formula for E, Var for Fd (with ncp) and Td (with ncp)
+
+
+### distrSim  -- v1.7 
+Changes from 1.6 to 1.7
+
++ the (new) Namespace of setRNG by Paul Gilbert is imported
+
+### distrTEst  -- v1.7 
+Changes from 1.6 to 1.7
+
++ "..." included into evaluate 
+
+some more details to be found at
+http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR
+and a more detailed manual is available at
+http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf
+
+-----------------------------------------------------------------------------------------
+Short Descriptions
+-----------------------------------------------------------------------------------------
+Short Description of "distr":
+"distr" is to provide a conceptual treatment of random variables
+(r.v.'s) by means of S4--classes. A virtual mother class "Distribution"
+is introduced.
+All distributions of the "base" package are implemented as subclasses of
+either "AbscontDistribution" or "DiscreteDistribution".
+
+Using these classes, we also provide (default) methods to automatically
+generate the image distributions under unary mathematical operations as
+well as a general convolution algorithm.
+-----------------------------------------------------------------------------------------
+Short Description of "distrSim":
+Classes and methods are provided for a standardized treatment of
+simulations (also under contaminations) .
+-----------------------------------------------------------------------------------------
+Short Description of "distrTEst":
+Classes and methods are provided for a standardized treatment of
+the evaluation of statistical procedures (up to now only estimators)
+at data/simulations
+-----------------------------------------------------------------------------------------
+Short Description of "distrEx":
+This package provides some extensions to package "distr"
+like:
+* extreme value distribution classes,
+*expectations
+  +in the form E(X)  for the expectation of X where X is some
+    distribution or
+  +in the form E(X,f) for the expectation of f(X) where X is
+     some distribution and f some function in X,
+* further functionals: var, sd, IQR, mad, median
+* truncated moments,
+* distances between distributions
+  (Hellinger, Kolmogorov, total variation, "convex contamination")
+* lists of distributions,
+* conditional distributions in factorized form 
+* conditional expectations in factorized form
+-----------------------------------------------------------------------------------------
+We look forward to receiving questions, comments and suggestions
+
+Peter Ruckdeschel
+Matthias Kohl
+Thomas Stabla
+Florian Camphausen
+
-----------------------------------------------------------------------------------------
+DESCRIPTIONS
+-----------------------------------------------------------------------------------------
+Package: startupmsg
Version: 0.3
Date: 2006-04-30
Title: Utilities for start-up messages
Description: Utilities for start-up messages
Author: Peter Ruckdeschel
Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at uni-bayreuth.de>
Depends: R(>= 2.2.0)
SaveImage: no
LazyLoad: yes
License: GPL (version 2 or later)
-----------------------------------------------------------------------------------------
Package: distr
Version: 1.7
Date: 2006-04-30
Title: distr
Authors: Peter Ruckdeschel <peter.ruckdeschel at uni-bayreuth.de>,
Matthias Kohl <matthias.kohl@stamats.de>,
Thomas Stabla <statho3 at web.de>,
Florian Camphausen <fcampi at gmx.de>
+Maintainer: Peter Ruckdeschel <peter.ruckdeschel at uni-bayreuth.de>
+Description: S4 Classes for Distributions
+Depends: R (>= 2.2.0), (versions for <=2.2.0, on URL cited below), startupmsg
+License: GPL version 2 or later
+URL: http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/
+Reference:
+http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf
-----------------------------------------------------------------------------------------
Package: distrSim
Version: 1.7
Date: 2006-04-30
Title: Simulation classes based on package distr
Depends: R(>= 2.2.0), methods, graphics, setRNG(>= 2006.2-1),
         distr(>= 1.7), startupmsg
Imports: stats
Authors: Peter Ruckdeschel <peter.ruckdeschel at uni-bayreuth.de>,
Matthias Kohl <matthias.kohl@stamats.de>,
Thomas Stabla <statho3 at web.de>,
Florian Camphausen <fcampi at gmx.de>
+Description: Simulation (S4-)classes based on package distr
+Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at uni-bayreuth.de>
+License: GPL (version 2 or later)
+URL: http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/
+Reference:
+http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf
-----------------------------------------------------------------------------------------
Package: distrTEst
Version: 1.7
Date: 2006-04-30
Title: Estimation and Testing classes based on package distr
Depends: R(>= 2.2.0), methods, graphics, setRNG(>= 2006.2-1), 
         distr(>= 1.7), distrSim(>= 1.7), startupmsg
Imports: stats
Authors: Peter Ruckdeschel <peter.ruckdeschel at uni-bayreuth.de>,
Matthias Kohl <matthias.kohl at stamats.de>,
Thomas Stabla <statho3 at web.de>,
Florian Camphausen <fcampi at gmx.de>
+Description: Evaluation (S4-)classes based on package distr for
+evaluating procedures (estimators/tests) at data/simulation in 
+a unified way.
+Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at uni-bayreuth.de>
+License: GPL (version 2 or later)
+URL: http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/
+Reference:
+http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf
-----------------------------------------------------------------------------------------
Package: distrEx
Version: 0-4.3
Date: 2006-04-30
Title: Extensions of package distr
Description: Extensions of package distr and some additional functionality
Depends: R(>= 2.0.1), methods, distr(>= 1.7), evd, startupmsg
Authors: Matthias Kohl <Matthias.Kohl at stamats.de>,
+Peter Ruckdeschel <peter.ruckdeschel at uni-bayreuth.de>
+Maintainer: Matthias Kohl <Matthias.Kohl at stamats.de>
+License: GPL (version 2 or later)
+URL: http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/
+Reference:  http://stamats.de/ThesisMKohl.pdf , App. D
-----------------------------------------------------------------------------------------

+ + From noreply at r-forge.r-project.org Thu Sep 12 10:36:46 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 10:36:46 +0200 (CEST) Subject: [Robast-commits] r697 - branches/robast-0.9/pkg/RobLox pkg/ROptEstOld pkg/ROptEstOld/inst pkg/ROptRegTS pkg/ROptRegTS/R pkg/ROptRegTS/man pkg/ROptRegTS/tests/Examples pkg/RandVar pkg/RandVar/man pkg/RobAStBase pkg/RobExtremes pkg/RobLox pkg/RobLox/R pkg/RobLox/inst pkg/RobLox/man pkg/RobLox/tests/Examples pkg/RobLoxBioC pkg/RobLoxBioC/inst pkg/RobLoxBioC/man pkg/RobLoxBioC/tests/Examples pkg/RobRex pkg/RobRex/inst pkg/RobRex/tests/Examples Message-ID: <20130912083646.D881518513E@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 10:36:46 +0200 (Thu, 12 Sep 2013) New Revision: 697 Added: pkg/ROptEstOld/.Rbuildignore pkg/ROptRegTS/.Rbuildignore pkg/RobLox/.Rbuildignore pkg/RobLoxBioC/.Rbuildignore pkg/RobRex/.Rbuildignore Removed: pkg/ROptRegTS/chm/ pkg/RobLox/chm/ pkg/RobRex/chm/ Modified: branches/robast-0.9/pkg/RobLox/DESCRIPTION pkg/ROptEstOld/DESCRIPTION pkg/ROptEstOld/NAMESPACE pkg/ROptEstOld/inst/NEWS pkg/ROptRegTS/DESCRIPTION pkg/ROptRegTS/R/AllClass.R pkg/ROptRegTS/man/Av1CondContIC.Rd pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd pkg/ROptRegTS/man/Av2CondContIC.Rd pkg/ROptRegTS/man/CondContIC.Rd pkg/ROptRegTS/man/CondIC.Rd pkg/ROptRegTS/man/CondTotalVarIC.Rd pkg/ROptRegTS/man/L2RegTypeFamily.Rd pkg/ROptRegTS/man/getAsRiskRegTS.Rd pkg/ROptRegTS/man/getFiRiskRegTS.Rd pkg/ROptRegTS/man/getInfCentRegTS.Rd pkg/ROptRegTS/man/getInfClipRegTS.Rd pkg/ROptRegTS/man/getInfGammaRegTS.Rd pkg/ROptRegTS/man/getInfRobRegTypeIC.Rd pkg/ROptRegTS/man/getInfStandRegTS.Rd pkg/ROptRegTS/man/optIC-methods.Rd pkg/ROptRegTS/tests/Examples/ROptRegTS-Ex.Rout.save pkg/RandVar/DESCRIPTION pkg/RandVar/man/0RandVar-package.Rd pkg/RobAStBase/DESCRIPTION pkg/RobExtremes/DESCRIPTION pkg/RobLox/DESCRIPTION pkg/RobLox/NAMESPACE pkg/RobLox/R/rowRoblox.R pkg/RobLox/inst/NEWS pkg/RobLox/man/0RobLox-package.Rd pkg/RobLox/man/rlsOptIC.AL.Rd pkg/RobLox/man/rlsOptIC.An1.Rd pkg/RobLox/man/rlsOptIC.Ha3.Rd pkg/RobLox/man/roblox.Rd pkg/RobLox/tests/Examples/RobLox-Ex.Rout.save pkg/RobLoxBioC/DESCRIPTION pkg/RobLoxBioC/NAMESPACE pkg/RobLoxBioC/inst/NEWS pkg/RobLoxBioC/man/0RobLoxBioC-package.Rd pkg/RobLoxBioC/man/robloxbioc.Rd pkg/RobLoxBioC/tests/Examples/RobLoxBioC-Ex.Rout.save pkg/RobRex/DESCRIPTION pkg/RobRex/inst/NEWS pkg/RobRex/tests/Examples/RobRex-Ex.Rout.save Log: + merged branches/robast-0.9 back into trunk completely + fixed some Depends (>=..) + deleted some chm folders + updated date and SVNRevision in DESCRIPTION Modified: branches/robast-0.9/pkg/RobLox/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/RobLox/DESCRIPTION 2013-09-11 17:40:27 UTC (rev 696) +++ branches/robast-0.9/pkg/RobLox/DESCRIPTION 2013-09-12 08:36:46 UTC (rev 697) @@ -1,5 +1,5 @@ Package: RobLox -Version: 0.9 +Version: 0.9.1 Date: 2013-01-29 Title: Optimally robust influence curves and estimators for location and scale Description: Functions for the determination of optimally robust influence curves and Added: pkg/ROptEstOld/.Rbuildignore =================================================================== --- pkg/ROptEstOld/.Rbuildignore (rev 0) +++ pkg/ROptEstOld/.Rbuildignore 2013-09-12 08:36:46 UTC (rev 697) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: pkg/ROptEstOld/DESCRIPTION =================================================================== --- pkg/ROptEstOld/DESCRIPTION 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptEstOld/DESCRIPTION 2013-09-12 08:36:46 UTC (rev 697) @@ -1,10 +1,10 @@ Package: ROptEstOld Version: 0.9.1 -Date: 2013-02-08 +Date: 2013-09-12 Title: Optimally robust estimation - old version Description: Optimally robust estimation using S4 classes and methods. Old version still needed for current versions of ROptRegTS and RobRex. -Depends: R(>= 2.4.0), methods, distr(>= 2.4), distrEx(>= 2.4), RandVar(>= 0.8), evd +Depends: R(>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.2), RandVar(>= 0.9), evd Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes @@ -14,4 +14,4 @@ Encoding: latin1 LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 591 +SVNRevision: 696 Modified: pkg/ROptEstOld/NAMESPACE =================================================================== --- pkg/ROptEstOld/NAMESPACE 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptEstOld/NAMESPACE 2013-09-12 08:36:46 UTC (rev 697) @@ -2,6 +2,7 @@ import("distr") import("distrEx") import("RandVar") +import("evd") exportClasses("FunctionSymmetry", "NonSymmetric", Modified: pkg/ROptEstOld/inst/NEWS =================================================================== --- pkg/ROptEstOld/inst/NEWS 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptEstOld/inst/NEWS 2013-09-12 08:36:46 UTC (rev 697) @@ -10,11 +10,23 @@ ####################################### version 0.9 ####################################### -EVD functionality (including Gumbel distribution) has + +user-visible CHANGES: ++ EVD functionality (including Gumbel distribution) has been moved from distrEx to new pkg RobExtremes; to avoid failure of ROptEstOld, this functionality has been copied to ROptEstOld as well. +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + +BUGFIXES + + ####################################### version 0.8 ####################################### Added: pkg/ROptRegTS/.Rbuildignore =================================================================== --- pkg/ROptRegTS/.Rbuildignore (rev 0) +++ pkg/ROptRegTS/.Rbuildignore 2013-09-12 08:36:46 UTC (rev 697) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Modified: pkg/ROptRegTS/DESCRIPTION =================================================================== --- pkg/ROptRegTS/DESCRIPTION 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/DESCRIPTION 2013-09-12 08:36:46 UTC (rev 697) @@ -1,18 +1,18 @@ Package: ROptRegTS -Version: 0.8.1 -Date: 2011-09-30 +Version: 0.9 +Date: 2013-09-12 Title: Optimally robust estimation for regression-type models Description: Optimally robust estimation for regression-type models using S4 classes and methods -Depends: R (>= 2.4.0), methods, distr(>= 1.9), distrEx(>= 1.9), RandVar(>= 0.6), ROptEstOld(>= - 0.5.2) +Depends: R (>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.5), RandVar(>= 0.9), ROptEstOld(>= + 0.9.1) Author: Matthias Kohl , Peter Ruckdeschel Maintainer: Matthias Kohl +LazyLoad: yes ByteCompile: yes -LazyLoad: yes License: LGPL-3 Encoding: latin1 URL: http://robast.r-forge.r-project.org/ LastChangedDate: {$LastChangedDate$} LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 454 +SVNRevision: 696 Modified: pkg/ROptRegTS/R/AllClass.R =================================================================== --- pkg/ROptRegTS/R/AllClass.R 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/R/AllClass.R 2013-09-12 08:36:46 UTC (rev 697) @@ -1,9 +1,4 @@ .onLoad <- function(lib, pkg){ - require("methods", character = TRUE, quietly = TRUE) - require("distr", character = TRUE, quietly = TRUE) - require("distrEx", character = TRUE, quietly = TRUE) - require("RandVar", character = TRUE, quietly = TRUE) - require("ROptEstOld", character = TRUE, quietly = TRUE) } # Regression type families Modified: pkg/ROptRegTS/man/Av1CondContIC.Rd =================================================================== --- pkg/ROptRegTS/man/Av1CondContIC.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/Av1CondContIC.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -13,11 +13,13 @@ } \usage{ Av1CondContIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x){x[1]*x[2]}), - Domain = EuclideanSpace(dimension = 2))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x){x[1]*x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clip = Inf, stand = as.matrix(1), - cent = EuclRandVarList(RealRandVariable(Map = list(function(x){numeric(length(x))}), - Domain = EuclideanSpace(dimension = 2))), + cent = EuclRandVarList(RealRandVariable( + Map = list(function(x){numeric(length(x))}), + Domain = EuclideanSpace(dimension = 2))), lowerCase = NULL, neighborRadius = 0) } \arguments{ Modified: pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd =================================================================== --- pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -13,12 +13,13 @@ } \usage{ Av1CondTotalVarIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 1))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clipUp = Inf, stand = as.matrix(1), - clipLo = RealRandVariable(Map = list(function(x) {-Inf}, + clipLo = RealRandVariable(Map = list(function(x) {-Inf}), Domain = EuclideanSpace(dimension = 1)), - Domain = EuclideanSpace(dimension = 2)), lowerCase = NULL, neighborRadius = 0) + lowerCase = NULL, neighborRadius = 0) } \arguments{ \item{name}{ object of class \code{"character"}. } Modified: pkg/ROptRegTS/man/Av2CondContIC.Rd =================================================================== --- pkg/ROptRegTS/man/Av2CondContIC.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/Av2CondContIC.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -12,9 +12,11 @@ } \usage{ Av2CondContIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2))), - Risks, Infos, clip = Inf, stand = 1, cent = 0, lowerCase = NULL, neighborRadius = 0) + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2))), + Risks, Infos, clip = Inf, stand = 1, cent = 0, lowerCase = NULL, + neighborRadius = 0) } \arguments{ \item{name}{ object of class \code{"character"}. } Modified: pkg/ROptRegTS/man/CondContIC.Rd =================================================================== --- pkg/ROptRegTS/man/CondContIC.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/CondContIC.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -13,13 +13,15 @@ } \usage{ CondContIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x){x[1]*x[2]}), - Domain = EuclideanSpace(dimension = 2))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x){x[1]*x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clip = RealRandVariable(Map = list(function(x){ Inf }), Domain = Reals()), stand = as.matrix(1), - cent = EuclRandVarList(RealRandVariable(Map = list(function(x){numeric(length(x))}), - Domain = EuclideanSpace(dimension = 2))), + cent = EuclRandVarList(RealRandVariable( + Map = list(function(x){numeric(length(x))}), + Domain = EuclideanSpace(dimension = 2))), lowerCase = NULL, neighborRadius = 0, neighborRadiusCurve = function(x){1}) } \arguments{ Modified: pkg/ROptRegTS/man/CondIC.Rd =================================================================== --- pkg/ROptRegTS/man/CondIC.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/CondIC.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -6,8 +6,10 @@ Generates an object of class \code{"CondIC"}. } \usage{ -CondIC(name, Curve = EuclRandVarList(EuclRandVariable(Map = list(function(x){x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2))), +CondIC(name, Curve = EuclRandVarList(EuclRandVariable( + Map = list(function(x){x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2), + Range = Reals())), Risks, Infos, CallL2Fam = call("L2RegTypeFamily")) } \arguments{ Modified: pkg/ROptRegTS/man/CondTotalVarIC.Rd =================================================================== --- pkg/ROptRegTS/man/CondTotalVarIC.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/CondTotalVarIC.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -13,8 +13,9 @@ } \usage{ CondTotalVarIC(name, CallL2Fam = call("L2RegTypeFamily"), - Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 1))), + Curve = EuclRandVarList(RealRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2))), Risks, Infos, clipUp = RealRandVariable(Map = list(function(x) {Inf}), Domain = Reals()), stand = as.matrix(1), Modified: pkg/ROptRegTS/man/L2RegTypeFamily.Rd =================================================================== --- pkg/ROptRegTS/man/L2RegTypeFamily.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/L2RegTypeFamily.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -8,9 +8,10 @@ \usage{ L2RegTypeFamily(name, distribution = LMCondDistribution(), distrSymm, main = 0, nuisance, trafo, param, props = character(0), - L2deriv = EuclRandVarList(EuclRandVariable(Map = list(function(x) {x[1] * x[2]}), - Domain = EuclideanSpace(dimension = 2), - dimension = 1)), + L2deriv = EuclRandVarList(EuclRandVariable( + Map = list(function(x) {x[1] * x[2]}), + Domain = EuclideanSpace(dimension = 2), + dimension = 1)), ErrorDistr = Norm(), ErrorSymm, RegDistr = Norm(), RegSymm, Regressor = RealRandVariable(Map = list(function(x) {x}), Domain = Reals()), ErrorL2deriv = EuclRandVarList(RealRandVariable(Map = list(function(x) {x}), Modified: pkg/ROptRegTS/man/getAsRiskRegTS.Rd =================================================================== --- pkg/ROptRegTS/man/getAsRiskRegTS.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/getAsRiskRegTS.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -25,47 +25,56 @@ \usage{ getAsRiskRegTS(risk, ErrorL2deriv, Regressor, neighbor, ...) -\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Neighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, trafo) +\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Neighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand, trafo) -\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Av2CondContNeighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, trafo) +\S4method{getAsRiskRegTS}{asMSE,UnivariateDistribution,Distribution,Av2CondContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand, trafo) -\S4method{getAsRiskRegTS}{asMSE,EuclRandVariable,Distribution,Neighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, trafo) +\S4method{getAsRiskRegTS}{asMSE,EuclRandVariable,Distribution,Neighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand, trafo) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,ContNeighborhood}(risk, ErrorL2deriv, - Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,ContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondTotalVarNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,UnivariateDistribution,Av1CondTotalVarNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,ContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,ContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,Av1CondContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,Av1CondContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,Av1CondTotalVarNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,MultivariateDistribution,Av1CondTotalVarNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,Distribution,Av2CondContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, trafo, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,UnivariateDistribution,Distribution,Av2CondContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorL2derivDistrSymm, + trafo, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,RealRandVariable,Distribution,ContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorDistr, trafo, z.start, A.start, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,RealRandVariable,Distribution,ContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorDistr, trafo, z.start, + A.start, maxiter, tol) -\S4method{getAsRiskRegTS}{asBias,RealRandVariable,Distribution,Av1CondContNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, ErrorDistr, trafo, z.start, A.start, maxiter, tol) +\S4method{getAsRiskRegTS}{asBias,RealRandVariable,Distribution,Av1CondContNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, ErrorDistr, trafo, z.start, + A.start, maxiter, tol) -\S4method{getAsRiskRegTS}{asUnOvShoot,UnivariateDistribution,UnivariateDistribution,UncondNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, clip, cent, stand) +\S4method{getAsRiskRegTS}{asUnOvShoot,UnivariateDistribution,UnivariateDistribution,UncondNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand) -\S4method{getAsRiskRegTS}{asUnOvShoot,UnivariateDistribution,UnivariateDistribution,CondNeighborhood}(risk, - ErrorL2deriv, Regressor, neighbor, clip, cent, stand) +\S4method{getAsRiskRegTS}{asUnOvShoot,UnivariateDistribution,UnivariateDistribution,CondNeighborhood}( + risk, ErrorL2deriv, Regressor, neighbor, clip, cent, stand) } \arguments{ Modified: pkg/ROptRegTS/man/getFiRiskRegTS.Rd =================================================================== --- pkg/ROptRegTS/man/getFiRiskRegTS.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/getFiRiskRegTS.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -15,17 +15,20 @@ \usage{ getFiRiskRegTS(risk, ErrorDistr, Regressor, neighbor, ...) -\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,ContNeighborhood}(risk, - ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, Algo, cont) +\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,ContNeighborhood}( + risk, ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, + Algo, cont) -\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,TotalVarNeighborhood}(risk, - ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, Algo, cont) +\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,TotalVarNeighborhood}( + risk, ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, + Algo, cont) -\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,CondContNeighborhood}(risk, - ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, cont) +\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,CondContNeighborhood}( + risk, ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, + cont) -\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,CondTotalVarNeighborhood}(risk, - ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, cont) +\S4method{getFiRiskRegTS}{fiUnOvShoot,Norm,UnivariateDistribution,CondTotalVarNeighborhood}( + risk, ErrorDistr, Regressor, neighbor, clip, stand, sampleSize, cont) } \arguments{ \item{risk}{ object of class \code{"RiskType"}. } Modified: pkg/ROptRegTS/man/getInfCentRegTS.Rd =================================================================== --- pkg/ROptRegTS/man/getInfCentRegTS.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/getInfCentRegTS.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -25,35 +25,38 @@ \usage{ getInfCentRegTS(ErrorL2deriv, Regressor, neighbor, ...) -\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,ContNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, z.comp) +\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,ContNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, stand, z.comp) -\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,TotalVarNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, z.comp) +\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,TotalVarNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, z.comp) -\S4method{getInfCentRegTS}{UnivariateDistribution,numeric,CondTotalVarNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, z.comp) +\S4method{getInfCentRegTS}{UnivariateDistribution,numeric,CondTotalVarNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, z.comp) -\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,Av1CondContNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, z.comp, x.vec) +\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,Av1CondContNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, stand, z.comp, x.vec) -\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,Av1CondTotalVarNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, z.comp, x.vec, tol.z) +\S4method{getInfCentRegTS}{UnivariateDistribution,UnivariateDistribution,Av1CondTotalVarNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, stand, z.comp, x.vec, + tol.z) -\S4method{getInfCentRegTS}{UnivariateDistribution,MultivariateDistribution,ContNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, z.comp) +\S4method{getInfCentRegTS}{UnivariateDistribution,MultivariateDistribution,ContNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, stand, z.comp) -\S4method{getInfCentRegTS}{UnivariateDistribution,MultivariateDistribution,Av1CondContNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, z.comp, x.vec) +\S4method{getInfCentRegTS}{UnivariateDistribution,MultivariateDistribution,Av1CondContNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, stand, z.comp, x.vec) -\S4method{getInfCentRegTS}{UnivariateDistribution,Distribution,Av2CondContNeighborhood}(ErrorL2deriv, - Regressor, neighbor, clip, cent, stand, z.comp, tol.z) +\S4method{getInfCentRegTS}{UnivariateDistribution,Distribution,Av2CondContNeighborhood}( + ErrorL2deriv, Regressor, neighbor, clip, cent, stand, z.comp, tol.z) -\S4method{getInfCentRegTS}{RealRandVariable,Distribution,ContNeighborhood}(ErrorL2deriv, - Regressor, neighbor, ErrorDistr, stand, cent, clip, z.comp) +\S4method{getInfCentRegTS}{RealRandVariable,Distribution,ContNeighborhood}( + ErrorL2deriv, Regressor, neighbor, ErrorDistr, stand, cent, clip, + z.comp) -\S4method{getInfCentRegTS}{RealRandVariable,Distribution,Av1CondContNeighborhood}(ErrorL2deriv, - Regressor, neighbor, ErrorDistr, stand, cent, clip, z.comp, x.vec) +\S4method{getInfCentRegTS}{RealRandVariable,Distribution,Av1CondContNeighborhood}( + ErrorL2deriv, Regressor, neighbor, ErrorDistr, stand, cent, clip, + z.comp, x.vec) } \arguments{ \item{ErrorL2deriv}{ L2-derivative of \code{ErrorDistr}. } Modified: pkg/ROptRegTS/man/getInfClipRegTS.Rd =================================================================== --- pkg/ROptRegTS/man/getInfClipRegTS.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/getInfClipRegTS.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -15,20 +15,21 @@ \usage{ getInfClipRegTS(clip, ErrorL2deriv, Regressor, risk, neighbor, ...) -\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,Distribution,asMSE,Neighborhood}(clip, - ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent) +\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,Distribution,asMSE,Neighborhood}( + clip, ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent) -\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,Distribution,asMSE,Av1CondTotalVarNeighborhood}(clip, - ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent) +\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,Distribution,asMSE,Av1CondTotalVarNeighborhood}( + clip, ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent) -\S4method{getInfClipRegTS}{numeric,EuclRandVariable,Distribution,asMSE,Neighborhood}(clip, ErrorL2deriv, - Regressor, risk, neighbor, ErrorDistr, stand, cent, trafo) +\S4method{getInfClipRegTS}{numeric,EuclRandVariable,Distribution,asMSE,Neighborhood}( + clip, ErrorL2deriv, Regressor, risk, neighbor, ErrorDistr, stand, + cent, trafo) -\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,UnivariateDistribution,asUnOvShoot,UncondNeighborhood}(clip, - ErrorL2deriv, Regressor, risk, neighbor, z.comp, cent) +\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,UnivariateDistribution,asUnOvShoot,UncondNeighborhood}( + clip, ErrorL2deriv, Regressor, risk, neighbor, z.comp, cent) -\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,numeric,asUnOvShoot,CondNeighborhood}(clip, - ErrorL2deriv, Regressor, risk, neighbor) +\S4method{getInfClipRegTS}{numeric,UnivariateDistribution,numeric,asUnOvShoot,CondNeighborhood}( + clip, ErrorL2deriv, Regressor, risk, neighbor) } \arguments{ \item{clip}{ optimal clipping bound. } Modified: pkg/ROptRegTS/man/getInfGammaRegTS.Rd =================================================================== --- pkg/ROptRegTS/man/getInfGammaRegTS.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/getInfGammaRegTS.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -24,44 +24,46 @@ \usage{ getInfGammaRegTS(ErrorL2deriv, Regressor, risk, neighbor, ...) -\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asMSE,ContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, z.comp, stand, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asMSE,ContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asMSE,Av1CondContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, z.comp, stand, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asMSE,Av1CondContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asMSE,Av1CondTotalVarNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, z.comp, stand, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asMSE,Av1CondTotalVarNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,MultivariateDistribution,asMSE,ContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, z.comp, stand, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,MultivariateDistribution,asMSE,ContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,MultivariateDistribution,asMSE,Av1CondContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, z.comp, stand, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,MultivariateDistribution,asMSE,Av1CondContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,MultivariateDistribution,asMSE,Av1CondTotalVarNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, z.comp, stand, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,MultivariateDistribution,asMSE,Av1CondTotalVarNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,Distribution,asMSE,Av2CondContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, z.comp, stand, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,Distribution,asMSE,Av2CondContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, z.comp, stand, cent, clip) -\S4method{getInfGammaRegTS}{RealRandVariable,Distribution,asMSE,ContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, ErrorDistr, stand, cent, clip) +\S4method{getInfGammaRegTS}{RealRandVariable,Distribution,asMSE,ContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, ErrorDistr, stand, cent, + clip) -\S4method{getInfGammaRegTS}{RealRandVariable,Distribution,asMSE,Av1CondContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, ErrorDistr, stand, cent, clip) +\S4method{getInfGammaRegTS}{RealRandVariable,Distribution,asMSE,Av1CondContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, ErrorDistr, stand, cent, + clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asUnOvShoot,ContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asUnOvShoot,ContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asUnOvShoot,TotalVarNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, cent, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,UnivariateDistribution,asUnOvShoot,TotalVarNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, cent, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,numeric,asUnOvShoot,CondContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,numeric,asUnOvShoot,CondContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, clip) -\S4method{getInfGammaRegTS}{UnivariateDistribution,numeric,asUnOvShoot,CondTotalVarNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, clip) +\S4method{getInfGammaRegTS}{UnivariateDistribution,numeric,asUnOvShoot,CondTotalVarNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, clip) } \arguments{ \item{ErrorL2deriv}{ L2-derivative of \code{ErrorDistr}. } Modified: pkg/ROptRegTS/man/getInfRobRegTypeIC.Rd =================================================================== --- pkg/ROptRegTS/man/getInfRobRegTypeIC.Rd 2013-09-11 17:40:27 UTC (rev 696) +++ pkg/ROptRegTS/man/getInfRobRegTypeIC.Rd 2013-09-12 08:36:46 UTC (rev 697) @@ -36,100 +36,111 @@ \usage{ getInfRobRegTypeIC(ErrorL2deriv, Regressor, risk, neighbor, ...) -\S4method{getInfRobRegTypeIC}{UnivariateDistribution,UnivariateDistribution,asBias,ContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, ErrorL2derivDistrSymm, RegSymm, Finfo, trafo, - upper, maxiter, tol, warn) +\S4method{getInfRobRegTypeIC}{UnivariateDistribution,UnivariateDistribution,asBias,ContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, ErrorL2derivDistrSymm, + RegSymm, Finfo, trafo, upper, maxiter, tol, warn) -\S4method{getInfRobRegTypeIC}{UnivariateDistribution,UnivariateDistribution,asBias,Av1CondContNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, ErrorL2derivDistrSymm, RegSymm, Finfo, trafo, - upper, maxiter, tol, warn) +\S4method{getInfRobRegTypeIC}{UnivariateDistribution,UnivariateDistribution,asBias,Av1CondContNeighborhood}( + ErrorL2deriv, Regressor, risk, neighbor, ErrorL2derivDistrSymm, + RegSymm, Finfo, trafo, upper, maxiter, tol, warn) -\S4method{getInfRobRegTypeIC}{UnivariateDistribution,UnivariateDistribution,asBias,Av1CondTotalVarNeighborhood}(ErrorL2deriv, - Regressor, risk, neighbor, ErrorL2derivDistrSymm, RegSymm, Finfo, trafo, - upper, maxiter, tol, warn) +\S4method{getInfRobRegTypeIC}{UnivariateDistribution,UnivariateDistribution,asBias,Av1CondTotalVarNeighborhood}( [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 697 From noreply at r-forge.r-project.org Thu Sep 12 10:38:43 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 10:38:43 +0200 (CEST) Subject: [Robast-commits] r698 - in branches: . robast-1.0 Message-ID: <20130912083843.530F418513E@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 10:38:43 +0200 (Thu, 12 Sep 2013) New Revision: 698 Added: branches/robast-1.0/ branches/robast-1.0/pkg/ Log: branches/robast-1.0 created From noreply at r-forge.r-project.org Thu Sep 12 10:45:19 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 10:45:19 +0200 (CEST) Subject: [Robast-commits] r699 - in branches/robast-1.0/pkg: . ROptEst ROptEst/man ROptEstOld ROptEstOld/inst ROptRegTS ROptRegTS/R ROptRegTS/man ROptRegTS/tests/Examples RandVar RandVar/man RobAStBase RobAStBase/man RobAStRDA RobAStRDA/man RobLox RobLox/R RobLox/inst RobLox/man RobLox/tests/Examples RobLoxBioC RobLoxBioC/inst RobLoxBioC/man RobLoxBioC/tests/Examples RobRex RobRex/inst RobRex/tests/Examples Message-ID: <20130912084519.2682C1859EC@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 10:45:18 +0200 (Thu, 12 Sep 2013) New Revision: 699 Added: branches/robast-1.0/pkg/ROptEst/ branches/robast-1.0/pkg/ROptEst/DESCRIPTION branches/robast-1.0/pkg/ROptEst/man/0ROptEst-package.Rd branches/robast-1.0/pkg/ROptEstOld/ branches/robast-1.0/pkg/ROptEstOld/.Rbuildignore branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION branches/robast-1.0/pkg/ROptEstOld/NAMESPACE branches/robast-1.0/pkg/ROptEstOld/inst/NEWS branches/robast-1.0/pkg/ROptRegTS/ branches/robast-1.0/pkg/ROptRegTS/.Rbuildignore branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION branches/robast-1.0/pkg/ROptRegTS/R/AllClass.R branches/robast-1.0/pkg/ROptRegTS/man/Av1CondContIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/Av2CondContIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/CondContIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/CondIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/CondTotalVarIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/L2RegTypeFamily.Rd branches/robast-1.0/pkg/ROptRegTS/man/getAsRiskRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getFiRiskRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfCentRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfClipRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfGammaRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfRobRegTypeIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfStandRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/optIC-methods.Rd branches/robast-1.0/pkg/ROptRegTS/tests/Examples/ROptRegTS-Ex.Rout.save branches/robast-1.0/pkg/RandVar/ branches/robast-1.0/pkg/RandVar/DESCRIPTION branches/robast-1.0/pkg/RandVar/man/0RandVar-package.Rd branches/robast-1.0/pkg/RobAStBase/ branches/robast-1.0/pkg/RobAStBase/DESCRIPTION branches/robast-1.0/pkg/RobAStBase/man/0RobAStBase-package.Rd branches/robast-1.0/pkg/RobAStRDA/ branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION branches/robast-1.0/pkg/RobAStRDA/man/0RobRDA-package.Rd branches/robast-1.0/pkg/RobLox/ branches/robast-1.0/pkg/RobLox/.Rbuildignore branches/robast-1.0/pkg/RobLox/DESCRIPTION branches/robast-1.0/pkg/RobLox/NAMESPACE branches/robast-1.0/pkg/RobLox/R/rowRoblox.R branches/robast-1.0/pkg/RobLox/inst/NEWS branches/robast-1.0/pkg/RobLox/man/0RobLox-package.Rd branches/robast-1.0/pkg/RobLox/man/rlsOptIC.AL.Rd branches/robast-1.0/pkg/RobLox/man/rlsOptIC.An1.Rd branches/robast-1.0/pkg/RobLox/man/rlsOptIC.Ha3.Rd branches/robast-1.0/pkg/RobLox/man/roblox.Rd branches/robast-1.0/pkg/RobLox/tests/Examples/RobLox-Ex.Rout.save branches/robast-1.0/pkg/RobLoxBioC/ branches/robast-1.0/pkg/RobLoxBioC/.Rbuildignore branches/robast-1.0/pkg/RobLoxBioC/DESCRIPTION branches/robast-1.0/pkg/RobLoxBioC/NAMESPACE branches/robast-1.0/pkg/RobLoxBioC/inst/NEWS branches/robast-1.0/pkg/RobLoxBioC/man/0RobLoxBioC-package.Rd branches/robast-1.0/pkg/RobLoxBioC/man/robloxbioc.Rd branches/robast-1.0/pkg/RobLoxBioC/tests/Examples/RobLoxBioC-Ex.Rout.save branches/robast-1.0/pkg/RobRex/ branches/robast-1.0/pkg/RobRex/.Rbuildignore branches/robast-1.0/pkg/RobRex/DESCRIPTION branches/robast-1.0/pkg/RobRex/inst/NEWS branches/robast-1.0/pkg/RobRex/tests/Examples/RobRex-Ex.Rout.save Removed: branches/robast-1.0/pkg/ROptEst/DESCRIPTION branches/robast-1.0/pkg/ROptEst/man/0ROptEst-package.Rd branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION branches/robast-1.0/pkg/ROptEstOld/NAMESPACE branches/robast-1.0/pkg/ROptEstOld/inst/NEWS branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION branches/robast-1.0/pkg/ROptRegTS/R/AllClass.R branches/robast-1.0/pkg/ROptRegTS/chm/ branches/robast-1.0/pkg/ROptRegTS/man/Av1CondContIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/Av2CondContIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/CondContIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/CondIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/CondTotalVarIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/L2RegTypeFamily.Rd branches/robast-1.0/pkg/ROptRegTS/man/getAsRiskRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getFiRiskRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfCentRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfClipRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfGammaRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfRobRegTypeIC.Rd branches/robast-1.0/pkg/ROptRegTS/man/getInfStandRegTS.Rd branches/robast-1.0/pkg/ROptRegTS/man/optIC-methods.Rd branches/robast-1.0/pkg/ROptRegTS/tests/Examples/ROptRegTS-Ex.Rout.save branches/robast-1.0/pkg/RandVar/DESCRIPTION branches/robast-1.0/pkg/RandVar/man/0RandVar-package.Rd branches/robast-1.0/pkg/RobAStBase/DESCRIPTION branches/robast-1.0/pkg/RobAStBase/man/0RobAStBase-package.Rd branches/robast-1.0/pkg/RobAStRDA/DESCRIPTION branches/robast-1.0/pkg/RobAStRDA/man/0RobRDA-package.Rd branches/robast-1.0/pkg/RobLox/DESCRIPTION branches/robast-1.0/pkg/RobLox/NAMESPACE branches/robast-1.0/pkg/RobLox/R/rowRoblox.R branches/robast-1.0/pkg/RobLox/chm/ branches/robast-1.0/pkg/RobLox/inst/NEWS branches/robast-1.0/pkg/RobLox/man/0RobLox-package.Rd branches/robast-1.0/pkg/RobLox/man/rlsOptIC.AL.Rd branches/robast-1.0/pkg/RobLox/man/rlsOptIC.An1.Rd branches/robast-1.0/pkg/RobLox/man/rlsOptIC.Ha3.Rd branches/robast-1.0/pkg/RobLox/man/roblox.Rd branches/robast-1.0/pkg/RobLox/tests/Examples/RobLox-Ex.Rout.save branches/robast-1.0/pkg/RobLoxBioC/DESCRIPTION branches/robast-1.0/pkg/RobLoxBioC/NAMESPACE branches/robast-1.0/pkg/RobLoxBioC/inst/NEWS branches/robast-1.0/pkg/RobLoxBioC/man/0RobLoxBioC-package.Rd branches/robast-1.0/pkg/RobLoxBioC/man/robloxbioc.Rd branches/robast-1.0/pkg/RobLoxBioC/tests/Examples/RobLoxBioC-Ex.Rout.save branches/robast-1.0/pkg/RobRex/DESCRIPTION branches/robast-1.0/pkg/RobRex/chm/ branches/robast-1.0/pkg/RobRex/inst/NEWS branches/robast-1.0/pkg/RobRex/tests/Examples/RobRex-Ex.Rout.save Log: copied Rpkgs from trunk to devel/robast-1.0 Deleted: branches/robast-1.0/pkg/ROptEst/DESCRIPTION =================================================================== --- pkg/ROptEst/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) @@ -1,17 +0,0 @@ -Package: ROptEst -Version: 0.9 -Date: 2013-09-11 -Title: Optimally robust estimation -Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods. -Depends: R(>= 2.10.0), methods, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>= 0.6.4), RobAStBase -Suggests: RobLox, MASS -Author: Matthias Kohl, Peter Ruckdeschel -Maintainer: Matthias Kohl -ByteCompile: yes -LazyLoad: yes -License: LGPL-3 -URL: http://robast.r-forge.r-project.org/ -Encoding: latin1 -LastChangedDate: {$LastChangedDate$} -LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 693 Copied: branches/robast-1.0/pkg/ROptEst/DESCRIPTION (from rev 695, pkg/ROptEst/DESCRIPTION) =================================================================== --- branches/robast-1.0/pkg/ROptEst/DESCRIPTION (rev 0) +++ branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,19 @@ +Package: ROptEst +Version: 1.0 +Date: 2013-09-12 +Title: Optimally robust estimation +Description: Optimally robust estimation in general smoothly parameterized models using S4 + classes and methods. +Depends: R(>= 2.10.0), methods, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>= + 0.6.4), RobAStBase +Suggests: RobLox, MASS +Author: Matthias Kohl, Peter Ruckdeschel +Maintainer: Matthias Kohl +ByteCompile: yes +LazyLoad: yes +License: LGPL-3 +URL: http://robast.r-forge.r-project.org/ +Encoding: latin1 +LastChangedDate: {$LastChangedDate$} +LastChangedRevision: {$LastChangedRevision$} +SVNRevision: -Inf Deleted: branches/robast-1.0/pkg/ROptEst/man/0ROptEst-package.Rd =================================================================== --- pkg/ROptEst/man/0ROptEst-package.Rd 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/ROptEst/man/0ROptEst-package.Rd 2013-09-12 08:45:18 UTC (rev 699) @@ -1,74 +0,0 @@ -\name{ROptEst-package} -\alias{ROptEst-package} -\alias{ROptEst} -\docType{package} -\title{ -Optimally robust estimation -} -\description{ -Optimally robust estimation in general smoothly parameterized models -using S4 classes and methods. -} -\details{ -\tabular{ll}{ -Package: \tab ROptEst \cr -Version: \tab 0.9 \cr -Date: \tab 2013-09-11 \cr -Depends: \tab R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0), -distrMod(>= 2.0), RandVar(>= 0.6.4), RobAStBase \cr -LazyLoad: \tab yes \cr -License: \tab LGPL-3 \cr -URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 693 \cr -} -} -\author{ -Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de},\cr% -Matthias Kohl \email{Matthias.Kohl at stamats.de}\cr - -Maintainer: Matthias Kohl \email{matthias.kohl at stamats.de}} -\references{ - M. Kohl (2005). Numerical Contributions to the Asymptotic Theory of Robustness. - Dissertation. University of Bayreuth. -} -\seealso{ -\code{\link[distr:0distr-package]{distr-package}}, -\code{\link[distrEx:0distrEx-package]{distrEx-package}}, -\code{\link[distrMod:0distrMod-package]{distrMod-package}}, -\code{\link[RandVar:0RandVar-package]{RandVar-package}}, -\code{\link[RobAStBase:0RobAStBase-package]{RobAStBase-package}} -} -\section{Package versions}{ -Note: The first two numbers of package versions do not necessarily reflect - package-individual development, but rather are chosen for the - RobAStXXX family as a whole in order to ease updating "depends" - information. -} -\examples{ -library(ROptEst) - -## Example: Rutherford-Geiger (1910); cf. Feller~(1968), Section VI.7 (a) -x <- c(rep(0, 57), rep(1, 203), rep(2, 383), rep(3, 525), rep(4, 532), - rep(5, 408), rep(6, 273), rep(7, 139), rep(8, 45), rep(9, 27), - rep(10, 10), rep(11, 4), rep(12, 0), rep(13, 1), rep(14, 1)) - -## ML-estimate from package distrMod -MLest <- MLEstimator(x, PoisFamily()) -MLest -## confidence interval based on CLT -confint(MLest) - -## compute optimally (w.r.t to MSE) robust estimator (unknown contamination) -robEst <- roptest(x, PoisFamily(), eps.upper = 0.1, steps = 3) -estimate(robEst) -## check influence curve -pIC(robEst) -checkIC(pIC(robEst)) -## plot influence curve -plot(pIC(robEst)) -## confidence interval based on LAN - neglecting bias -confint(robEst) -## confidence interval based on LAN - including bias -confint(robEst, method = symmetricBias()) -} -\keyword{package} Copied: branches/robast-1.0/pkg/ROptEst/man/0ROptEst-package.Rd (from rev 695, pkg/ROptEst/man/0ROptEst-package.Rd) =================================================================== --- branches/robast-1.0/pkg/ROptEst/man/0ROptEst-package.Rd (rev 0) +++ branches/robast-1.0/pkg/ROptEst/man/0ROptEst-package.Rd 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,74 @@ +\name{ROptEst-package} +\alias{ROptEst-package} +\alias{ROptEst} +\docType{package} +\title{ +Optimally robust estimation +} +\description{ +Optimally robust estimation in general smoothly parameterized models +using S4 classes and methods. +} +\details{ +\tabular{ll}{ +Package: \tab ROptEst \cr +Version: \tab 1.0 \cr +Date: \tab 2013-09-12 \cr +Depends: \tab R(>= 2.7.0), methods, distr(>= 2.0), distrEx(>= 2.0), +distrMod(>= 2.0), RandVar(>= 0.6.4), RobAStBase \cr +LazyLoad: \tab yes \cr +License: \tab LGPL-3 \cr +URL: \tab http://robast.r-forge.r-project.org/\cr +SVNRevision: \tab -Inf \cr +} +} +\author{ +Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de},\cr% +Matthias Kohl \email{Matthias.Kohl at stamats.de}\cr + +Maintainer: Matthias Kohl \email{matthias.kohl at stamats.de}} +\references{ + M. Kohl (2005). Numerical Contributions to the Asymptotic Theory of Robustness. + Dissertation. University of Bayreuth. +} +\seealso{ +\code{\link[distr:0distr-package]{distr-package}}, +\code{\link[distrEx:0distrEx-package]{distrEx-package}}, +\code{\link[distrMod:0distrMod-package]{distrMod-package}}, +\code{\link[RandVar:0RandVar-package]{RandVar-package}}, +\code{\link[RobAStBase:0RobAStBase-package]{RobAStBase-package}} +} +\section{Package versions}{ +Note: The first two numbers of package versions do not necessarily reflect + package-individual development, but rather are chosen for the + RobAStXXX family as a whole in order to ease updating "depends" + information. +} +\examples{ +library(ROptEst) + +## Example: Rutherford-Geiger (1910); cf. Feller~(1968), Section VI.7 (a) +x <- c(rep(0, 57), rep(1, 203), rep(2, 383), rep(3, 525), rep(4, 532), + rep(5, 408), rep(6, 273), rep(7, 139), rep(8, 45), rep(9, 27), + rep(10, 10), rep(11, 4), rep(12, 0), rep(13, 1), rep(14, 1)) + +## ML-estimate from package distrMod +MLest <- MLEstimator(x, PoisFamily()) +MLest +## confidence interval based on CLT +confint(MLest) + +## compute optimally (w.r.t to MSE) robust estimator (unknown contamination) +robEst <- roptest(x, PoisFamily(), eps.upper = 0.1, steps = 3) +estimate(robEst) +## check influence curve +pIC(robEst) +checkIC(pIC(robEst)) +## plot influence curve +plot(pIC(robEst)) +## confidence interval based on LAN - neglecting bias +confint(robEst) +## confidence interval based on LAN - including bias +confint(robEst, method = symmetricBias()) +} +\keyword{package} Copied: branches/robast-1.0/pkg/ROptEstOld/.Rbuildignore (from rev 697, pkg/ROptEstOld/.Rbuildignore) =================================================================== --- branches/robast-1.0/pkg/ROptEstOld/.Rbuildignore (rev 0) +++ branches/robast-1.0/pkg/ROptEstOld/.Rbuildignore 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Deleted: branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION =================================================================== --- pkg/ROptEstOld/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) @@ -1,17 +0,0 @@ -Package: ROptEstOld -Version: 0.9.1 -Date: 2013-02-08 -Title: Optimally robust estimation - old version -Description: Optimally robust estimation using S4 classes and methods. Old version still needed - for current versions of ROptRegTS and RobRex. -Depends: R(>= 2.4.0), methods, distr(>= 2.4), distrEx(>= 2.4), RandVar(>= 0.8), evd -Author: Matthias Kohl -Maintainer: Matthias Kohl -LazyLoad: yes -ByteCompile: yes -License: LGPL-3 -URL: http://robast.r-forge.r-project.org/ -Encoding: latin1 -LastChangedDate: {$LastChangedDate$} -LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 591 Copied: branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION (from rev 697, pkg/ROptEstOld/DESCRIPTION) =================================================================== --- branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION (rev 0) +++ branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,17 @@ +Package: ROptEstOld +Version: 1.0 +Date: 2013-09-12 +Title: Optimally robust estimation - old version +Description: Optimally robust estimation using S4 classes and methods. Old version still needed + for current versions of ROptRegTS and RobRex. +Depends: R(>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.2), RandVar(>= 0.9), evd +Author: Matthias Kohl +Maintainer: Matthias Kohl +LazyLoad: yes +ByteCompile: yes +License: LGPL-3 +URL: http://robast.r-forge.r-project.org/ +Encoding: latin1 +LastChangedDate: {$LastChangedDate$} +LastChangedRevision: {$LastChangedRevision$} +SVNRevision: -Inf Deleted: branches/robast-1.0/pkg/ROptEstOld/NAMESPACE =================================================================== --- pkg/ROptEstOld/NAMESPACE 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/ROptEstOld/NAMESPACE 2013-09-12 08:45:18 UTC (rev 699) @@ -1,144 +0,0 @@ -import("methods") -import("distr") -import("distrEx") -import("RandVar") - -exportClasses("FunctionSymmetry", - "NonSymmetric", - "EvenSymmetric", - "OddSymmetric", - "FunSymmList") -exportClasses("ParamFamParameter", - "ProbFamily", - "ParamFamily", - "L2ParamFamily") -exportClasses("Neighborhood", - "UncondNeighborhood", - "ContNeighborhood", - "TotalVarNeighborhood") -exportClasses("RobModel", - "FixRobModel", - "InfRobModel") -exportClasses("RiskType", - "asRisk", - "asCov", - "trAsCov", - "asHampel", - "asBias", - "asGRisk", - "asMSE", - "asUnOvShoot", - "fiRisk", - "fiCov", - "trFiCov", - "fiHampel", - "fiMSE", - "fiBias", - "fiUnOvShoot") -exportClasses("InfluenceCurve", - "IC", - "ContIC", - "TotalVarIC") - -exportMethods("show", - "plot", - "coerce", - "length", - "E") -exportMethods("type", - "SymmCenter") -exportMethods("name", "name<-", - "distribution", - "distrSymm", - "props", "props<-", "addProp<-", - "main", "main<-", - "nuisance", "nuisance<-", - "trafo", "trafo<-", - "param", - "L2deriv", - "L2derivSymm", - "L2derivDistr", - "L2derivDistrSymm", - "FisherInfo", - "checkL2deriv", - "infoPlot") -exportMethods("radius") -exportMethods("center", "center<-", - "neighbor", "neighbor<-") -exportMethods("bound", - "width") -exportMethods("Curve", - "Risks", "Risks<-", "addRisk<-", - "Infos", "Infos<-", "addInfo<-", - "CallL2Fam", "CallL2Fam<-", - "generateIC", - "checkIC", - "evalIC", - "clip", "clip<-", - "cent", "cent<-", - "stand", "stand<-", - "lowerCase", "lowerCase<-", - "neighborRadius", "neighborRadius<-", - "clipLo", "clipLo<-", - "clipUp", "clipUp<-") -exportMethods("optIC", - "getInfRobIC", - "getFixRobIC", - "getAsRisk", - "getFiRisk", - "getInfClip", - "getFixClip", - "getInfGamma", - "getInfCent", - "getInfStand", - "getRiskIC", - "optRisk", - "radiusMinimaxIC", - "getIneffDiff", - "leastFavorableRadius", - "lowerCaseRadius") -exportMethods("ksEstimator", - "oneStepEstimator", - "locMEstimator") - -export("NonSymmetric", - "EvenSymmetric", - "OddSymmetric", - "FunSymmList") -export("ParamFamParameter", - "ParamFamily", - "L2ParamFamily", - "BinomFamily", - "PoisFamily", - "NormLocationFamily", - "GumbelLocationFamily", - "NormScaleFamily", - "ExpScaleFamily", - "LnormScaleFamily", - "GammaFamily", - "NormLocationScaleFamily") -export("ContNeighborhood", "TotalVarNeighborhood") -export("FixRobModel", "InfRobModel") -export("asCov", - "trAsCov", - "asHampel", - "asBias", - "asMSE", - "asUnOvShoot", - "fiCov", - "trFiCov", - "fiHampel", - "fiMSE", - "fiBias", - "fiUnOvShoot") -export("InfluenceCurve", - "IC", - "ContIC", - "TotalVarIC") -exportClasses("GumbelParameter", "Gumbel") -exportMethods("initialize", "loc", "loc<-") -exportMethods("scale", "scale<-", "+", "*", - "E", "var", "skewness", "kurtosis") -export("EULERMASCHERONICONSTANT","APERYCONSTANT") -export("Gumbel") -export("loc", "loc<-") \ No newline at end of file Copied: branches/robast-1.0/pkg/ROptEstOld/NAMESPACE (from rev 697, pkg/ROptEstOld/NAMESPACE) =================================================================== --- branches/robast-1.0/pkg/ROptEstOld/NAMESPACE (rev 0) +++ branches/robast-1.0/pkg/ROptEstOld/NAMESPACE 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,145 @@ +import("methods") +import("distr") +import("distrEx") +import("RandVar") +import("evd") + +exportClasses("FunctionSymmetry", + "NonSymmetric", + "EvenSymmetric", + "OddSymmetric", + "FunSymmList") +exportClasses("ParamFamParameter", + "ProbFamily", + "ParamFamily", + "L2ParamFamily") +exportClasses("Neighborhood", + "UncondNeighborhood", + "ContNeighborhood", + "TotalVarNeighborhood") +exportClasses("RobModel", + "FixRobModel", + "InfRobModel") +exportClasses("RiskType", + "asRisk", + "asCov", + "trAsCov", + "asHampel", + "asBias", + "asGRisk", + "asMSE", + "asUnOvShoot", + "fiRisk", + "fiCov", + "trFiCov", + "fiHampel", + "fiMSE", + "fiBias", + "fiUnOvShoot") +exportClasses("InfluenceCurve", + "IC", + "ContIC", + "TotalVarIC") + +exportMethods("show", + "plot", + "coerce", + "length", + "E") +exportMethods("type", + "SymmCenter") +exportMethods("name", "name<-", + "distribution", + "distrSymm", + "props", "props<-", "addProp<-", + "main", "main<-", + "nuisance", "nuisance<-", + "trafo", "trafo<-", + "param", + "L2deriv", + "L2derivSymm", + "L2derivDistr", + "L2derivDistrSymm", + "FisherInfo", + "checkL2deriv", + "infoPlot") +exportMethods("radius") +exportMethods("center", "center<-", + "neighbor", "neighbor<-") +exportMethods("bound", + "width") +exportMethods("Curve", + "Risks", "Risks<-", "addRisk<-", + "Infos", "Infos<-", "addInfo<-", + "CallL2Fam", "CallL2Fam<-", + "generateIC", + "checkIC", + "evalIC", + "clip", "clip<-", + "cent", "cent<-", + "stand", "stand<-", + "lowerCase", "lowerCase<-", + "neighborRadius", "neighborRadius<-", + "clipLo", "clipLo<-", + "clipUp", "clipUp<-") +exportMethods("optIC", + "getInfRobIC", + "getFixRobIC", + "getAsRisk", + "getFiRisk", + "getInfClip", + "getFixClip", + "getInfGamma", + "getInfCent", + "getInfStand", + "getRiskIC", + "optRisk", + "radiusMinimaxIC", + "getIneffDiff", + "leastFavorableRadius", + "lowerCaseRadius") +exportMethods("ksEstimator", + "oneStepEstimator", + "locMEstimator") + +export("NonSymmetric", + "EvenSymmetric", + "OddSymmetric", + "FunSymmList") +export("ParamFamParameter", + "ParamFamily", + "L2ParamFamily", + "BinomFamily", + "PoisFamily", + "NormLocationFamily", + "GumbelLocationFamily", + "NormScaleFamily", + "ExpScaleFamily", + "LnormScaleFamily", + "GammaFamily", + "NormLocationScaleFamily") +export("ContNeighborhood", "TotalVarNeighborhood") +export("FixRobModel", "InfRobModel") +export("asCov", + "trAsCov", + "asHampel", + "asBias", + "asMSE", + "asUnOvShoot", + "fiCov", + "trFiCov", + "fiHampel", + "fiMSE", + "fiBias", + "fiUnOvShoot") +export("InfluenceCurve", + "IC", + "ContIC", + "TotalVarIC") +exportClasses("GumbelParameter", "Gumbel") +exportMethods("initialize", "loc", "loc<-") +exportMethods("scale", "scale<-", "+", "*", + "E", "var", "skewness", "kurtosis") +export("EULERMASCHERONICONSTANT","APERYCONSTANT") +export("Gumbel") +export("loc", "loc<-") \ No newline at end of file Deleted: branches/robast-1.0/pkg/ROptEstOld/inst/NEWS =================================================================== --- pkg/ROptEstOld/inst/NEWS 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/ROptEstOld/inst/NEWS 2013-09-12 08:45:18 UTC (rev 699) @@ -1,33 +0,0 @@ -############################################################################### -## News: to package ROptEstOld -############################################################################### - -(first two numbers of package versions do not necessarily reflect - package-individual development, but rather are chosen for the - RobAStXXX family as a whole in order to ease updating "depends" - information) - -####################################### -version 0.9 -####################################### -EVD functionality (including Gumbel distribution) has -moved from distrEx to new pkg RobExtremes; to avoid failure -of ROptEstOld, this functionality has been copied to ROptEstOld -as well. - -####################################### -version 0.8 -####################################### - -no changes this time -+ DESCRIPTION files and package-help files gain a tag SVNRevision - to be filled by get[All]RevNr.R from utils in distr - -####################################### -version 0.7 -####################################### - -user-visible CHANGES: - -+ introduced package ROptEstOld for use with ROptRegTS and RobRex -+ removed symmetry and DistributionSymmetry implementation to make ROptEstOld compatible with distr 2.2 Copied: branches/robast-1.0/pkg/ROptEstOld/inst/NEWS (from rev 697, pkg/ROptEstOld/inst/NEWS) =================================================================== --- branches/robast-1.0/pkg/ROptEstOld/inst/NEWS (rev 0) +++ branches/robast-1.0/pkg/ROptEstOld/inst/NEWS 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,45 @@ +############################################################################### +## News: to package ROptEstOld +############################################################################### + +(first two numbers of package versions do not necessarily reflect + package-individual development, but rather are chosen for the + RobAStXXX family as a whole in order to ease updating "depends" + information) + +####################################### +version 0.9 +####################################### + +user-visible CHANGES: ++ EVD functionality (including Gumbel distribution) has been +moved from distrEx to new pkg RobExtremes; to avoid failure +of ROptEstOld, this functionality has been copied to ROptEstOld +as well. + +GENERAL ENHANCEMENTS: ++ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends + +under the hood: + ++ added .Rbuildignore + +BUGFIXES + + +####################################### +version 0.8 +####################################### + +no changes this time ++ DESCRIPTION files and package-help files gain a tag SVNRevision + to be filled by get[All]RevNr.R from utils in distr + +####################################### +version 0.7 +####################################### + +user-visible CHANGES: + ++ introduced package ROptEstOld for use with ROptRegTS and RobRex ++ removed symmetry and DistributionSymmetry implementation to make ROptEstOld compatible with distr 2.2 Copied: branches/robast-1.0/pkg/ROptRegTS/.Rbuildignore (from rev 697, pkg/ROptRegTS/.Rbuildignore) =================================================================== --- branches/robast-1.0/pkg/ROptRegTS/.Rbuildignore (rev 0) +++ branches/robast-1.0/pkg/ROptRegTS/.Rbuildignore 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,3 @@ +^.*\.svn.+ +inst/doc/Rplots.pdf +.*-Ex\.R \ No newline at end of file Deleted: branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION =================================================================== --- pkg/ROptRegTS/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) @@ -1,18 +0,0 @@ -Package: ROptRegTS -Version: 0.8.1 -Date: 2011-09-30 -Title: Optimally robust estimation for regression-type models -Description: Optimally robust estimation for regression-type models using S4 classes and - methods -Depends: R (>= 2.4.0), methods, distr(>= 1.9), distrEx(>= 1.9), RandVar(>= 0.6), ROptEstOld(>= - 0.5.2) -Author: Matthias Kohl , Peter Ruckdeschel -Maintainer: Matthias Kohl -ByteCompile: yes -LazyLoad: yes -License: LGPL-3 -Encoding: latin1 -URL: http://robast.r-forge.r-project.org/ -LastChangedDate: {$LastChangedDate$} -LastChangedRevision: {$LastChangedRevision$} -SVNRevision: 454 Copied: branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION (from rev 697, pkg/ROptRegTS/DESCRIPTION) =================================================================== --- branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION (rev 0) +++ branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) @@ -0,0 +1,18 @@ +Package: ROptRegTS +Version: 1.0 +Date: 2013-09-12 +Title: Optimally robust estimation for regression-type models +Description: Optimally robust estimation for regression-type models using S4 classes and + methods +Depends: R (>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.5), RandVar(>= 0.9), + ROptEstOld(>= 0.9.1) +Author: Matthias Kohl , Peter Ruckdeschel +Maintainer: Matthias Kohl +LazyLoad: yes +ByteCompile: yes +License: LGPL-3 +Encoding: latin1 +URL: http://robast.r-forge.r-project.org/ +LastChangedDate: {$LastChangedDate$} +LastChangedRevision: {$LastChangedRevision$} +SVNRevision: -Inf Deleted: branches/robast-1.0/pkg/ROptRegTS/R/AllClass.R =================================================================== --- pkg/ROptRegTS/R/AllClass.R 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/ROptRegTS/R/AllClass.R 2013-09-12 08:45:18 UTC (rev 699) @@ -1,463 +0,0 @@ -.onLoad <- function(lib, pkg){ - require("methods", character = TRUE, quietly = TRUE) - require("distr", character = TRUE, quietly = TRUE) - require("distrEx", character = TRUE, quietly = TRUE) - require("RandVar", character = TRUE, quietly = TRUE) - require("ROptEstOld", character = TRUE, quietly = TRUE) -} - -# Regression type families -setClass("RegTypeFamily", - representation(ErrorDistr = "Distribution", - ErrorSymm = "DistributionSymmetry", - RegDistr = "Distribution", - RegSymm = "DistributionSymmetry", - Regressor = "EuclRandVariable"), - prototype(name = "regression type family", - distribution = LMCondDistribution(), - distrSymm = new("NoSymmetry"), - ErrorDistr = Norm(), - ErrorSymm = new("NoSymmetry"), - RegDistr = Norm(), - RegSymm = new("NoSymmetry"), - Regressor = RealRandVariable(Map = list(function(x){x}), Domain = Reals()), - param = new("ParamFamParameter", main = 0, trafo = matrix(1)), - props = character(0)), - contains = "ParamFamily", - validity = function(object){ - if(!is(object at distribution, "UnivariateCondDistribution")) - stop("distribution has to be of class 'UnivariateCondDistribution'") - if(length(object at Regressor) != 1) - stop("'Regressor' has to be of length 1") - if(is(object at ErrorDistr, "UnivariateCondDistribution")) - stop("'ErrorDistr' has to be an unconditional distribution") - if(is(object at RegDistr, "UnivariateCondDistribution")) - stop("'RegrDistr' has to be an unconditional distribution") - if(dimension(Domain(object at Regressor)) != dimension(img(object at RegDistr))) - stop("dimension of 'Domain' of 'Regressor' has to be identical to", - "dimension of 'img' of 'RegDistr'") - }) -# L2 differentiable regression type model -setClass("L2RegTypeFamily", - representation(L2deriv = "EuclRandVarList", - ErrorL2deriv = "EuclRandVarList", - ErrorL2derivSymm = "FunSymmList", - ErrorL2derivDistr = "DistrList", - ErrorL2derivDistrSymm = "DistrSymmList", - FisherInfo = "PosDefSymmMatrix"), - prototype(name = "L2 differentiable regression type family", - distribution = LMCondDistribution(), - distrSymm = new("NoSymmetry"), - ErrorDistr = Norm(), - ErrorSymm = new("NoSymmetry"), - RegDistr = Norm(), - RegSymm = new("NoSymmetry"), - Regressor = RealRandVariable(Map = list(function(x){x}), Domain = Reals()), - param = new("ParamFamParameter", main = 0, trafo = matrix(1)), - props = character(0), - L2deriv = EuclRandVarList(RealRandVariable(Map = list(function(x){x[1]*x[2]}), - Domain = EuclideanSpace(dimension=2))), - ErrorL2deriv = EuclRandVarList(RealRandVariable(Map = list(function(x){x}), Domain = Reals())), - ErrorL2derivSymm = new("FunSymmList"), - ErrorL2derivDistr = UnivarDistrList(Norm()), - ErrorL2derivDistrSymm = new("DistrSymmList"), - FisherInfo = new("PosDefSymmMatrix", matrix(1))), - contains = "RegTypeFamily", - validity = function(object){ - if(dimension(Domain(object at ErrorL2deriv[[1]])) != dimension(img(object at ErrorDistr))) - stop("dimension of 'Domain' of 'ErrorL2deriv' != ", - "dimension of 'img' of 'ErrorDistr'") - if(dimension(Domain(object at L2deriv[[1]])) != (dimension(img(object at ErrorDistr)) - + dimension(img(object at RegDistr)))) - stop("'Domain' of 'L2deriv' has wrong dimension") - - dims <- length(object at param) - if(ncol(object at FisherInfo) != dims) - stop(paste("dimension of 'FisherInfo' should be", dims)) - - nrvalues <- numberOfMaps(object at ErrorL2deriv) - if(nrvalues != length(object at ErrorL2derivSymm)) - stop("number of Maps of 'ErrorL2deriv' != length of 'ErrorL2derivSymm'") - if(nrvalues != length(object at ErrorL2derivDistr)) - stop("number of Maps of 'ErrorL2deriv' != length of 'ErrorL2derivDistr'") - if(nrvalues != length(object at ErrorL2derivDistrSymm)) - stop("number of Maps of 'ErrorL2deriv' != length of 'ErrorL2derivDistrSymm'") - if(dimension(Domain(object at ErrorL2deriv[[1]])) != dimension(img(object at ErrorDistr))) - stop("dimension of 'Domain' of 'L2deriv' != dimension of 'img' of 'ErrorDistr'") - if(dimension(object at L2deriv) != dims) - stop("dimension of 'L2deriv' != dimension of parameters") - - return(TRUE) - }) -# conditional (error-free-variables) neighborhood -setClass("CondNeighborhood", - representation(radiusCurve = "function"), - contains = c("Neighborhood", "VIRTUAL"), - validity = function(object){ - if(length(formals(object at radiusCurve)) != 1) - stop("'radiusCurve' has to be a function of one argument") - if(names(formals(object at radiusCurve)) != "x") - stop("'radiusCurve' has to be a function with argument name = 'x'") - }) -# conditional convex contamination neighborhood -setClass("CondContNeighborhood", - prototype = prototype(type = "conditional convex contamination neighborhood", - radius = 0, - radiusCurve = function(x){1}), - contains = "CondNeighborhood") -# conditional total variaton neighborhood -setClass("CondTotalVarNeighborhood", - prototype = prototype(type = "conditional total variation neighborhood", - radius = 0, - radiusCurve = function(x){1}), - contains = "CondNeighborhood") -# average conditional neighborhood -setClass("AvCondNeighborhood", representation(exponent = "numeric"), - contains = c("CondNeighborhood", "VIRTUAL")) -# average conditional neighborhood (exponent = 1) -setClass("Av1CondNeighborhood", - contains = c("AvCondNeighborhood", "VIRTUAL"), - validity = function(object){ - if(object at exponent != 1) - stop("exponent has to be 1") - }) -# average conditional convex contamination neighborhood (exponent = 1) -setClass("Av1CondContNeighborhood", - prototype = prototype(type = "average conditional convex contamination neighborhood", - radius = 0, - radiusCurve = function(x){1}, - exponent = 1), - contains = c("Av1CondNeighborhood")) -# average conditional total variation neighborhood (exponent = 1) -setClass("Av1CondTotalVarNeighborhood", - prototype = prototype(type = "average conditional total variation neighborhood", - radius = 0, - radiusCurve = function(x){1}, - exponent = 1), - contains = c("Av1CondNeighborhood")) -# average square conditional neighborhood (exponent = 2) -setClass("Av2CondNeighborhood", - contains = c("AvCondNeighborhood", "VIRTUAL"), - validity = function(object){ - if(object at exponent != 2) - stop("exponent has to be 2") - }) -# average square conditional convex contamination neighborhood (exponent = 2) -setClass("Av2CondContNeighborhood", - prototype = prototype(type = "average square conditional convex contamination neighborhood", - radius = 0, - radiusCurve = function(x){1}, [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 699 From noreply at r-forge.r-project.org Thu Sep 12 11:20:00 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 11:20:00 +0200 (CEST) Subject: [Robast-commits] r700 - branches/robast-0.9/pkg/RobLox branches/robast-1.0/pkg branches/robast-1.0/pkg/ROptEst branches/robast-1.0/pkg/ROptEstOld branches/robast-1.0/pkg/ROptRegTS branches/robast-1.0/pkg/RandVar branches/robast-1.0/pkg/RobAStBase branches/robast-1.0/pkg/RobExtremes branches/robast-1.0/pkg/RobExtremes/man branches/robast-1.0/pkg/RobLox branches/robast-1.0/pkg/RobLoxBioC branches/robast-1.0/pkg/RobRex pkg/ROptEst pkg/ROptEstOld pkg/ROptRegTS pkg/RandVar pkg/RobAStBase pkg/RobExtremes pkg/RobLox pkg/RobLoxBioC pkg/RobRex Message-ID: <20130912092000.C6D6E185667@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 11:20:00 +0200 (Thu, 12 Sep 2013) New Revision: 700 Added: branches/robast-1.0/pkg/RobExtremes/ branches/robast-1.0/pkg/RobExtremes/DESCRIPTION branches/robast-1.0/pkg/RobExtremes/man/0RobExtremes-package.Rd Removed: branches/robast-1.0/pkg/RobExtremes/DESCRIPTION branches/robast-1.0/pkg/RobExtremes/man/0RobExtremes-package.Rd Modified: branches/robast-0.9/pkg/RobLox/DESCRIPTION branches/robast-1.0/pkg/ROptEst/DESCRIPTION branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION branches/robast-1.0/pkg/RandVar/DESCRIPTION branches/robast-1.0/pkg/RobAStBase/DESCRIPTION branches/robast-1.0/pkg/RobLox/DESCRIPTION branches/robast-1.0/pkg/RobLoxBioC/DESCRIPTION branches/robast-1.0/pkg/RobRex/DESCRIPTION pkg/ROptEst/DESCRIPTION pkg/ROptEstOld/DESCRIPTION pkg/ROptRegTS/DESCRIPTION pkg/RandVar/DESCRIPTION pkg/RobAStBase/DESCRIPTION pkg/RobExtremes/DESCRIPTION pkg/RobLox/DESCRIPTION pkg/RobLoxBioC/DESCRIPTION pkg/RobRex/DESCRIPTION Log: updated version information in Depends and (forgot to) copy RobExtremes to branches/robast-1.0 Modified: branches/robast-0.9/pkg/RobLox/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/RobLox/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-0.9/pkg/RobLox/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,7 +4,8 @@ Title: Optimally robust influence curves and estimators for location and scale Description: Functions for the determination of optimally robust influence curves and estimators in case of normal location and/or scale -Depends: R(>= 2.7.0), stats, lattice, RColorBrewer, RandVar, Biobase, distr, distrMod, RobAStBase +Depends: R(>= 2.14.0), stats, lattice, RColorBrewer, RandVar(>= 0.9.2), Biobase, + distr(>= 2.5.2), distrMod(>= 2.5.2), RobAStBase(>= 0.9) Suggests: MASS Author: Matthias Kohl Maintainer: Matthias Kohl Modified: branches/robast-1.0/pkg/ROptEst/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,8 +4,8 @@ Title: Optimally robust estimation Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods. -Depends: R(>= 2.10.0), methods, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>= - 0.6.4), RobAStBase +Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), + RandVar(>=0.9.2), RobAStBase(>= 0.9) Suggests: RobLox, MASS Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl Modified: branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/ROptEstOld/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,7 +4,7 @@ Title: Optimally robust estimation - old version Description: Optimally robust estimation using S4 classes and methods. Old version still needed for current versions of ROptRegTS and RobRex. -Depends: R(>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.2), RandVar(>= 0.9), evd +Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.2), RandVar(>= 0.9.2), evd Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes Modified: branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/ROptRegTS/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,7 +4,7 @@ Title: Optimally robust estimation for regression-type models Description: Optimally robust estimation for regression-type models using S4 classes and methods -Depends: R (>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.5), RandVar(>= 0.9), +Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), RandVar(>= 0.9.2), ROptEstOld(>= 0.9.1) Author: Matthias Kohl , Peter Ruckdeschel Maintainer: Matthias Kohl Modified: branches/robast-1.0/pkg/RandVar/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RandVar/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/RandVar/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -3,7 +3,7 @@ Date: 2013-09-12 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.0), distrEx(>= 2.0) +Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5) Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl ByteCompile: yes Modified: branches/robast-1.0/pkg/RobAStBase/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RobAStBase/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/RobAStBase/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -3,8 +3,8 @@ Date: 2013-09-12 Title: Robust Asymptotic Statistics Description: Base S4-classes and functions for robust asymptotic statistics. -Depends: R(>= 2.12.0), methods, rrcov, distr(>= 2.5.1), distrEx(>= 2.4), distrMod(>= 2.5.1), - RandVar(>= 0.6.3) +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) Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl Deleted: branches/robast-1.0/pkg/RobExtremes/DESCRIPTION =================================================================== --- pkg/RobExtremes/DESCRIPTION 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/RobExtremes/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -1,19 +0,0 @@ -Package: RobExtremes -Version: 0.9 -Date: 2013-09-11 -Title: Optimally robust estimation for extreme value distributions -Description: Optimally robust estimation for extreme value distributions using S4 classes and methods (based on - packages distr, distrEx, distrMod, RobAStBase, and ROptEst) -Depends: R (>= 2.14.0), methods, distr(>= 2.5), distrEx(>= 2.5), RandVar(>= 0.8), distrMod(>= 2.5), - RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar -Suggests: RUnit (>= 0.4.26) -Imports: RobAStRDA -Author: Peter Ruckdeschel, Matthias Kohl, Nataliya Horbenko -Maintainer: Peter Ruckdeschel -LazyLoad: yes -ByteCompile: yes -License: LGPL-3 -URL: http://robast.r-forge.r-project.org/ -LastChangedDate: {$LastChangedDate: 2011-09-30 11:10:33 +0200 (Fr, 30 Sep 2011) $} -LastChangedRevision: {$LastChangedRevision: 453 $} -SVNRevision: 693 Copied: branches/robast-1.0/pkg/RobExtremes/DESCRIPTION (from rev 697, pkg/RobExtremes/DESCRIPTION) =================================================================== --- branches/robast-1.0/pkg/RobExtremes/DESCRIPTION (rev 0) +++ branches/robast-1.0/pkg/RobExtremes/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -0,0 +1,19 @@ +Package: RobExtremes +Version: 1.0 +Date: 2013-09-11 +Title: Optimally robust estimation for extreme value distributions +Description: Optimally robust estimation for extreme value distributions using S4 classes and methods (based on + packages distr, distrEx, distrMod, RobAStBase, and ROptEst) +Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), RandVar(>= 0.9.2), distrMod(>= 2.5.2), + RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar +Suggests: RUnit (>= 0.4.26) +Imports: RobAStRDA +Author: Peter Ruckdeschel, Matthias Kohl, Nataliya Horbenko +Maintainer: Peter Ruckdeschel +LazyLoad: yes +ByteCompile: yes +License: LGPL-3 +URL: http://robast.r-forge.r-project.org/ +LastChangedDate: {$LastChangedDate: 2011-09-30 11:10:33 +0200 (Fr, 30 Sep 2011) $} +LastChangedRevision: {$LastChangedRevision: 453 $} +SVNRevision: 694 Deleted: branches/robast-1.0/pkg/RobExtremes/man/0RobExtremes-package.Rd =================================================================== --- pkg/RobExtremes/man/0RobExtremes-package.Rd 2013-09-11 17:32:41 UTC (rev 694) +++ branches/robast-1.0/pkg/RobExtremes/man/0RobExtremes-package.Rd 2013-09-12 09:20:00 UTC (rev 700) @@ -1,250 +0,0 @@ -\name{RobExtremes-package} -\alias{RobExtremes-package} -\alias{RobExtremes} -\docType{package} -\title{ -RobExtremes -- optimally robust estimation for extreme value distributions -} -\description{ -\pkg{RobExtremes} provides infrastructure for optimally robust estimation -for extreme value distributions, extending packages -\pkg{distr}, \pkg{distrEx}, \pkg{distrMod}, \pkg{robustbase}, -\pkg{RobAStBase}, and \pkg{ROptEst}. Importing from packages \pkg{actuar}, -\pkg{evd}, it provides S4 classes and methods for -\itemize{\item Gumbel distribution - \item Generalized Extreme Value distribution (GEVD) - \item Generalized Pareto distribution (GPD) - \item Pareto distribution} -together with particular methods for expectations (as in package \pkg{distrEx}) ----with particular integrators for GPD and GEVD---, variances, median, -IQR, skewness, kurtosis. In addition, extending estimators \code{Sn} and \code{Qn} -from package \pkg{robustbase}, we provide functionals for Sn and Qn. A new -asymmetric version of the \code{mad}, \code{kMAD} gives yet another robust -scale estimator (and functional). \cr - -As to models, we provide the GPD model, together with (speeded-up) optimally -robust estimators, with LDEstimators (in general, and with \code{medkMAD}, -\code{medSn} and \code{medQn} as particular ones) as starting estimators. -} - -\details{ -\tabular{ll}{ -Package: \tab RobExtremes \cr -Version: \tab 0.9 \cr -Date: \tab 2013-09-11 \cr -Depends: \tab R (>= 2.14.0), methods, distr(>= 2.5), distrEx(>= 2.5), RandVar(>= 0.8), distrMod(>= 2.5), -RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar \cr - \tab RandVar(>= 0.9), distrMod(>=2.5), RobAStBase(>=0.8-0), - ROptEst(>=0.9), \cr - \tab robustbase(>= 0.8-0), evd, actuar\cr -Imports: \tab RobAStRDA \cr -LazyLoad: \tab yes \cr -ByteCompile: \tab yes \cr -License: \tab LGPL-3 \cr -URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab 693 \cr -} -} -\section{Classes}{ -\preformatted{ - -[*]: there is a generating function with the same name in this package - -########################## -Distribution Classes -########################## - -"Distribution" (from distr) -|>"UnivariateDistribution" (from distr) -|>|>"AbscontDistribution" (from distr) -|>|>|>"Gumbel" [*] -|>|>|>"Pareto" [*] -|>|>|>"GPareto" [*] -|>|>|>"GEVD" [*] - - -########################## -Parameter Classes -########################## - -"OptionalParameter" (from distr) -|>"Parameter" (from distr) -|>|>"GumbelParameter" -|>|>"ParetoParameter" -|>|>"GEVDParameter" -|>|>"GParetoParameter" - -########################## -ProbFamily classes -########################## -slots: [()] - -"ProbFamily" (from distrMod) -|>"ParamFamily" (from distrMod) -|>|>"L2ParamFamily" (from distrMod) -|>|>|>"L2GroupParamFamily" (from distrMod) -|>|>|>|>"ParetoFamily" [*] -|>|>|>|>"L2ScaleShapeUnion" (from distrMod) -|>|>|>|>|>"GParetoFamily" [*] -|>|>|>|>|>"GEVFamily" [*] -|>|>|>|>|>"WeibullFamily" [*] -|>|>|>|>"L2LocationScaleUnion" /VIRTUAL/ (from distrMod) -|>|>|>|>|>"L2LocationFamily" (from distrMod) -|>|>|>|>|>|>"GumbelLocationFamily" [*] -} -} - -\section{Functions}{ - -\preformatted{ -LDEstimator Estimators for scale-shape models based on location and dispersion -medSn loc=median disp=Sn -medQn loc=median disp=Qn -medkMAD loc=median disp=kMAD -asvarMedkMAD [asy. variance to MedkMADE] -PickandsEstimator PickandsEstimator -asvarPickands [asy. variance to PickandsE] -QuantileBCCEstimator Quantile based estimator for the Weibull distribution -asvarQBCC [asy. variance to QuantileBCCE] -}} - -\section{Generating Functions}{ -\preformatted{ - -Distribution Classes -Gumbel Generating function for Gumbel-class -GEVD Generating function for GEVD-class -GPareto Generating function for GPareto-class -Pareto Generating function for Pareto-class - -L2Param Families -ParetoFamily Generating function for ParetoFamily-class -GParetoFamily Generating function for GParetoFamily-class -GEVFamily Generating function for GEVFamily-class -WeibullFamily Generating function for WeibullFamily-class - -}} -\section{Methods}{ -\preformatted{ - -Functionals: -E Generic function for the computation of - (conditional) expectations -var Generic functions for the computation of - functionals -IQR Generic functions for the computation of - functionals -median Generic functions for the computation of - functionals -skewness Generic functions for the computation of - functionals -kurtosis Generic functions for the computation of - Functionals -Sn Generic function for the computation of - (conditional) expectations -Qn Generic functions for the computation of - functionals - -} -} -\section{Constants}{ -\preformatted{ - -EULERMASCHERONICONSTANT -APERYCONSTANT - -}} - -\section{Start-up-Banner}{ -You may suppress the start-up banner/message completely by setting -\code{options("StartupBanner"="off")} somewhere before loading this package by -\code{library} or \code{require} in your R-code / R-session. - -If option \code{"StartupBanner"} is not defined (default) or setting -\code{options("StartupBanner"=NULL)} or -\code{options("StartupBanner"="complete")} the complete start-up banner is -displayed. - -For any other value of option \code{"StartupBanner"} (i.e., not in -\code{c(NULL,"off","complete")}) only the version information is displayed. - -The same can be achieved by wrapping the \code{library} or \code{require} call -into either \code{suppressStartupMessages()} or -\code{onlytypeStartupMessages(.,atypes="version")}. - -As for general \code{packageStartupMessage}'s, you may also suppress all - the start-up banner by wrapping the \code{library} or \code{require} - call into \code{suppressPackageStartupMessages()} from - \pkg{startupmsg}-version 0.5 on. - } - -\section{Package versions}{ -Note: The first two numbers of package versions do not necessarily reflect - package-individual development, but rather are chosen for the - RobAStXXX family as a whole in order to ease updating "depends" - information. -} - -\author{ -Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de},\cr -Matthias Kohl \email{Matthias.Kohl at stamats.de}, and \cr -Nataliya Horbenko \email{Nataliya.Horbenko at itwm.fraunhofer.de},\cr - -\emph{Maintainer:} Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de} -} -\references{ -M. Kohl (2005): \emph{Numerical Contributions to the Asymptotic -Theory of Robustness.} PhD Thesis. Bayreuth. Available as -\url{http://www.stamats.de/ThesisMKohl.pdf} - -P. Ruckdeschel, M. Kohl, T. Stabla, F. Camphausen (2006): -S4 Classes for Distributions, \emph{R News}, \emph{6}(2), 2-6. -\url{http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf} - -M.~Kohl, P. Ruckdeschel, H.~Rieder (2010): -Infinitesimally Robust Estimation in General Smoothly Parametrized Models. -\emph{Stat. Methods Appl.}, \bold{19}, 333--354.\cr - -Ruckdeschel, P. and Horbenko, N. (2011): Optimally-Robust Estimators in Generalized -Pareto Models. ArXiv 1005.1476. To appear at \emph{Statistics}. -DOI: 10.1080/02331888.2011.628022. \cr - -Ruckdeschel, P. and Horbenko, N. (2012): Yet another breakdown point notion: -EFSBP --illustrated at scale-shape models. \emph{Metrika}, \bold{75}(8), -1025--1047. - -%a more detailed manual for \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, and \pkg{RobExtremes} may be downloaded from -%\url{http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf}\cr - -a vignette for packages \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, -and \pkg{RobExtremes} is included into the mere documentation package \pkg{distrDoc} -and may be called by \code{require("distrDoc");vignette("distr")} - -a homepage to this package is available under\cr -\url{http://robast.r-forge.r-project.org/} - -} -\keyword{package} -\concept{S4 condition class} -\concept{S4 distribution class} -\concept{functional} -\concept{kurtosis} -\concept{median} -\concept{skewness} -\concept{kMAD} -\concept{IQR} -\concept{var} -\concept{E} -\concept{Sn} -\concept{Qn} -\concept{LDEstimator} -\concept{medkMAD} -\concept{medSn} -\concept{medQn} -\seealso{ -\code{\link[distr:0distr-package]{distr-package}}, -\code{\link[distrEx:0distrEx-package]{distrEx-package}}, -\code{\link[distrMod:0distrMod-package]{distrMod-package}}, -\code{\link[RobAStBase:0RobAStBase-package]{RobAStBase-package}}, -\code{\link[ROptEst:0ROptEst-package]{ROptEst-package}} -} Copied: branches/robast-1.0/pkg/RobExtremes/man/0RobExtremes-package.Rd (from rev 695, pkg/RobExtremes/man/0RobExtremes-package.Rd) =================================================================== --- branches/robast-1.0/pkg/RobExtremes/man/0RobExtremes-package.Rd (rev 0) +++ branches/robast-1.0/pkg/RobExtremes/man/0RobExtremes-package.Rd 2013-09-12 09:20:00 UTC (rev 700) @@ -0,0 +1,250 @@ +\name{RobExtremes-package} +\alias{RobExtremes-package} +\alias{RobExtremes} +\docType{package} +\title{ +RobExtremes -- optimally robust estimation for extreme value distributions +} +\description{ +\pkg{RobExtremes} provides infrastructure for optimally robust estimation +for extreme value distributions, extending packages +\pkg{distr}, \pkg{distrEx}, \pkg{distrMod}, \pkg{robustbase}, +\pkg{RobAStBase}, and \pkg{ROptEst}. Importing from packages \pkg{actuar}, +\pkg{evd}, it provides S4 classes and methods for +\itemize{\item Gumbel distribution + \item Generalized Extreme Value distribution (GEVD) + \item Generalized Pareto distribution (GPD) + \item Pareto distribution} +together with particular methods for expectations (as in package \pkg{distrEx}) +---with particular integrators for GPD and GEVD---, variances, median, +IQR, skewness, kurtosis. In addition, extending estimators \code{Sn} and \code{Qn} +from package \pkg{robustbase}, we provide functionals for Sn and Qn. A new +asymmetric version of the \code{mad}, \code{kMAD} gives yet another robust +scale estimator (and functional). \cr + +As to models, we provide the GPD model, together with (speeded-up) optimally +robust estimators, with LDEstimators (in general, and with \code{medkMAD}, +\code{medSn} and \code{medQn} as particular ones) as starting estimators. +} + +\details{ +\tabular{ll}{ +Package: \tab RobExtremes \cr +Version: \tab 0.9 \cr +Date: \tab 2013-09-11 \cr +Depends: \tab R (>= 2.14.0), methods, distr(>= 2.5), distrEx(>= 2.5), RandVar(>= 0.8), distrMod(>= 2.5), +RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar \cr + \tab RandVar(>= 0.9), distrMod(>=2.5), RobAStBase(>=0.8-0), + ROptEst(>=0.9), \cr + \tab robustbase(>= 0.8-0), evd, actuar\cr +Imports: \tab RobAStRDA \cr +LazyLoad: \tab yes \cr +ByteCompile: \tab yes \cr +License: \tab LGPL-3 \cr +URL: \tab http://robast.r-forge.r-project.org/\cr +SVNRevision: \tab 694 \cr +} +} +\section{Classes}{ +\preformatted{ + +[*]: there is a generating function with the same name in this package + +########################## +Distribution Classes +########################## + +"Distribution" (from distr) +|>"UnivariateDistribution" (from distr) +|>|>"AbscontDistribution" (from distr) +|>|>|>"Gumbel" [*] +|>|>|>"Pareto" [*] +|>|>|>"GPareto" [*] +|>|>|>"GEVD" [*] + + +########################## +Parameter Classes +########################## + +"OptionalParameter" (from distr) +|>"Parameter" (from distr) +|>|>"GumbelParameter" +|>|>"ParetoParameter" +|>|>"GEVDParameter" +|>|>"GParetoParameter" + +########################## +ProbFamily classes +########################## +slots: [()] + +"ProbFamily" (from distrMod) +|>"ParamFamily" (from distrMod) +|>|>"L2ParamFamily" (from distrMod) +|>|>|>"L2GroupParamFamily" (from distrMod) +|>|>|>|>"ParetoFamily" [*] +|>|>|>|>"L2ScaleShapeUnion" (from distrMod) +|>|>|>|>|>"GParetoFamily" [*] +|>|>|>|>|>"GEVFamily" [*] +|>|>|>|>|>"WeibullFamily" [*] +|>|>|>|>"L2LocationScaleUnion" /VIRTUAL/ (from distrMod) +|>|>|>|>|>"L2LocationFamily" (from distrMod) +|>|>|>|>|>|>"GumbelLocationFamily" [*] +} +} + +\section{Functions}{ + +\preformatted{ +LDEstimator Estimators for scale-shape models based on location and dispersion +medSn loc=median disp=Sn +medQn loc=median disp=Qn +medkMAD loc=median disp=kMAD +asvarMedkMAD [asy. variance to MedkMADE] +PickandsEstimator PickandsEstimator +asvarPickands [asy. variance to PickandsE] +QuantileBCCEstimator Quantile based estimator for the Weibull distribution +asvarQBCC [asy. variance to QuantileBCCE] +}} + +\section{Generating Functions}{ +\preformatted{ + +Distribution Classes +Gumbel Generating function for Gumbel-class +GEVD Generating function for GEVD-class +GPareto Generating function for GPareto-class +Pareto Generating function for Pareto-class + +L2Param Families +ParetoFamily Generating function for ParetoFamily-class +GParetoFamily Generating function for GParetoFamily-class +GEVFamily Generating function for GEVFamily-class +WeibullFamily Generating function for WeibullFamily-class + +}} +\section{Methods}{ +\preformatted{ + +Functionals: +E Generic function for the computation of + (conditional) expectations +var Generic functions for the computation of + functionals +IQR Generic functions for the computation of + functionals +median Generic functions for the computation of + functionals +skewness Generic functions for the computation of + functionals +kurtosis Generic functions for the computation of + Functionals +Sn Generic function for the computation of + (conditional) expectations +Qn Generic functions for the computation of + functionals + +} +} +\section{Constants}{ +\preformatted{ + +EULERMASCHERONICONSTANT +APERYCONSTANT + +}} + +\section{Start-up-Banner}{ +You may suppress the start-up banner/message completely by setting +\code{options("StartupBanner"="off")} somewhere before loading this package by +\code{library} or \code{require} in your R-code / R-session. + +If option \code{"StartupBanner"} is not defined (default) or setting +\code{options("StartupBanner"=NULL)} or +\code{options("StartupBanner"="complete")} the complete start-up banner is +displayed. + +For any other value of option \code{"StartupBanner"} (i.e., not in +\code{c(NULL,"off","complete")}) only the version information is displayed. + +The same can be achieved by wrapping the \code{library} or \code{require} call +into either \code{suppressStartupMessages()} or +\code{onlytypeStartupMessages(.,atypes="version")}. + +As for general \code{packageStartupMessage}'s, you may also suppress all + the start-up banner by wrapping the \code{library} or \code{require} + call into \code{suppressPackageStartupMessages()} from + \pkg{startupmsg}-version 0.5 on. + } + +\section{Package versions}{ +Note: The first two numbers of package versions do not necessarily reflect + package-individual development, but rather are chosen for the + RobAStXXX family as a whole in order to ease updating "depends" + information. +} + +\author{ +Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de},\cr +Matthias Kohl \email{Matthias.Kohl at stamats.de}, and \cr +Nataliya Horbenko \email{Nataliya.Horbenko at itwm.fraunhofer.de},\cr + +\emph{Maintainer:} Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de} +} +\references{ +M. Kohl (2005): \emph{Numerical Contributions to the Asymptotic +Theory of Robustness.} PhD Thesis. Bayreuth. Available as +\url{http://www.stamats.de/ThesisMKohl.pdf} + +P. Ruckdeschel, M. Kohl, T. Stabla, F. Camphausen (2006): +S4 Classes for Distributions, \emph{R News}, \emph{6}(2), 2-6. +\url{http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf} + +M.~Kohl, P. Ruckdeschel, H.~Rieder (2010): +Infinitesimally Robust Estimation in General Smoothly Parametrized Models. +\emph{Stat. Methods Appl.}, \bold{19}, 333--354.\cr + +Ruckdeschel, P. and Horbenko, N. (2011): Optimally-Robust Estimators in Generalized +Pareto Models. ArXiv 1005.1476. To appear at \emph{Statistics}. +DOI: 10.1080/02331888.2011.628022. \cr + +Ruckdeschel, P. and Horbenko, N. (2012): Yet another breakdown point notion: +EFSBP --illustrated at scale-shape models. \emph{Metrika}, \bold{75}(8), +1025--1047. + +%a more detailed manual for \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, and \pkg{RobExtremes} may be downloaded from +%\url{http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf}\cr + +a vignette for packages \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, +and \pkg{RobExtremes} is included into the mere documentation package \pkg{distrDoc} +and may be called by \code{require("distrDoc");vignette("distr")} + +a homepage to this package is available under\cr +\url{http://robast.r-forge.r-project.org/} + +} +\keyword{package} +\concept{S4 condition class} +\concept{S4 distribution class} +\concept{functional} +\concept{kurtosis} +\concept{median} +\concept{skewness} +\concept{kMAD} +\concept{IQR} +\concept{var} +\concept{E} +\concept{Sn} +\concept{Qn} +\concept{LDEstimator} +\concept{medkMAD} +\concept{medSn} +\concept{medQn} +\seealso{ +\code{\link[distr:0distr-package]{distr-package}}, +\code{\link[distrEx:0distrEx-package]{distrEx-package}}, +\code{\link[distrMod:0distrMod-package]{distrMod-package}}, +\code{\link[RobAStBase:0RobAStBase-package]{RobAStBase-package}}, +\code{\link[ROptEst:0ROptEst-package]{ROptEst-package}} +} Modified: branches/robast-1.0/pkg/RobLox/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RobLox/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/RobLox/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,8 +4,8 @@ Title: Optimally robust influence curves and estimators for location and scale Description: Functions for the determination of optimally robust influence curves and estimators in case of normal location and/or scale -Depends: R(>= 2.7.0), stats, lattice, RColorBrewer, RandVar, Biobase, distr(>= 2.5.1), - distrMod(>= 2.5.1), RobAStBase(>= 0.9) +Depends: R(>= 2.14.0), stats, lattice, RColorBrewer, RandVar(>= 0.9.2), Biobase, + distr(>= 2.5.2), distrMod(>= 2.5.2), RobAStBase(>= 0.9.2) Suggests: MASS Author: Matthias Kohl Maintainer: Matthias Kohl Modified: branches/robast-1.0/pkg/RobLoxBioC/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RobLoxBioC/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/RobLoxBioC/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,8 +4,8 @@ Title: Infinitesimally robust estimators for preprocessing omics data Description: Functions for the determination of optimally robust influence curves and estimators for preprocessing omics data, in particular gene expression data. -Depends: R(>= 2.14.0), methods, Biobase, affy, beadarray, distr(>= 2.5.1), RobLox(>= 0.9), - lattice, RColorBrewer,BiocGenerics,distrMod(>= 2.5.1) +Depends: R(>= 2.14.0), methods, Biobase, affy, beadarray, distr(>= 2.5.2), RobLox(>= 0.9.2), + lattice, RColorBrewer,BiocGenerics,distrMod(>= 2.5.2) Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes Modified: branches/robast-1.0/pkg/RobRex/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/RobRex/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ branches/robast-1.0/pkg/RobRex/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -5,7 +5,7 @@ Description: functions for the determination of optimally robust influence curves in case of linear regression with unknown scale and standard normal distributed errors where the regressor is random. -Depends: R (>= 2.4.0), ROptRegTS(>= 0.9) +Depends: R (>= 2.14.0), ROptRegTS(>= 0.9.2) Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes Modified: pkg/ROptEst/DESCRIPTION =================================================================== --- pkg/ROptEst/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ pkg/ROptEst/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -3,7 +3,8 @@ Date: 2013-09-11 Title: Optimally robust estimation Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods. -Depends: R(>= 2.10.0), methods, distr(>= 2.4), distrEx(>= 2.4), distrMod(>= 2.4), RandVar(>= 0.6.4), RobAStBase +Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), RandVar(>= 0.9.2), + RobAStBase(>= 0.9) Suggests: RobLox, MASS Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl Modified: pkg/ROptEstOld/DESCRIPTION =================================================================== --- pkg/ROptEstOld/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ pkg/ROptEstOld/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -1,10 +1,10 @@ Package: ROptEstOld -Version: 0.9.1 +Version: 0.9.2 Date: 2013-09-12 Title: Optimally robust estimation - old version Description: Optimally robust estimation using S4 classes and methods. Old version still needed for current versions of ROptRegTS and RobRex. -Depends: R(>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.2), RandVar(>= 0.9), evd +Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.2), RandVar(>= 0.9.2), evd Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes Modified: pkg/ROptRegTS/DESCRIPTION =================================================================== --- pkg/ROptRegTS/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ pkg/ROptRegTS/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,8 +4,8 @@ Title: Optimally robust estimation for regression-type models Description: Optimally robust estimation for regression-type models using S4 classes and methods -Depends: R (>= 2.4.0), methods, distr(>= 2.5.1), distrEx(>= 2.5), RandVar(>= 0.9), ROptEstOld(>= - 0.9.1) +Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), RandVar(>= 0.9.2), + ROptEstOld(>= 0.9.2) Author: Matthias Kohl , Peter Ruckdeschel Maintainer: Matthias Kohl LazyLoad: yes Modified: pkg/RandVar/DESCRIPTION =================================================================== --- pkg/RandVar/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ pkg/RandVar/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -1,9 +1,9 @@ Package: RandVar -Version: 0.9.1 +Version: 0.9.3 Date: 2013-09-12 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.0), distrEx(>= 2.0) +Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5) Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl ByteCompile: yes Modified: pkg/RobAStBase/DESCRIPTION =================================================================== --- pkg/RobAStBase/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ pkg/RobAStBase/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -3,7 +3,7 @@ Date: 2013-09-11 Title: Robust Asymptotic Statistics Description: Base S4-classes and functions for robust asymptotic statistics. -Depends: R(>= 2.12.0), methods, rrcov, distr(>= 2.5.1), distrEx(>= 2.4), distrMod(>= 2.5.1), RandVar(>= 0.6.3) +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) Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl Modified: pkg/RobExtremes/DESCRIPTION =================================================================== --- pkg/RobExtremes/DESCRIPTION 2013-09-12 08:45:18 UTC (rev 699) +++ pkg/RobExtremes/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) @@ -4,7 +4,7 @@ Title: Optimally robust estimation for extreme value distributions Description: Optimally robust estimation for extreme value distributions using S4 classes and methods (based on packages distr, distrEx, distrMod, RobAStBase, and ROptEst) [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/robast -r 700 From noreply at r-forge.r-project.org Thu Sep 12 11:37:29 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 11:37:29 +0200 (CEST) Subject: [Robast-commits] r701 - in pkg: ROptEst ROptEstOld ROptRegTS RobAStBase RobExtremes Message-ID: <20130912093729.26AAB183DE7@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 11:37:28 +0200 (Thu, 12 Sep 2013) New Revision: 701 Modified: pkg/ROptEst/DESCRIPTION pkg/ROptEstOld/DESCRIPTION pkg/ROptRegTS/DESCRIPTION pkg/RobAStBase/DESCRIPTION pkg/RobExtremes/DESCRIPTION Log: Depends distrEx(>= 2.4) in trunc to be able to submit Modified: pkg/ROptEst/DESCRIPTION =================================================================== --- pkg/ROptEst/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) +++ pkg/ROptEst/DESCRIPTION 2013-09-12 09:37:28 UTC (rev 701) @@ -3,7 +3,7 @@ Date: 2013-09-11 Title: Optimally robust estimation Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods. -Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), RandVar(>= 0.9.2), +Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.4), distrMod(>= 2.5.2), RandVar(>= 0.9.2), RobAStBase(>= 0.9) Suggests: RobLox, MASS Author: Matthias Kohl, Peter Ruckdeschel Modified: pkg/ROptEstOld/DESCRIPTION =================================================================== --- pkg/ROptEstOld/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) +++ pkg/ROptEstOld/DESCRIPTION 2013-09-12 09:37:28 UTC (rev 701) @@ -4,7 +4,7 @@ Title: Optimally robust estimation - old version Description: Optimally robust estimation using S4 classes and methods. Old version still needed for current versions of ROptRegTS and RobRex. -Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.2), RandVar(>= 0.9.2), evd +Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.4), RandVar(>= 0.9.2), evd Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes Modified: pkg/ROptRegTS/DESCRIPTION =================================================================== --- pkg/ROptRegTS/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) +++ pkg/ROptRegTS/DESCRIPTION 2013-09-12 09:37:28 UTC (rev 701) @@ -4,7 +4,7 @@ Title: Optimally robust estimation for regression-type models Description: Optimally robust estimation for regression-type models using S4 classes and methods -Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), RandVar(>= 0.9.2), +Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.4), RandVar(>= 0.9.2), ROptEstOld(>= 0.9.2) Author: Matthias Kohl , Peter Ruckdeschel Maintainer: Matthias Kohl Modified: pkg/RobAStBase/DESCRIPTION =================================================================== --- pkg/RobAStBase/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) +++ pkg/RobAStBase/DESCRIPTION 2013-09-12 09:37:28 UTC (rev 701) @@ -3,7 +3,7 @@ Date: 2013-09-11 Title: Robust Asymptotic Statistics Description: Base S4-classes and functions for robust asymptotic statistics. -Depends: R(>= 2.14.0), methods, rrcov, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), RandVar(>= 0.9.2) +Depends: R(>= 2.14.0), methods, rrcov, distr(>= 2.5.2), distrEx(>= 2.4), distrMod(>= 2.5.2), RandVar(>= 0.9.2) Suggests: ROptEst, RUnit (>= 0.4.26) Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl Modified: pkg/RobExtremes/DESCRIPTION =================================================================== --- pkg/RobExtremes/DESCRIPTION 2013-09-12 09:20:00 UTC (rev 700) +++ pkg/RobExtremes/DESCRIPTION 2013-09-12 09:37:28 UTC (rev 701) @@ -4,7 +4,7 @@ Title: Optimally robust estimation for extreme value distributions Description: Optimally robust estimation for extreme value distributions using S4 classes and methods (based on packages distr, distrEx, distrMod, RobAStBase, and ROptEst) -Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), RandVar(>= 0.9.2), distrMod(>= 2.5.2), +Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.4), RandVar(>= 0.9.2), distrMod(>= 2.5.2), RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar Suggests: RUnit (>= 0.4.26) Imports: RobAStRDA From noreply at r-forge.r-project.org Thu Sep 12 11:48:34 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 11:48:34 +0200 (CEST) Subject: [Robast-commits] r702 - pkg/RobAStBase/man Message-ID: <20130912094834.70D4C18100D@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 11:48:34 +0200 (Thu, 12 Sep 2013) New Revision: 702 Added: pkg/RobAStBase/man/getRiskFctBV-methods.Rd pkg/RobAStBase/man/mov2bckRef-methods.Rd Log: missed some Rd files Added: pkg/RobAStBase/man/getRiskFctBV-methods.Rd =================================================================== --- pkg/RobAStBase/man/getRiskFctBV-methods.Rd (rev 0) +++ pkg/RobAStBase/man/getRiskFctBV-methods.Rd 2013-09-12 09:48:34 UTC (rev 702) @@ -0,0 +1,42 @@ +\name{getRiskFctBV-methods} +\docType{methods} +\alias{getRiskFctBV} +\alias{getRiskFctBV-methods} +\alias{getRiskFctBV,asGRisk,ANY-method} +\alias{getRiskFctBV,asMSE,ANY-method} +\alias{getRiskFctBV,asSemivar,onesidedBias-method} +\alias{getRiskFctBV,asSemivar,asymmetricBias-method} +\title{Methods for Function getRiskFctBV in Package `RobAStBase'} +\description{getRiskFctBV for a given object of S4 class \code{asGRisk} + returns a function in bias and variance to compute the asymptotic + risk.} + +\section{Methods}{\describe{ + +\item{getRiskFctBV}{\code{signature(risk = "asGRisk", biastype = "ANY")}: + returns an error that the respective method is not yet implemented. } +\item{getRiskFctBV}{\code{signature(risk = "asMSE", biastype = "ANY")}: + returns a function with arguments \code{bias} and \code{variance} + to compute the asymptotic MSE for a given ALE at a situation where it has bias \code{bias} + (including the radius!) and variance \code{variance}. } +\item{getRiskFctBV}{\code{signature(risk = "asSemivar", biastype = "onesidedBias")}: + returns a function with arguments \code{bias} and \code{variance} + to compute the asymptotic semivariance error, i.e. \eqn{E[(S_n-\theta)_+^2]}{E[max(Sn-theta,0)^2]} + resp. \eqn{E[(S_n-\theta)_-^2]}{E[max(theta-Sn,0)^2]}, for a given ALE \eqn{S_n}{Sn} + at a situation where it has one-sided bias \code{bias} (including the radius!) + and variance \code{variance}. } +\item{getRiskFctBV}{\code{signature(risk = "asSemivar", biastype = "asymmetricBias")}: + returns a function with arguments \code{bias} and \code{variance} + to compute the asymptotic semivariance error, i.e. + \eqn{E[\nu_1 (S_n-\theta)_+^2+\nu_2(S_n-\theta)_-^2]}{nu1*max(Sn-theta,0)^2+nu2*max(theta-Sn,0)^2]} + for a given ALE \eqn{S_n}{Sn} at a situation where it has one-sided bias + \code{bias} (including the radius!) and variance \code{variance}. } +}} +\examples{ +myrisk <- asMSE() +getRiskFctBV(myrisk) +} +\concept{risk} +\keyword{classes} + + Added: pkg/RobAStBase/man/mov2bckRef-methods.Rd =================================================================== --- pkg/RobAStBase/man/mov2bckRef-methods.Rd (rev 0) +++ pkg/RobAStBase/man/mov2bckRef-methods.Rd 2013-09-12 09:48:34 UTC (rev 702) @@ -0,0 +1,82 @@ +\name{movToRef-methods} +\docType{methods} +\alias{moveL2Fam2RefParam-methods} +\alias{moveICBackFromRefParam-methods} +\alias{moveICBackFromRefParam} +\alias{moveL2Fam2RefParam} +\alias{moveL2Fam2RefParam,L2ParamFamily-method} +\alias{moveL2Fam2RefParam,L2LocationFamily-method} +\alias{moveL2Fam2RefParam,L2ScaleFamily-method} +\alias{moveL2Fam2RefParam,L2LocationScaleFamily-method} +\alias{moveICBackFromRefParam,IC,L2ParamFamily-method} +\alias{moveICBackFromRefParam,IC,L2LocationFamily-method} +\alias{moveICBackFromRefParam,IC,L2ScaleFamily-method} +\alias{moveICBackFromRefParam,IC,L2LocationScaleFamily-method} +\alias{moveICBackFromRefParam,HampIC,L2ParamFamily-method} + +\title{Methods for Functions moving from and to reference parameter in Package `ROptEst' } + +\description{In \code{optIC} a gain in accuracy can be obtained when computing + the optimally-robust ICs at a reference parameter of the model (instead of an + arbtirary one). To this end, \code{moveL2Fam2RefParam} moved the model to + the reference parameter and \code{moveICBackFromRefParam} moves the obtained + optimal IC back to the original parameter.} + +\usage{moveL2Fam2RefParam(L2Fam, ...) + moveICBackFromRefParam(IC, L2Fam,...) +} + +\arguments{ + \item{L2Fam}{object of class \code{L2ParamFamily}} + \item{IC}{IC of class \code{HampIC}} + \item{\dots}{further arguments to be passed on. } +} +\section{Methods}{\describe{ +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2ParamFamily")}: + returns \code{L2Fam} unchanged. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2LocationFamily")}: + moves \code{L2Fam} to location \code{0}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2ScaleFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2LocationScaleFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2LocationUnknownScaleFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2ScaleUnknownLocationFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2ParamFamily")}: + returns \code{IC} unchanged. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2LocationFamily")}: + moves IC in \code{IC} back to original location in \code{L2Fam}. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2ScaleFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2LocationScaleFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2LocationUnknownScaleFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2ScaleUnknownLocationFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "HampIC", L2Fam = "L2ParamFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam} + (and in addition changes Lagrange multipliers accordingly), + rescaling risk where necessary. } +}} +\value{ +\item{\code{moveL2Fam2RefParam}}{the L2 Family transformed to reference parameter.} +\item{\code{moveICBackFromRefParam}}{the backtransformed IC.} +} + +\details{\code{moveL2Fam2RefParam} and \code{moveICBackFromRefParam} are used +internally in functions \code{robest} and \code{roptest} to compute the +optimally robust influence function according to the arguments given to them.} +\author{Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de}} +%\seealso{\code{\link{robest}},\code{\link{optIC}}, \code{\link{radiusMinimaxIC}}} +%\examples{} +\concept{asymptotic risk} +\concept{risk} +\keyword{classes} + From noreply at r-forge.r-project.org Thu Sep 12 11:49:05 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 11:49:05 +0200 (CEST) Subject: [Robast-commits] r703 - pkg/RobAStBase/man Message-ID: <20130912094905.45FBA18100D@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 11:49:04 +0200 (Thu, 12 Sep 2013) New Revision: 703 Added: pkg/RobAStBase/man/interpolRisk-class.Rd pkg/RobAStBase/man/samplesize-methods.Rd Log: and yet some ... Added: pkg/RobAStBase/man/interpolRisk-class.Rd =================================================================== --- pkg/RobAStBase/man/interpolRisk-class.Rd (rev 0) +++ pkg/RobAStBase/man/interpolRisk-class.Rd 2013-09-12 09:49:04 UTC (rev 703) @@ -0,0 +1,58 @@ +\name{interpolRisk-class} +\docType{class} +\alias{interpolRisk-class} +\alias{OMSRRisk-class} +\alias{RMXRRisk-class} +\alias{MBRRisk-class} +\alias{OMSRRisk} +\alias{RMXRRisk} +\alias{MBRRisk} + +\usage{ +MBRRisk(samplesize=100) +OMSRRisk(samplesize=100) +RMXRRisk(samplesize=100) +} +\arguments{ + \item{samplesize}{sample size at which to look at the risk.} +} +\title{Interpolated Risks} +\description{Class of risks for which algorithms dispatch to speed-up algorithms} +\section{Objects from the Class}{\code{interpolRisk} is a virtual class: No objects may be created from it. +the other classes are generated via generating functions. +} +\section{Slots}{ + \describe{ + \item{\code{type}}{Object of class \code{"character"}: + type of risk. (Inherited from \code{RiskType}).} + } +} +\details{ +The main purpose of classes \code{OMSRRisk}, \code{MBRRisk}, and +\code{RMXRRisk} is to help to dispatch into speed-up algorithms later +in function \code{roptest}. In all these risks, we assume +convex contamination neighborhoods. +\code{OMSRRisk} stands for optimal MSE-robust estimation (where we assume +a radius r of \code{0.5}), \code{RMXRRisk} stands for optimal +optimally RMX-robust estimation and \code{MBRRisk} stands for optimal +Bias-robust estimation. +All these risks have an additional slot samplesize, defaulting to \code{100}, +and for which there is a replacement and an accessor method. +} +%\references{} +\author{Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de}} +\examples{ +new("OMSRRisk") +OMSRRisk() +RMXRRisk() +MBRRisk() +myrisk <- MBRRisk(samplesize=100) +samplesize(myrisk) +samplesize(myrisk) <- 20 +} + +%\note{} +%\seealso{} +%\examples{} +\concept{risk} +\keyword{classes} Added: pkg/RobAStBase/man/samplesize-methods.Rd =================================================================== --- pkg/RobAStBase/man/samplesize-methods.Rd (rev 0) +++ pkg/RobAStBase/man/samplesize-methods.Rd 2013-09-12 09:49:04 UTC (rev 703) @@ -0,0 +1,23 @@ +\name{samplesize-methods} +\docType{methods} +\alias{samplesize,interpolRisk-method} +\alias{samplesize} +\alias{samplesize<-,interpolRisk-method} +\alias{samplesize<-} +\title{Methods for Function samplesize in Package `RobAStBase'} +\description{samplesize-methods} + +\section{Methods}{\describe{ + +\item{samplesize}{\code{signature(object = "interpolrisk")}: + returns the slot \code{samplesize} of an object of class \code{"interpolrisk"}. } +\item{samplesize<-}{\code{signature(object = "interpolrisk", value = "ANY")}: + modifies the slot \code{samplesize} of an object of class \code{"interpolrisk"}. } +}} +\examples{ +myrisk <- MBRRisk(samplesize=100) +samplesize(myrisk) +samplesize(myrisk) <- 20 +} +\concept{risk} +\keyword{classes} From noreply at r-forge.r-project.org Thu Sep 12 11:52:08 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 11:52:08 +0200 (CEST) Subject: [Robast-commits] r704 - branches/robast-1.0/pkg/RobAStBase/man Message-ID: <20130912095208.B9BDB18100D@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-12 11:52:08 +0200 (Thu, 12 Sep 2013) New Revision: 704 Added: branches/robast-1.0/pkg/RobAStBase/man/getRiskFctBV-methods.Rd branches/robast-1.0/pkg/RobAStBase/man/interpolRisk-class.Rd branches/robast-1.0/pkg/RobAStBase/man/mov2bckRef-methods.Rd branches/robast-1.0/pkg/RobAStBase/man/samplesize-methods.Rd Modified: branches/robast-1.0/pkg/RobAStBase/man/0RobAStBase-package.Rd Log: [RobAStBase] added some missing files not yet committed to svn Modified: branches/robast-1.0/pkg/RobAStBase/man/0RobAStBase-package.Rd =================================================================== --- branches/robast-1.0/pkg/RobAStBase/man/0RobAStBase-package.Rd 2013-09-12 09:49:04 UTC (rev 703) +++ branches/robast-1.0/pkg/RobAStBase/man/0RobAStBase-package.Rd 2013-09-12 09:52:08 UTC (rev 704) @@ -11,14 +11,14 @@ \details{ \tabular{ll}{ Package: \tab RobAStBase \cr -Version: \tab 1.0 \cr -Date: \tab 2013-09-12 \cr +Version: \tab 0.9 \cr +Date: \tab 2013-09-11 \cr Depends: \tab R(>= 2.12.0), methods, distr(>= 2.0), distrEx(>= 2.0), distrMod(>= 2.0), RandVar(>= 0.6.3)\cr LazyLoad: \tab yes \cr License: \tab LGPL-3 \cr URL: \tab http://robast.r-forge.r-project.org/\cr -SVNRevision: \tab -Inf \cr +SVNRevision: \tab 694 \cr } } \author{ Added: branches/robast-1.0/pkg/RobAStBase/man/getRiskFctBV-methods.Rd =================================================================== --- branches/robast-1.0/pkg/RobAStBase/man/getRiskFctBV-methods.Rd (rev 0) +++ branches/robast-1.0/pkg/RobAStBase/man/getRiskFctBV-methods.Rd 2013-09-12 09:52:08 UTC (rev 704) @@ -0,0 +1,42 @@ +\name{getRiskFctBV-methods} +\docType{methods} +\alias{getRiskFctBV} +\alias{getRiskFctBV-methods} +\alias{getRiskFctBV,asGRisk,ANY-method} +\alias{getRiskFctBV,asMSE,ANY-method} +\alias{getRiskFctBV,asSemivar,onesidedBias-method} +\alias{getRiskFctBV,asSemivar,asymmetricBias-method} +\title{Methods for Function getRiskFctBV in Package `RobAStBase'} +\description{getRiskFctBV for a given object of S4 class \code{asGRisk} + returns a function in bias and variance to compute the asymptotic + risk.} + +\section{Methods}{\describe{ + +\item{getRiskFctBV}{\code{signature(risk = "asGRisk", biastype = "ANY")}: + returns an error that the respective method is not yet implemented. } +\item{getRiskFctBV}{\code{signature(risk = "asMSE", biastype = "ANY")}: + returns a function with arguments \code{bias} and \code{variance} + to compute the asymptotic MSE for a given ALE at a situation where it has bias \code{bias} + (including the radius!) and variance \code{variance}. } +\item{getRiskFctBV}{\code{signature(risk = "asSemivar", biastype = "onesidedBias")}: + returns a function with arguments \code{bias} and \code{variance} + to compute the asymptotic semivariance error, i.e. \eqn{E[(S_n-\theta)_+^2]}{E[max(Sn-theta,0)^2]} + resp. \eqn{E[(S_n-\theta)_-^2]}{E[max(theta-Sn,0)^2]}, for a given ALE \eqn{S_n}{Sn} + at a situation where it has one-sided bias \code{bias} (including the radius!) + and variance \code{variance}. } +\item{getRiskFctBV}{\code{signature(risk = "asSemivar", biastype = "asymmetricBias")}: + returns a function with arguments \code{bias} and \code{variance} + to compute the asymptotic semivariance error, i.e. + \eqn{E[\nu_1 (S_n-\theta)_+^2+\nu_2(S_n-\theta)_-^2]}{nu1*max(Sn-theta,0)^2+nu2*max(theta-Sn,0)^2]} + for a given ALE \eqn{S_n}{Sn} at a situation where it has one-sided bias + \code{bias} (including the radius!) and variance \code{variance}. } +}} +\examples{ +myrisk <- asMSE() +getRiskFctBV(myrisk) +} +\concept{risk} +\keyword{classes} + + Added: branches/robast-1.0/pkg/RobAStBase/man/interpolRisk-class.Rd =================================================================== --- branches/robast-1.0/pkg/RobAStBase/man/interpolRisk-class.Rd (rev 0) +++ branches/robast-1.0/pkg/RobAStBase/man/interpolRisk-class.Rd 2013-09-12 09:52:08 UTC (rev 704) @@ -0,0 +1,58 @@ +\name{interpolRisk-class} +\docType{class} +\alias{interpolRisk-class} +\alias{OMSRRisk-class} +\alias{RMXRRisk-class} +\alias{MBRRisk-class} +\alias{OMSRRisk} +\alias{RMXRRisk} +\alias{MBRRisk} + +\usage{ +MBRRisk(samplesize=100) +OMSRRisk(samplesize=100) +RMXRRisk(samplesize=100) +} +\arguments{ + \item{samplesize}{sample size at which to look at the risk.} +} +\title{Interpolated Risks} +\description{Class of risks for which algorithms dispatch to speed-up algorithms} +\section{Objects from the Class}{\code{interpolRisk} is a virtual class: No objects may be created from it. +the other classes are generated via generating functions. +} +\section{Slots}{ + \describe{ + \item{\code{type}}{Object of class \code{"character"}: + type of risk. (Inherited from \code{RiskType}).} + } +} +\details{ +The main purpose of classes \code{OMSRRisk}, \code{MBRRisk}, and +\code{RMXRRisk} is to help to dispatch into speed-up algorithms later +in function \code{roptest}. In all these risks, we assume +convex contamination neighborhoods. +\code{OMSRRisk} stands for optimal MSE-robust estimation (where we assume +a radius r of \code{0.5}), \code{RMXRRisk} stands for optimal +optimally RMX-robust estimation and \code{MBRRisk} stands for optimal +Bias-robust estimation. +All these risks have an additional slot samplesize, defaulting to \code{100}, +and for which there is a replacement and an accessor method. +} +%\references{} +\author{Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de}} +\examples{ +new("OMSRRisk") +OMSRRisk() +RMXRRisk() +MBRRisk() +myrisk <- MBRRisk(samplesize=100) +samplesize(myrisk) +samplesize(myrisk) <- 20 +} + +%\note{} +%\seealso{} +%\examples{} +\concept{risk} +\keyword{classes} Added: branches/robast-1.0/pkg/RobAStBase/man/mov2bckRef-methods.Rd =================================================================== --- branches/robast-1.0/pkg/RobAStBase/man/mov2bckRef-methods.Rd (rev 0) +++ branches/robast-1.0/pkg/RobAStBase/man/mov2bckRef-methods.Rd 2013-09-12 09:52:08 UTC (rev 704) @@ -0,0 +1,82 @@ +\name{movToRef-methods} +\docType{methods} +\alias{moveL2Fam2RefParam-methods} +\alias{moveICBackFromRefParam-methods} +\alias{moveICBackFromRefParam} +\alias{moveL2Fam2RefParam} +\alias{moveL2Fam2RefParam,L2ParamFamily-method} +\alias{moveL2Fam2RefParam,L2LocationFamily-method} +\alias{moveL2Fam2RefParam,L2ScaleFamily-method} +\alias{moveL2Fam2RefParam,L2LocationScaleFamily-method} +\alias{moveICBackFromRefParam,IC,L2ParamFamily-method} +\alias{moveICBackFromRefParam,IC,L2LocationFamily-method} +\alias{moveICBackFromRefParam,IC,L2ScaleFamily-method} +\alias{moveICBackFromRefParam,IC,L2LocationScaleFamily-method} +\alias{moveICBackFromRefParam,HampIC,L2ParamFamily-method} + +\title{Methods for Functions moving from and to reference parameter in Package `ROptEst' } + +\description{In \code{optIC} a gain in accuracy can be obtained when computing + the optimally-robust ICs at a reference parameter of the model (instead of an + arbtirary one). To this end, \code{moveL2Fam2RefParam} moved the model to + the reference parameter and \code{moveICBackFromRefParam} moves the obtained + optimal IC back to the original parameter.} + +\usage{moveL2Fam2RefParam(L2Fam, ...) + moveICBackFromRefParam(IC, L2Fam,...) +} + +\arguments{ + \item{L2Fam}{object of class \code{L2ParamFamily}} + \item{IC}{IC of class \code{HampIC}} + \item{\dots}{further arguments to be passed on. } +} +\section{Methods}{\describe{ +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2ParamFamily")}: + returns \code{L2Fam} unchanged. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2LocationFamily")}: + moves \code{L2Fam} to location \code{0}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2ScaleFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2LocationScaleFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2LocationUnknownScaleFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveL2Fam2RefParam}{\code{signature(L2Fam = "L2ScaleUnknownLocationFamily")}: + moves \code{L2Fam} to location \code{0} and scale \code{1}. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2ParamFamily")}: + returns \code{IC} unchanged. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2LocationFamily")}: + moves IC in \code{IC} back to original location in \code{L2Fam}. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2ScaleFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2LocationScaleFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2LocationUnknownScaleFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "IC", L2Fam = "L2ScaleUnknownLocationFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam}, + rescaling risk where necessary. } +\item{moveICBackFromRefParam}{\code{signature(IC = "HampIC", L2Fam = "L2ParamFamily")}: + moves IC in \code{IC} back to original location and scale in \code{L2Fam} + (and in addition changes Lagrange multipliers accordingly), + rescaling risk where necessary. } +}} +\value{ +\item{\code{moveL2Fam2RefParam}}{the L2 Family transformed to reference parameter.} +\item{\code{moveICBackFromRefParam}}{the backtransformed IC.} +} + +\details{\code{moveL2Fam2RefParam} and \code{moveICBackFromRefParam} are used +internally in functions \code{robest} and \code{roptest} to compute the +optimally robust influence function according to the arguments given to them.} +\author{Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de}} +%\seealso{\code{\link{robest}},\code{\link{optIC}}, \code{\link{radiusMinimaxIC}}} +%\examples{} +\concept{asymptotic risk} +\concept{risk} +\keyword{classes} + Added: branches/robast-1.0/pkg/RobAStBase/man/samplesize-methods.Rd =================================================================== --- branches/robast-1.0/pkg/RobAStBase/man/samplesize-methods.Rd (rev 0) +++ branches/robast-1.0/pkg/RobAStBase/man/samplesize-methods.Rd 2013-09-12 09:52:08 UTC (rev 704) @@ -0,0 +1,23 @@ +\name{samplesize-methods} +\docType{methods} +\alias{samplesize,interpolRisk-method} +\alias{samplesize} +\alias{samplesize<-,interpolRisk-method} +\alias{samplesize<-} +\title{Methods for Function samplesize in Package `RobAStBase'} +\description{samplesize-methods} + +\section{Methods}{\describe{ + +\item{samplesize}{\code{signature(object = "interpolrisk")}: + returns the slot \code{samplesize} of an object of class \code{"interpolrisk"}. } +\item{samplesize<-}{\code{signature(object = "interpolrisk", value = "ANY")}: + modifies the slot \code{samplesize} of an object of class \code{"interpolrisk"}. } +}} +\examples{ +myrisk <- MBRRisk(samplesize=100) +samplesize(myrisk) +samplesize(myrisk) <- 20 +} +\concept{risk} +\keyword{classes} From noreply at r-forge.r-project.org Thu Sep 12 12:19:28 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 12:19:28 +0200 (CEST) Subject: [Robast-commits] r705 - pkg/RobAStBase/man Message-ID: <20130912101928.9FC161813BB@r-forge.r-project.org> Author: stamats Date: 2013-09-12 12:19:28 +0200 (Thu, 12 Sep 2013) New Revision: 705 Modified: pkg/RobAStBase/man/ComparePlotWrapper.Rd pkg/RobAStBase/man/InfoPlotWrapper.Rd pkg/RobAStBase/man/PlotICWrapper.Rd Log: hint on capital letters added Modified: pkg/RobAStBase/man/ComparePlotWrapper.Rd =================================================================== --- pkg/RobAStBase/man/ComparePlotWrapper.Rd 2013-09-12 09:52:08 UTC (rev 704) +++ pkg/RobAStBase/man/ComparePlotWrapper.Rd 2013-09-12 10:19:28 UTC (rev 705) @@ -36,9 +36,9 @@ invisible(NULL) } \description{ - The wrapper takes most of arguments to function - comparePlot by default and gives a user possibility to - run the function with low number of arguments + The wrapper \code{ComparePlot} (capital C!) takes most of arguments + to function \code{comparePlot} (lower case c!) by default and gives a user + possibility to run the function with low number of arguments. } \section{Details}{ Calls \code{comparePlot} with suitably chosen defaults; Modified: pkg/RobAStBase/man/InfoPlotWrapper.Rd =================================================================== --- pkg/RobAStBase/man/InfoPlotWrapper.Rd 2013-09-12 09:52:08 UTC (rev 704) +++ pkg/RobAStBase/man/InfoPlotWrapper.Rd 2013-09-12 10:19:28 UTC (rev 705) @@ -29,9 +29,9 @@ invisible(NULL) } \description{ - The wrapper takes most of arguments to the plot method by - default and gives a user possibility to run the function - with low number of arguments + The wrapper \code{InfoPlot} (captial I!) takes most of arguments to the plot + method \code{infoPlot} (lower case i!) by default and gives a user possibility to run + the function with low number of arguments. } \section{Details}{ Calls \code{infoPlot} with suitably chosen defaults. If Modified: pkg/RobAStBase/man/PlotICWrapper.Rd =================================================================== --- pkg/RobAStBase/man/PlotICWrapper.Rd 2013-09-12 09:52:08 UTC (rev 704) +++ pkg/RobAStBase/man/PlotICWrapper.Rd 2013-09-12 10:19:28 UTC (rev 705) @@ -29,9 +29,9 @@ invisible(NULL) } \description{ - The wrapper takes most of arguments to the plot method by - default and gives a user possibility to run the function - with low number of arguments + The wrapper \code{PlotIC} takes most of arguments to the \code{plot} + method by default and gives a user possibility to run the function + with low number of arguments. } \section{Details}{ Calls \code{plot} with suitably chosen defaults; if From noreply at r-forge.r-project.org Thu Sep 12 12:19:55 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 12:19:55 +0200 (CEST) Subject: [Robast-commits] r706 - pkg/ROptEst/man Message-ID: <20130912101955.E5D0D1813BB@r-forge.r-project.org> Author: stamats Date: 2013-09-12 12:19:55 +0200 (Thu, 12 Sep 2013) New Revision: 706 Modified: pkg/ROptEst/man/CniperPointPlotWrapper.Rd pkg/ROptEst/man/getReq.Rd Log: hint on capital letters added, documentation corrected Modified: pkg/ROptEst/man/CniperPointPlotWrapper.Rd =================================================================== --- pkg/ROptEst/man/CniperPointPlotWrapper.Rd 2013-09-12 10:19:28 UTC (rev 705) +++ pkg/ROptEst/man/CniperPointPlotWrapper.Rd 2013-09-12 10:19:55 UTC (rev 706) @@ -31,10 +31,9 @@ invisible(NULL) } \description{ - The wrapper takes most of arguments to the - cniperPointPlot function by default and gives a user - possibility to run the function with low number of - arguments + The wrapper \code{CniperPointPlot} (capital C!) takes most of arguments + to the \code{cniperPointPlot} (lower case c!) function by default and gives + a user possibility to run the function with low number of arguments. } \section{Details}{ Calls \code{cniperPointPlot} with suitably chosen Modified: pkg/ROptEst/man/getReq.Rd =================================================================== --- pkg/ROptEst/man/getReq.Rd 2013-09-12 10:19:28 UTC (rev 705) +++ pkg/ROptEst/man/getReq.Rd 2013-09-12 10:19:55 UTC (rev 706) @@ -7,7 +7,7 @@ respectively the number of (worst-case) outliers interval where IC1 is better than IC2. } -\usage{getReq(Risk,neighbor,IC1,IC2,n=1,upper=15, radOrOutl=c("radius","Outlier"))} +\usage{getReq(Risk,neighbor,IC1,IC2,n=1,upper=15)} \arguments{ \item{Risk}{an object of class \code{"asGRisk"} -- the risk at which IC1 is better than IC2.} \item{neighbor}{ object of class \code{"Neighborhood"}; the neighborhood at which to compute the bias. } @@ -17,9 +17,6 @@ in the shrinking neighborhood setting of Rieder[94]. Otherwise the radius interval is scaled down accordingly.} \item{upper}{the upper bound of the radius interval in which to search} - \item{radOrOutl}{ a character string specifying whether an interval of - radii or a number of outliers is returned; must be one - of "radius" (default) and "Outlier". } } %\details{} \value{The radius interval (given by its endpoints) where \code{IC1} is better than \code{IC2} From noreply at r-forge.r-project.org Thu Sep 12 12:24:23 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 12:24:23 +0200 (CEST) Subject: [Robast-commits] r707 - branches/robast-0.9/pkg/RandVar/tests branches/robast-0.9/pkg/RobLox pkg/RobLox Message-ID: <20130912102423.C5BED1813BB@r-forge.r-project.org> Author: stamats Date: 2013-09-12 12:24:23 +0200 (Thu, 12 Sep 2013) New Revision: 707 Modified: branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save branches/robast-0.9/pkg/RobLox/DESCRIPTION branches/robast-0.9/pkg/RobLox/NAMESPACE pkg/RobLox/DESCRIPTION pkg/RobLox/NAMESPACE Log: some changes on description and namespace file Modified: branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save =================================================================== --- branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save 2013-09-12 10:19:55 UTC (rev 706) +++ branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save 2013-09-12 10:24:23 UTC (rev 707) @@ -1,7 +1,6 @@ -R Under development (unstable) (2013-01-09 r61595) -- "Unsuffered Consequences" +R Under development (unstable) (2013-09-11 r63902) -- "Unsuffered Consequences" Copyright (C) 2013 The R Foundation for Statistical Computing -ISBN 3-900051-07-0 Platform: x86_64-unknown-linux-gnu (64-bit) R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -17,17 +16,18 @@ Type 'q()' to quit R. > library(RandVar) +Loading required package: distr Loading required package: startupmsg :startupmsg> Utilities for start-up messages (version 0.8) :startupmsg> :startupmsg> For more information see ?"startupmsg", :startupmsg> NEWS("startupmsg") -Loading required package: distr Loading required package: sfsmisc Loading required package: SweaveListingUtils :SweaveListingUtils> Utilities for Sweave together with -:SweaveListingUtils> TeX listings package (version 0.6) +:SweaveListingUtils> TeX listings package (version +:SweaveListingUtils> 0.6.1) :SweaveListingUtils> :SweaveListingUtils> NOTE: Support for this package :SweaveListingUtils> will stop soon. @@ -55,7 +55,7 @@ Attaching package: 'SweaveListingUtils' -The following object is masked from 'package:base': +The following objects are masked from 'package:base': library, require @@ -81,7 +81,7 @@ Attaching package: 'distr' -The following object is masked from 'package:stats': +The following objects are masked from 'package:stats': df, qqplot, sd @@ -105,11 +105,11 @@ Attaching package: 'distrEx' -The following object is masked from 'package:stats': +The following objects are masked from 'package:stats': IQR, mad, median, var -:RandVar> Implementation of random variables (version 0.9) +:RandVar> Implementation of random variables (version 0.9.2) :RandVar> :RandVar> For more information see ?"RandVar", NEWS("RandVar"), as :RandVar> well as @@ -139,7 +139,7 @@ function (x) { } - + > Domain(R1) NULL @@ -409,7 +409,7 @@ } t(f(x)) } - + > dimension(R6) [1] 6 @@ -498,13 +498,13 @@ > ## "Math" group > system.time(Map(log(abs(R4))), gcFirst = TRUE) user system elapsed - 0.004 0.000 0.001 + 0.004 0.000 0.002 > system.time(Map(gamma(R7)), gcFirst = TRUE) user system elapsed 0.000 0.000 0.002 > system.time(Map(exp(RL1)[[1]]), gcFirst = TRUE) user system elapsed - 0.004 0.000 0.005 + 0.004 0.000 0.003 > > > ## "Arith" group @@ -521,7 +521,7 @@ } 1 * f2(x) } - + [[2]] function (x) @@ -532,7 +532,7 @@ } 3 * f2(x) } - + [[3]] function (x) @@ -543,7 +543,7 @@ } 5 * f2(x) } - + [[4]] function (x) @@ -554,7 +554,7 @@ } 1 * f2(x) } - + Warning message: In c(1, 3, 5) * R3 : @@ -572,7 +572,7 @@ } 1:2 * f2(x) } - + [[2]] function (x) @@ -583,7 +583,7 @@ } 1:2 * f2(x) } - + [[3]] function (x) @@ -594,7 +594,7 @@ } 1:2 * f2(x) } - + [[4]] function (x) @@ -605,7 +605,7 @@ } 1:2 * f2(x) } - + > Map(2/R6) [[1]] @@ -617,7 +617,7 @@ } 2/f2(x) } - + [[2]] function (x) @@ -628,7 +628,7 @@ } 2/f2(x) } - + [[3]] function (x) @@ -639,7 +639,7 @@ } 2/f2(x) } - + [[4]] function (x) @@ -650,7 +650,7 @@ } 2/f2(x) } - + [[5]] function (x) @@ -661,7 +661,7 @@ } 2/f2(x) } - + [[6]] function (x) @@ -672,7 +672,7 @@ } 2/f2(x) } - + > Map(c(1,3,5) %% R6) [[1]] @@ -684,7 +684,7 @@ } 1%%f2(x) } - + [[2]] function (x) @@ -695,7 +695,7 @@ } 3%%f2(x) } - + [[3]] function (x) @@ -706,7 +706,7 @@ } 5%%f2(x) } - + [[4]] function (x) @@ -717,7 +717,7 @@ } 1%%f2(x) } - + [[5]] function (x) @@ -728,7 +728,7 @@ } 3%%f2(x) } - + [[6]] function (x) @@ -739,7 +739,7 @@ } 5%%f2(x) } - + > Map(R4 - 5) [[1]] @@ -751,7 +751,7 @@ } f1(x) - c(5, 5) } - + [[2]] function (x) @@ -762,7 +762,7 @@ } f1(x) - c(5, 5) } - + [[3]] function (x) @@ -773,7 +773,7 @@ } f1(x) - c(5, 5) } - + [[4]] function (x) @@ -784,7 +784,7 @@ } f1(x) - c(5, 5) } - + > Map(R6 %/% 2) [[1]] @@ -796,7 +796,7 @@ } f1(x)%/%2 } - + [[2]] function (x) @@ -807,7 +807,7 @@ } f1(x)%/%2 } - + [[3]] function (x) @@ -818,7 +818,7 @@ } f1(x)%/%2 } - + [[4]] function (x) @@ -829,7 +829,7 @@ } f1(x)%/%2 } - + [[5]] function (x) @@ -840,7 +840,7 @@ } f1(x)%/%2 } - + [[6]] function (x) @@ -851,7 +851,7 @@ } f1(x)%/%2 } - + > Map(R3 ^ R3) [[1]] @@ -867,7 +867,7 @@ } f1(x)^f2(x) } - + [[2]] function (x) @@ -882,7 +882,7 @@ } f1(x)^f2(x) } - + [[3]] function (x) @@ -897,7 +897,7 @@ } f1(x)^f2(x) } - + [[4]] function (x) @@ -912,7 +912,7 @@ } f1(x)^f2(x) } - + > Map(R7 * R7) [[1]] @@ -928,7 +928,7 @@ } f1(x) * f2(x) } - + [[2]] function (x) @@ -943,7 +943,7 @@ } f1(x) * f2(x) } - + [[3]] function (x) @@ -958,7 +958,7 @@ } f1(x) * f2(x) } - + [[4]] function (x) @@ -973,7 +973,7 @@ } f1(x) * f2(x) } - + > Map((1 + RL1)[[1]]) [[1]] @@ -985,7 +985,7 @@ } 1 + f2(x) } - + [[2]] function (x) @@ -996,7 +996,7 @@ } 1 + f2(x) } - + [[3]] function (x) @@ -1007,7 +1007,7 @@ } 1 + f2(x) } - + [[4]] function (x) @@ -1018,7 +1018,7 @@ } 1 + f2(x) } - + > Map((RL1 * 2)[[2]]) [[1]] @@ -1030,7 +1030,7 @@ } f1(x) * 2 } - + [[2]] function (x) @@ -1041,7 +1041,7 @@ } f1(x) * 2 } - + [[3]] function (x) @@ -1052,7 +1052,7 @@ } f1(x) * 2 } - + [[4]] function (x) @@ -1063,7 +1063,7 @@ } f1(x) * 2 } - + [[5]] function (x) @@ -1074,7 +1074,7 @@ } f1(x) * 2 } - + [[6]] function (x) @@ -1085,11 +1085,11 @@ } f1(x) * 2 } - + > system.time(Map((RL1 %% RL1)[[3]]), gcFirst = TRUE) user system elapsed - 0.004 0.000 0.006 + 0.004 0.000 0.005 > > > ## "%*%" @@ -1159,7 +1159,7 @@ } f1(x) + c(13L, 15L) %*% f2(x) } - + > M1[2,] [1] 2 4 6 8 10 12 14 16 > Map(R8)[[2]] @@ -1195,7 +1195,7 @@ } f1(x) + c(14L, 16L) %*% f2(x) } - + > M2 <- matrix(1:2, ncol = 2) > (R9 <- M2 %*% R7) An object of class "EuclRandMatrix" @@ -1245,7 +1245,7 @@ } f1(x) + 2L %*% f2(x) } - + [[2]] function (x) @@ -1264,7 +1264,7 @@ } f1(x) + 2L %*% f2(x) } - + > Map(1:4 %*% R3) # inner product [[1]] @@ -1300,7 +1300,7 @@ } f1(x) + 4L %*% f2(x) } - + > Map(1:2 %*% R7) # corresponds to Map(t(1:2) %*% R7) [[1]] @@ -1320,7 +1320,7 @@ } f1(x) + 2L %*% f2(x) } - + [[2]] function (x) @@ -1339,7 +1339,7 @@ } f1(x) + 2L %*% f2(x) } - + > Map(R4 %*% 1:8) # inner product [[1]] @@ -1411,7 +1411,7 @@ } t(f(x)) } - + > Map(R9 %*% 3:4) [[1]] @@ -1467,7 +1467,7 @@ } t(f(x)) } - + > Map(R9 %*% matrix(1:4, nrow = 2)) [[1]] @@ -1523,7 +1523,7 @@ } t(f(x)) } - + [[2]] function (x) @@ -1578,7 +1578,7 @@ } t(f(x)) } - + > (R10 <- R3 %*% matrix(1:16, ncol = 4)) An object of class "EuclRandMatrix" @@ -1623,7 +1623,7 @@ } t(f(x)) } - + [[2]] function (x) @@ -1662,7 +1662,7 @@ } t(f(x)) } - + [[3]] function (x) @@ -1701,7 +1701,7 @@ } t(f(x)) } - + [[4]] function (x) @@ -1740,7 +1740,7 @@ } t(f(x)) } - + > R3 %*% R3 # inner product An object of class "EuclRandMatrix" @@ -1754,7 +1754,7 @@ Range: Euclidean Space with dimension 1 > system.time(R9 %*% R7, gcFirst = TRUE) user system elapsed - 0.004 0.000 0.005 + 0.004 0.000 0.004 > (RL3 <- diag(dimension(RL1)) %*% RL1) An object of class "EuclRandMatrix" Dim of Map: 14 1 @@ -1765,7 +1765,7 @@ > ## %m% "matrix multiplication" for 'EuclRandVarList' > system.time(RL4 <- EuclRandVarList(t(R3[1:2]), R7) %m% EuclRandVarList(R6, R9), gcFirst = TRUE) user system elapsed - 0.028 0.000 0.027 + 0.028 0.000 0.028 > > ## integration > MVD <- DiscreteMVDistribution(supp = matrix(c(r(Pois(5))(10), r(Pois(5))(10)), ncol = 2)) @@ -1976,4 +1976,4 @@ > q("no") > proc.time() user system elapsed - 13.072 0.084 13.197 + 12.192 0.088 12.319 Modified: branches/robast-0.9/pkg/RobLox/DESCRIPTION =================================================================== --- branches/robast-0.9/pkg/RobLox/DESCRIPTION 2013-09-12 10:19:55 UTC (rev 706) +++ branches/robast-0.9/pkg/RobLox/DESCRIPTION 2013-09-12 10:24:23 UTC (rev 707) @@ -1,11 +1,11 @@ Package: RobLox Version: 0.9.1 -Date: 2013-01-29 +Date: 2013-09-11 Title: Optimally robust influence curves and estimators for location and scale Description: Functions for the determination of optimally robust influence curves and estimators in case of normal location and/or scale -Depends: R(>= 2.14.0), stats, lattice, RColorBrewer, RandVar(>= 0.9.2), Biobase, - distr(>= 2.5.2), distrMod(>= 2.5.2), RobAStBase(>= 0.9) +Depends: R(>= 2.14.0), stats, distrMod(>= 2.5.2), RobAStBase(>= 0.9) +Imports: lattice, RColorBrewer, Biobase, RandVar(>= 0.9.2), distr(>= 2.5.2) Suggests: MASS Author: Matthias Kohl Maintainer: Matthias Kohl Modified: branches/robast-0.9/pkg/RobLox/NAMESPACE =================================================================== --- branches/robast-0.9/pkg/RobLox/NAMESPACE 2013-09-12 10:19:55 UTC (rev 706) +++ branches/robast-0.9/pkg/RobLox/NAMESPACE 2013-09-12 10:24:23 UTC (rev 707) @@ -5,9 +5,9 @@ importClassesFrom("distr","Reals") importFrom("RandVar", "EuclRandVarList", "RealRandVariable") importClassesFrom("RandVar", "EuclRandVarList", "RealRandVariable") -importFrom("distrMod","NormLocationFamily","NormLocationScaleFamily","symmetricBias", "NormType") -importClassesFrom("distrMod","L2LocationFamily","NormLocationFamily","NormLocationScaleFamily") -importMethodsFrom("distrMod","distribution","main", "addInfo<-", "Infos", "Infos<-", +importFrom("distrMod", "NormLocationFamily", "NormLocationScaleFamily", "symmetricBias", "NormType") +importClassesFrom("distrMod", "L2LocationFamily", "NormLocationFamily", "NormLocationScaleFamily") +importMethodsFrom("distrMod", "distribution", "main", "addInfo<-", "Infos", "Infos<-", "normtype", "biastype","normtype<-","biastype<-", "estimate") importFrom("RobAStBase","generateIC","ContNeighborhood") importClassesFrom("RobAStBase","HampelWeight","ALEstimate","kStepEstimate","ContNeighborhood") Modified: pkg/RobLox/DESCRIPTION =================================================================== --- pkg/RobLox/DESCRIPTION 2013-09-12 10:19:55 UTC (rev 706) +++ pkg/RobLox/DESCRIPTION 2013-09-12 10:24:23 UTC (rev 707) @@ -4,8 +4,8 @@ Title: Optimally robust influence curves and estimators for location and scale Description: Functions for the determination of optimally robust influence curves and estimators in case of normal location and/or scale -Depends: R(>= 2.14.0), stats, lattice, RColorBrewer, RandVar, Biobase, distr(>= 2.5.2), distrMod(>= 2.5.2), - RobAStBase(>= 0.9.2) +Depends: R(>= 2.14.0), stats, distrMod(>= 2.5.2), RobAStBase(>= 0.9) +Imports: lattice, RColorBrewer, Biobase, RandVar(>= 0.9.2), distr(>= 2.5.2) Suggests: MASS Author: Matthias Kohl Maintainer: Matthias Kohl Modified: pkg/RobLox/NAMESPACE =================================================================== --- pkg/RobLox/NAMESPACE 2013-09-12 10:19:55 UTC (rev 706) +++ pkg/RobLox/NAMESPACE 2013-09-12 10:24:23 UTC (rev 707) @@ -3,11 +3,11 @@ importFrom("RColorBrewer","brewer.pal") importFrom("distr", "q","Reals") importClassesFrom("distr","Reals") -importFrom("RandVar", "EuclRandVarList", "RealRandVariable") -importClassesFrom("RandVar", "EuclRandVarList", "RealRandVariable") -importFrom("distrMod","NormLocationFamily","NormLocationScaleFamily","symmetricBias", "NormType") -importClassesFrom("distrMod","L2LocationFamily","NormLocationFamily","NormLocationScaleFamily") -importMethodsFrom("distrMod","distribution","main", "addInfo<-", "Infos", "Infos<-", +importFrom("RandVar", "EuclRandVarList", "RealRandVariable") +importClassesFrom("RandVar", "EuclRandVarList", "RealRandVariable") +importFrom("distrMod", "NormLocationFamily", "NormLocationScaleFamily", "symmetricBias", "NormType") +importClassesFrom("distrMod", "L2LocationFamily", "NormLocationFamily", "NormLocationScaleFamily") +importMethodsFrom("distrMod", "distribution", "main", "addInfo<-", "Infos", "Infos<-", "normtype", "biastype","normtype<-","biastype<-", "estimate") importFrom("RobAStBase","generateIC","ContNeighborhood") importClassesFrom("RobAStBase","HampelWeight","ALEstimate","kStepEstimate","ContNeighborhood") From noreply at r-forge.r-project.org Thu Sep 12 12:26:05 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 12:26:05 +0200 (CEST) Subject: [Robast-commits] r708 - pkg/RandVar/tests Message-ID: <20130912102605.90DDB1813BB@r-forge.r-project.org> Author: stamats Date: 2013-09-12 12:26:05 +0200 (Thu, 12 Sep 2013) New Revision: 708 Modified: pkg/RandVar/tests/tests.Rout.save Log: update of test.Rout.save Modified: pkg/RandVar/tests/tests.Rout.save =================================================================== --- pkg/RandVar/tests/tests.Rout.save 2013-09-12 10:24:23 UTC (rev 707) +++ pkg/RandVar/tests/tests.Rout.save 2013-09-12 10:26:05 UTC (rev 708) @@ -1,7 +1,6 @@ -R version 2.12.1 Patched (2011-01-04 r53913) -Copyright (C) 2011 The R Foundation for Statistical Computing -ISBN 3-900051-07-0 +R Under development (unstable) (2013-09-11 r63902) -- "Unsuffered Consequences" +Copyright (C) 2013 The R Foundation for Statistical Computing Platform: x86_64-unknown-linux-gnu (64-bit) R is free software and comes with ABSOLUTELY NO WARRANTY. @@ -17,18 +16,26 @@ Type 'q()' to quit R. > library(RandVar) +Loading required package: distr Loading required package: startupmsg -:startupmsg> Utilities for start-up messages (version 0.7.1) +:startupmsg> Utilities for start-up messages (version 0.8) :startupmsg> :startupmsg> For more information see ?"startupmsg", :startupmsg> NEWS("startupmsg") -Loading required package: distr Loading required package: sfsmisc Loading required package: SweaveListingUtils :SweaveListingUtils> Utilities for Sweave together with -:SweaveListingUtils> TeX listings package (version 0.5) +:SweaveListingUtils> TeX listings package (version +:SweaveListingUtils> 0.6.1) :SweaveListingUtils> +:SweaveListingUtils> NOTE: Support for this package +:SweaveListingUtils> will stop soon. +:SweaveListingUtils> +:SweaveListingUtils> Package 'knitr' is providing the +:SweaveListingUtils> same functionality in a better +:SweaveListingUtils> way. +:SweaveListingUtils> :SweaveListingUtils> Some functions from package 'base' :SweaveListingUtils> are intentionally masked ---see :SweaveListingUtils> SweaveListingMASK(). @@ -48,12 +55,12 @@ Attaching package: 'SweaveListingUtils' -The following object(s) are masked from 'package:base': +The following objects are masked from 'package:base': library, require :distr> Object oriented implementation of distributions (version -:distr> 2.3) +:distr> 2.4) :distr> :distr> Attention: Arithmetics on distribution objects are :distr> understood as operations on corresponding random variables @@ -74,25 +81,20 @@ Attaching package: 'distr' -The following object(s) are masked from 'package:stats': +The following objects are masked from 'package:stats': df, qqplot, sd Loading required package: distrEx -Loading required package: evd -Loading required package: actuar - -Attaching package: 'actuar' - -The following object(s) are masked from 'package:grDevices': - - cm - -:distrEx> Extensions of package distr (version 2.3) +:distrEx> Extensions of package distr (version 2.4) :distrEx> :distrEx> Note: Packages "e1071", "moments", "fBasics" should be -:distrEx> attached /before/ package "distrEx". See distrExMASK(). +:distrEx> attached /before/ package "distrEx". See +:distrEx> distrExMASK().Note: Extreme value distribution +:distrEx> functionality has been moved to :distrEx> +:distrEx> package "RobExtremes". See distrExMOVED(). +:distrEx> :distrEx> For more information see ?"distrEx", NEWS("distrEx"), as :distrEx> well as :distrEx> http://distr.r-forge.r-project.org/ @@ -103,11 +105,11 @@ Attaching package: 'distrEx' -The following object(s) are masked from 'package:stats': +The following objects are masked from 'package:stats': IQR, mad, median, var -:RandVar> Implementation of random variables (version 0.8) +:RandVar> Implementation of random variables (version 0.9.2) :RandVar> :RandVar> For more information see ?"RandVar", NEWS("RandVar"), as :RandVar> well as @@ -137,7 +139,7 @@ function (x) { } - + > Domain(R1) NULL @@ -278,6 +280,7 @@ x^4 } +> set.seed(123) > evalRandVar(R3, rnorm(1)) [,1] [1,] -0.56047565 @@ -361,11 +364,11 @@ > res2.R5[,,1,2] [1] 1.4330626 0.3598138 0.3521000 0.0000000 > res2.R5[,1,2,1:2] - [,1] [,2] -[1,] 4.752678 1.4929760 -[2,] 1.558708 0.4007715 -[3,] 0.999927 0.3901288 -[4,] 1.000000 0.0000000 + [,1] [,2] +[1,] 4.7526783 1.4929760 +[2,] 1.5587083 0.4007715 +[3,] 0.9999269 0.3901288 +[4,] 1.0000000 0.0000000 > res2.R5[1,1,1:2,2] [1] 1.433063 1.492976 > @@ -406,7 +409,7 @@ } t(f(x)) } - + > dimension(R6) [1] 6 @@ -495,13 +498,13 @@ > ## "Math" group > system.time(Map(log(abs(R4))), gcFirst = TRUE) user system elapsed - 0.000 0.000 0.001 + 0.004 0.000 0.002 > system.time(Map(gamma(R7)), gcFirst = TRUE) user system elapsed - 0.000 0.000 0.003 + 0.000 0.000 0.002 > system.time(Map(exp(RL1)[[1]]), gcFirst = TRUE) user system elapsed - 0.000 0.000 0.004 + 0.004 0.000 0.003 > > > ## "Arith" group @@ -518,7 +521,7 @@ } 1 * f2(x) } - + [[2]] function (x) @@ -529,7 +532,7 @@ } 3 * f2(x) } - + [[3]] function (x) @@ -540,7 +543,7 @@ } 5 * f2(x) } - + [[4]] function (x) @@ -551,7 +554,7 @@ } 1 * f2(x) } - + Warning message: In c(1, 3, 5) * R3 : @@ -569,7 +572,7 @@ } 1:2 * f2(x) } - + [[2]] function (x) @@ -580,7 +583,7 @@ } 1:2 * f2(x) } - + [[3]] function (x) @@ -591,7 +594,7 @@ } 1:2 * f2(x) } - + [[4]] function (x) @@ -602,7 +605,7 @@ } 1:2 * f2(x) } - + > Map(2/R6) [[1]] @@ -614,7 +617,7 @@ } 2/f2(x) } - + [[2]] function (x) @@ -625,7 +628,7 @@ } 2/f2(x) } - + [[3]] function (x) @@ -636,7 +639,7 @@ } 2/f2(x) } - + [[4]] function (x) @@ -647,7 +650,7 @@ } 2/f2(x) } - + [[5]] function (x) @@ -658,7 +661,7 @@ } 2/f2(x) } - + [[6]] function (x) @@ -669,7 +672,7 @@ } 2/f2(x) } - + > Map(c(1,3,5) %% R6) [[1]] @@ -681,7 +684,7 @@ } 1%%f2(x) } - + [[2]] function (x) @@ -692,7 +695,7 @@ } 3%%f2(x) } - + [[3]] function (x) @@ -703,7 +706,7 @@ } 5%%f2(x) } - + [[4]] function (x) @@ -714,7 +717,7 @@ } 1%%f2(x) } - + [[5]] function (x) @@ -725,7 +728,7 @@ } 3%%f2(x) } - + [[6]] function (x) @@ -736,7 +739,7 @@ } 5%%f2(x) } - + > Map(R4 - 5) [[1]] @@ -748,7 +751,7 @@ } f1(x) - c(5, 5) } - + [[2]] function (x) @@ -759,7 +762,7 @@ } f1(x) - c(5, 5) } - + [[3]] function (x) @@ -770,7 +773,7 @@ } f1(x) - c(5, 5) } - + [[4]] function (x) @@ -781,7 +784,7 @@ } f1(x) - c(5, 5) } - + > Map(R6 %/% 2) [[1]] @@ -793,7 +796,7 @@ } f1(x)%/%2 } - + [[2]] function (x) @@ -804,7 +807,7 @@ } f1(x)%/%2 } - + [[3]] function (x) @@ -815,7 +818,7 @@ } f1(x)%/%2 } - + [[4]] function (x) @@ -826,7 +829,7 @@ } f1(x)%/%2 } - + [[5]] function (x) @@ -837,7 +840,7 @@ } f1(x)%/%2 } - + [[6]] function (x) @@ -848,7 +851,7 @@ } f1(x)%/%2 } - + > Map(R3 ^ R3) [[1]] @@ -864,7 +867,7 @@ } f1(x)^f2(x) } - + [[2]] function (x) @@ -879,7 +882,7 @@ } f1(x)^f2(x) } - + [[3]] function (x) @@ -894,7 +897,7 @@ } f1(x)^f2(x) } - + [[4]] function (x) @@ -909,7 +912,7 @@ } f1(x)^f2(x) } - + > Map(R7 * R7) [[1]] @@ -925,7 +928,7 @@ } f1(x) * f2(x) } - + [[2]] function (x) @@ -940,7 +943,7 @@ } f1(x) * f2(x) } - + [[3]] function (x) @@ -955,7 +958,7 @@ } f1(x) * f2(x) } - + [[4]] function (x) @@ -970,7 +973,7 @@ } f1(x) * f2(x) } - + > Map((1 + RL1)[[1]]) [[1]] @@ -982,7 +985,7 @@ } 1 + f2(x) } - + [[2]] function (x) @@ -993,7 +996,7 @@ } 1 + f2(x) } - + [[3]] function (x) @@ -1004,7 +1007,7 @@ } 1 + f2(x) } - + [[4]] function (x) @@ -1015,7 +1018,7 @@ } 1 + f2(x) } - + > Map((RL1 * 2)[[2]]) [[1]] @@ -1027,7 +1030,7 @@ } f1(x) * 2 } - + [[2]] function (x) @@ -1038,7 +1041,7 @@ } f1(x) * 2 } - + [[3]] function (x) @@ -1049,7 +1052,7 @@ } f1(x) * 2 } - + [[4]] function (x) @@ -1060,7 +1063,7 @@ } f1(x) * 2 } - + [[5]] function (x) @@ -1071,7 +1074,7 @@ } f1(x) * 2 } - + [[6]] function (x) @@ -1082,11 +1085,11 @@ } f1(x) * 2 } - + > system.time(Map((RL1 %% RL1)[[3]]), gcFirst = TRUE) user system elapsed - 0.010 0.000 0.007 + 0.004 0.000 0.005 > > > ## "%*%" @@ -1156,7 +1159,7 @@ } f1(x) + c(13L, 15L) %*% f2(x) } - + > M1[2,] [1] 2 4 6 8 10 12 14 16 > Map(R8)[[2]] @@ -1192,7 +1195,7 @@ } f1(x) + c(14L, 16L) %*% f2(x) } - + > M2 <- matrix(1:2, ncol = 2) > (R9 <- M2 %*% R7) An object of class "EuclRandMatrix" @@ -1242,7 +1245,7 @@ } f1(x) + 2L %*% f2(x) } - + [[2]] function (x) @@ -1261,7 +1264,7 @@ } f1(x) + 2L %*% f2(x) } - + > Map(1:4 %*% R3) # inner product [[1]] @@ -1297,7 +1300,7 @@ } f1(x) + 4L %*% f2(x) } - + > Map(1:2 %*% R7) # corresponds to Map(t(1:2) %*% R7) [[1]] @@ -1317,7 +1320,7 @@ } f1(x) + 2L %*% f2(x) } - + [[2]] function (x) @@ -1336,7 +1339,7 @@ } f1(x) + 2L %*% f2(x) } - + > Map(R4 %*% 1:8) # inner product [[1]] @@ -1408,7 +1411,7 @@ } t(f(x)) } - + > Map(R9 %*% 3:4) [[1]] @@ -1464,7 +1467,7 @@ } t(f(x)) } - + > Map(R9 %*% matrix(1:4, nrow = 2)) [[1]] @@ -1520,7 +1523,7 @@ } t(f(x)) } - + [[2]] function (x) @@ -1575,7 +1578,7 @@ } t(f(x)) } - + > (R10 <- R3 %*% matrix(1:16, ncol = 4)) An object of class "EuclRandMatrix" @@ -1620,7 +1623,7 @@ } t(f(x)) } - + [[2]] function (x) @@ -1659,7 +1662,7 @@ } t(f(x)) } - + [[3]] function (x) @@ -1698,7 +1701,7 @@ } t(f(x)) } - + [[4]] function (x) @@ -1737,7 +1740,7 @@ } t(f(x)) } - + > R3 %*% R3 # inner product An object of class "EuclRandMatrix" @@ -1751,7 +1754,7 @@ Range: Euclidean Space with dimension 1 > system.time(R9 %*% R7, gcFirst = TRUE) user system elapsed - 0.010 0.000 0.005 + 0.004 0.000 0.004 > (RL3 <- diag(dimension(RL1)) %*% RL1) An object of class "EuclRandMatrix" Dim of Map: 14 1 @@ -1762,7 +1765,7 @@ > ## %m% "matrix multiplication" for 'EuclRandVarList' > system.time(RL4 <- EuclRandVarList(t(R3[1:2]), R7) %m% EuclRandVarList(R6, R9), gcFirst = TRUE) user system elapsed - 0.040 0.000 0.032 + 0.028 0.000 0.028 > > ## integration > MVD <- DiscreteMVDistribution(supp = matrix(c(r(Pois(5))(10), r(Pois(5))(10)), ncol = 2)) @@ -1890,13 +1893,13 @@ > > CD <- LMCondDistribution(theta = 1) > E(CD, cond = 2) -[1] 2.000000 +[1] 2 > E(CD, cond = 2, useApply = FALSE) -[1] 2.000000 +[1] 2 > E(CD, function(x){x}, cond = 2) -[1] 2.000000 +[1] 2 > E(CD, function(x){x}, cond = 2, useApply = FALSE) -[1] 2.000000 +[1] 2 > E(CD, function(x, cond){2*x}, cond = 2, withCond = FALSE) [1] 3.999999 > E(CD, function(x, cond){2*x}, cond = 2, withCond = TRUE, useApply = FALSE) @@ -1971,3 +1974,6 @@ > ############################################################################### > > q("no") +> proc.time() + user system elapsed + 12.192 0.088 12.319 From noreply at r-forge.r-project.org Thu Sep 12 13:00:21 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 13:00:21 +0200 (CEST) Subject: [Robast-commits] r709 - pkg/RobLoxBioC Message-ID: <20130912110021.B8881184633@r-forge.r-project.org> Author: stamats Date: 2013-09-12 13:00:21 +0200 (Thu, 12 Sep 2013) New Revision: 709 Modified: pkg/RobLoxBioC/DESCRIPTION pkg/RobLoxBioC/NAMESPACE Log: some changes to description and namespace file Modified: pkg/RobLoxBioC/DESCRIPTION =================================================================== --- pkg/RobLoxBioC/DESCRIPTION 2013-09-12 10:26:05 UTC (rev 708) +++ pkg/RobLoxBioC/DESCRIPTION 2013-09-12 11:00:21 UTC (rev 709) @@ -4,8 +4,8 @@ Title: Infinitesimally robust estimators for preprocessing omics data Description: Functions for the determination of optimally robust influence curves and estimators for preprocessing omics data, in particular gene expression data. -Depends: R(>= 2.14.0), methods, Biobase, affy, beadarray, distr(>= 2.5.2), RobLox(>= 0.9.2), lattice, - RColorBrewer,BiocGenerics,distrMod(>= 2.5.2) +Depends: R(>= 2.14.0), methods, RobLox(>= 0.9), affy +Imports: BiocGenerics, Biobase, beadarray, lattice, RColorBrewer, distr(>= 2.5.2) Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes Modified: pkg/RobLoxBioC/NAMESPACE =================================================================== --- pkg/RobLoxBioC/NAMESPACE 2013-09-12 10:26:05 UTC (rev 708) +++ pkg/RobLoxBioC/NAMESPACE 2013-09-12 11:00:21 UTC (rev 709) @@ -1,15 +1,15 @@ import("methods", "distr") -importMethodsFrom("distrMod","estimate") -importFrom("RColorBrewer","brewer.pal") -importFrom("lattice","stripplot") importMethodsFrom("BiocGenerics","append","annotation") importFrom("Biobase","assayDataNew") +importFrom("lattice","stripplot") +importFrom("RColorBrewer","brewer.pal") importClassesFrom("Biobase","ExpressionSet","AssayData","AnnotatedDataFrame") importMethodsFrom("Biobase", "rowMedians", "featureNames", "sampleNames", "phenoData", "experimentData", "exprs", "exprs<-", "assayData","assayData<-") -importFrom("affy","bg.correct.mas","getCdfInfo") +importFrom("affy","bg.correct.mas","getCdfInfo","tukey.biweight") importMethodsFrom("affy","intensity") import("beadarray") importFrom("RobLox", "rowRoblox", "finiteSampleCorrection") + exportMethods("robloxbioc", "KolmogorovMinDist") export("AffySimStudy", "IlluminaSimStudy") From noreply at r-forge.r-project.org Thu Sep 12 14:48:21 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 14:48:21 +0200 (CEST) Subject: [Robast-commits] r710 - pkg/RobExtremes Message-ID: <20130912124821.7F4921855CA@r-forge.r-project.org> Author: stamats Date: 2013-09-12 14:48:21 +0200 (Thu, 12 Sep 2013) New Revision: 710 Modified: pkg/RobExtremes/DESCRIPTION pkg/RobExtremes/NAMESPACE Log: some changes to description and namespace file Modified: pkg/RobExtremes/DESCRIPTION =================================================================== --- pkg/RobExtremes/DESCRIPTION 2013-09-12 11:00:21 UTC (rev 709) +++ pkg/RobExtremes/DESCRIPTION 2013-09-12 12:48:21 UTC (rev 710) @@ -4,10 +4,9 @@ Title: Optimally robust estimation for extreme value distributions Description: Optimally robust estimation for extreme value distributions using S4 classes and methods (based on packages distr, distrEx, distrMod, RobAStBase, and ROptEst) -Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.4), RandVar(>= 0.9.2), distrMod(>= 2.5.2), - RobAStBase(>= 0.9), ROptEst(>= 0.9), robustbase(>= 0.8-0), evd, actuar +Depends: R (>= 2.14.0), evd, RobAStBase(>= 0.9) +Imports: methods, distr(>= 2.5.2), distrEx(>= 2.4), distrMod(>= 2.5.2), RobAStRDA, actuar, robustbase(>= 0.8-0), RandVar(>= 0.9.2), ROptEst(>= 0.9) Suggests: RUnit (>= 0.4.26) -Imports: RobAStRDA Author: Peter Ruckdeschel, Matthias Kohl, Nataliya Horbenko Maintainer: Peter Ruckdeschel LazyLoad: yes Modified: pkg/RobExtremes/NAMESPACE =================================================================== --- pkg/RobExtremes/NAMESPACE 2013-09-12 11:00:21 UTC (rev 709) +++ pkg/RobExtremes/NAMESPACE 2013-09-12 12:48:21 UTC (rev 710) @@ -14,9 +14,9 @@ exportClasses("GumbelParameter", "ParetoParameter", - "GParetoParameter", - "GEVParameter", - "LDEstimate") + "GParetoParameter", + "GEVParameter", + "LDEstimate") exportClasses("Gumbel", "Pareto", "GPareto", "GEV") exportClasses("GParetoFamily", "GumbelLocationFamily", "WeibullFamily", "ParetoFamily", "GEVFamily", "GEVFamilyMuUnknown") @@ -32,7 +32,7 @@ "E", "var", "IQR", "skewness", "kurtosis", "median", "dispersion") exportMethods("modifyModel", "getStartIC") exportMethods("moveL2Fam2RefParam", - "moveICBackFromRefParam") + "moveICBackFromRefParam") export("EULERMASCHERONICONSTANT","APERYCONSTANT") export("Gumbel", "Pareto", "GPareto", "GEV") From noreply at r-forge.r-project.org Thu Sep 12 15:01:14 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 12 Sep 2013 15:01:14 +0200 (CEST) Subject: [Robast-commits] r711 - pkg/RobRex Message-ID: <20130912130115.088241855CA@r-forge.r-project.org> Author: stamats Date: 2013-09-12 15:01:11 +0200 (Thu, 12 Sep 2013) New Revision: 711 Modified: pkg/RobRex/DESCRIPTION Log: minor correction Modified: pkg/RobRex/DESCRIPTION =================================================================== --- pkg/RobRex/DESCRIPTION 2013-09-12 12:48:21 UTC (rev 710) +++ pkg/RobRex/DESCRIPTION 2013-09-12 13:01:11 UTC (rev 711) @@ -5,7 +5,7 @@ Description: functions for the determination of optimally robust influence curves in case of linear regression with unknown scale and standard normal distributed errors where the regressor is random. -Depends: R (>= 2.14.0), ROptRegTS(>= 0.9.2) +Depends: R (>= 2.14.0), ROptRegTS(>= 0.9) Author: Matthias Kohl Maintainer: Matthias Kohl LazyLoad: yes From noreply at r-forge.r-project.org Fri Sep 13 18:38:47 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 13 Sep 2013 18:38:47 +0200 (CEST) Subject: [Robast-commits] r712 - pkg/RobLoxBioC/man Message-ID: <20130913163847.B6470185D9C@r-forge.r-project.org> Author: stamats Date: 2013-09-13 18:38:47 +0200 (Fri, 13 Sep 2013) New Revision: 712 Modified: pkg/RobLoxBioC/man/KolmogorovMinDist.Rd Log: minor change Modified: pkg/RobLoxBioC/man/KolmogorovMinDist.Rd =================================================================== --- pkg/RobLoxBioC/man/KolmogorovMinDist.Rd 2013-09-12 13:01:11 UTC (rev 711) +++ pkg/RobLoxBioC/man/KolmogorovMinDist.Rd 2013-09-13 16:38:47 UTC (rev 712) @@ -35,8 +35,7 @@ \item{imagesPerArray}{ Specifies how many images (strips) there are per array. Normally 1 for a SAM and 1 or 2 for a BeadChip. The images (strips) from the same array will be combined so that each column in the output represents a sample. } - \item{what}{ character string specifying which intensities/values to summarize. - See \code{\link[beadarray]{getArrayData}} for a list of possibilities. } + \item{what}{ character string specifying which intensities/values to summarize. } \item{probes}{ Specify particular probes to summarize. If left \code{NULL} then all the probes on the first array are used. } \item{arrays}{ integer (scalar or vector) specifying the strips/arrays to summarize. From noreply at r-forge.r-project.org Sat Sep 14 14:15:53 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 14 Sep 2013 14:15:53 +0200 (CEST) Subject: [Robast-commits] r713 - pkg/ROptRegTS Message-ID: <20130914121553.42025185430@r-forge.r-project.org> Author: stamats Date: 2013-09-14 14:15:52 +0200 (Sat, 14 Sep 2013) New Revision: 713 Modified: pkg/ROptRegTS/DESCRIPTION Log: version number update Modified: pkg/ROptRegTS/DESCRIPTION =================================================================== --- pkg/ROptRegTS/DESCRIPTION 2013-09-13 16:38:47 UTC (rev 712) +++ pkg/ROptRegTS/DESCRIPTION 2013-09-14 12:15:52 UTC (rev 713) @@ -1,11 +1,11 @@ Package: ROptRegTS -Version: 0.9 +Version: 0.9.1 Date: 2013-09-12 Title: Optimally robust estimation for regression-type models Description: Optimally robust estimation for regression-type models using S4 classes and methods -Depends: R (>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.4), RandVar(>= 0.9.2), - ROptEstOld(>= 0.9.2) +Depends: R (>= 2.14.0), ROptEstOld(>= 0.9.2) +Imports: methods, RandVar(>= 0.9.2), distr(>= 2.5.2), distrEx(>= 2.4) Author: Matthias Kohl , Peter Ruckdeschel Maintainer: Matthias Kohl LazyLoad: yes From noreply at r-forge.r-project.org Sat Sep 14 14:22:48 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sat, 14 Sep 2013 14:22:48 +0200 (CEST) Subject: [Robast-commits] r714 - pkg/RobRex Message-ID: <20130914122248.842DF185D31@r-forge.r-project.org> Author: stamats Date: 2013-09-14 14:22:48 +0200 (Sat, 14 Sep 2013) New Revision: 714 Modified: pkg/RobRex/DESCRIPTION Log: minor change Modified: pkg/RobRex/DESCRIPTION =================================================================== --- pkg/RobRex/DESCRIPTION 2013-09-14 12:15:52 UTC (rev 713) +++ pkg/RobRex/DESCRIPTION 2013-09-14 12:22:48 UTC (rev 714) @@ -2,7 +2,7 @@ Version: 0.9 Date: 2013-09-12 Title: Optimally robust influence curves for regression and scale -Description: functions for the determination of optimally robust influence curves in case of +Description: Functions for the determination of optimally robust influence curves in case of linear regression with unknown scale and standard normal distributed errors where the regressor is random. Depends: R (>= 2.14.0), ROptRegTS(>= 0.9) From noreply at r-forge.r-project.org Wed Sep 18 12:24:46 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 18 Sep 2013 12:24:46 +0200 (CEST) Subject: [Robast-commits] r715 - branches/robast-1.0/pkg/ROptEst/R branches/robast-1.0/pkg/RobAStBase/R pkg/ROptEst pkg/ROptEst/R pkg/RobAStBase pkg/RobAStBase/R Message-ID: <20130918102446.98B1C183B43@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-18 12:24:46 +0200 (Wed, 18 Sep 2013) New Revision: 715 Modified: branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R pkg/ROptEst/DESCRIPTION pkg/ROptEst/R/plotWrapper.R pkg/RobAStBase/DESCRIPTION pkg/RobAStBase/R/plotWrapper.R Log: fixed two bugs in plotWrapper.R in pkgs RobAStBase and ROptEst detected by Misha Modified: branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R =================================================================== --- branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R 2013-09-14 12:22:48 UTC (rev 714) +++ branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R 2013-09-18 10:24:46 UTC (rev 715) @@ -105,7 +105,7 @@ ,ylab=substitute("Asymptotic Risk difference (classic - robust)") ,bty = substitute("o") ), scaleList) - print(argsList) +# print(argsList) ##parameter for plotting if(mc$with.legend) { @@ -119,7 +119,7 @@ } args <- .merge.lists(argsList, dots) - print(args) +# print(args) ### ### 3. build up the call but grab it and write it into an object ### Modified: branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R =================================================================== --- branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R 2013-09-14 12:22:48 UTC (rev 714) +++ branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R 2013-09-18 10:24:46 UTC (rev 715) @@ -308,7 +308,7 @@ ,panel.first= substitute(grid()) ,col = substitute("blue") ), scaleList) - if(missing(y)){c(argsList, y = substitute(y) + if(!missing(y)){c(argsList, y = substitute(y) ,cex.pts = substitute(0.3) ,col.pts = substitute(addAlphTrsp2col(rgb(0,255,0,maxColorValue=255), substitute(alpha.trsp))) ,pch.pts = substitute(19) Modified: pkg/ROptEst/DESCRIPTION =================================================================== --- pkg/ROptEst/DESCRIPTION 2013-09-14 12:22:48 UTC (rev 714) +++ pkg/ROptEst/DESCRIPTION 2013-09-18 10:24:46 UTC (rev 715) @@ -1,5 +1,5 @@ Package: ROptEst -Version: 0.9 +Version: 0.9.1 Date: 2013-09-11 Title: Optimally robust estimation Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods. Modified: pkg/ROptEst/R/plotWrapper.R =================================================================== --- pkg/ROptEst/R/plotWrapper.R 2013-09-14 12:22:48 UTC (rev 714) +++ pkg/ROptEst/R/plotWrapper.R 2013-09-18 10:24:46 UTC (rev 715) @@ -105,7 +105,7 @@ ,ylab=substitute("Asymptotic Risk difference (classic - robust)") ,bty = substitute("o") ), scaleList) - print(argsList) +# print(argsList) ##parameter for plotting if(mc$with.legend) { @@ -119,7 +119,7 @@ } args <- .merge.lists(argsList, dots) - print(args) +# print(args) ### ### 3. build up the call but grab it and write it into an object ### Modified: pkg/RobAStBase/DESCRIPTION =================================================================== --- pkg/RobAStBase/DESCRIPTION 2013-09-14 12:22:48 UTC (rev 714) +++ pkg/RobAStBase/DESCRIPTION 2013-09-18 10:24:46 UTC (rev 715) @@ -1,5 +1,5 @@ Package: RobAStBase -Version: 0.9 +Version: 0.9.1 Date: 2013-09-11 Title: Robust Asymptotic Statistics Description: Base S4-classes and functions for robust asymptotic statistics. Modified: pkg/RobAStBase/R/plotWrapper.R =================================================================== --- pkg/RobAStBase/R/plotWrapper.R 2013-09-14 12:22:48 UTC (rev 714) +++ pkg/RobAStBase/R/plotWrapper.R 2013-09-18 10:24:46 UTC (rev 715) @@ -308,7 +308,7 @@ ,panel.first= substitute(grid()) ,col = substitute("blue") ), scaleList) - if(missing(y)){c(argsList, y = substitute(y) + if(!missing(y)){c(argsList, y = substitute(y) ,cex.pts = substitute(0.3) ,col.pts = substitute(addAlphTrsp2col(rgb(0,255,0,maxColorValue=255), substitute(alpha.trsp))) ,pch.pts = substitute(19) From noreply at r-forge.r-project.org Mon Sep 23 10:29:00 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 23 Sep 2013 10:29:00 +0200 (CEST) Subject: [Robast-commits] r716 - branches/robast-1.0/pkg/ROptEst Message-ID: <20130923082900.344E91858DC@r-forge.r-project.org> Author: kroisand Date: 2013-09-23 10:28:59 +0200 (Mon, 23 Sep 2013) New Revision: 716 Modified: branches/robast-1.0/pkg/ROptEst/DESCRIPTION Log: needed version of RandVar was wrongly specified in ROptEst in the branch 1.0 Modified: branches/robast-1.0/pkg/ROptEst/DESCRIPTION =================================================================== --- branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2013-09-18 10:24:46 UTC (rev 715) +++ branches/robast-1.0/pkg/ROptEst/DESCRIPTION 2013-09-23 08:28:59 UTC (rev 716) @@ -5,7 +5,7 @@ Description: Optimally robust estimation in general smoothly parameterized models using S4 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) + RandVar(>= 0.9.2), RobAStBase(>= 0.9) Suggests: RobLox, MASS Author: Matthias Kohl, Peter Ruckdeschel Maintainer: Matthias Kohl From noreply at r-forge.r-project.org Mon Sep 23 10:38:46 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 23 Sep 2013 10:38:46 +0200 (CEST) Subject: [Robast-commits] r717 - branches/robast-1.0/pkg/RobExtremes/R Message-ID: <20130923083846.873491858DC@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-23 10:38:46 +0200 (Mon, 23 Sep 2013) New Revision: 717 Removed: branches/robast-1.0/pkg/RobExtremes/R/GEVFamily.R.bak Log: RobExtremes: deleted some .bak file from R folder Deleted: branches/robast-1.0/pkg/RobExtremes/R/GEVFamily.R.bak =================================================================== --- branches/robast-1.0/pkg/RobExtremes/R/GEVFamily.R.bak 2013-09-23 08:28:59 UTC (rev 716) +++ branches/robast-1.0/pkg/RobExtremes/R/GEVFamily.R.bak 2013-09-23 08:38:46 UTC (rev 717) @@ -1,412 +0,0 @@ -################################# -## -## Class: GEVFamily for positive shape -## -################################ - -### some reusable blocks of code (to avoid redundancy): - -.warningGEVShapeLarge <- function(xi){ - if(xi>=4.5) - warning("A shape estimate larger than 4.5 was produced.\n", - "Shape parameter values larger than 4.5 are critical\n", - "in the GEV family as to numerical issues. Be careful with \n", - "ALE results obtained here; they might be unreliable.") - } - -### pretreatment of of.interest -.pretreat.of.interest <- function(of.interest,trafo){ - if(is.null(trafo)){ - of.interest <- unique(of.interest) - if(length(of.interest) > 2) - stop("A maximum number of two parameters resp. parameter transformations may be selected.") - if(!all(of.interest %in% c("scale", "shape", "quantile", "expected loss", "expected shortfall"))) - stop("Parameters resp. transformations of interest have to be selected from: ", - "'scale', 'shape', 'quantile', 'expected loss', 'expected shortfall'.") - - ## reordering of of.interest - if(("scale" %in% of.interest) && ("scale" != of.interest[1])){ - of.interest[2] <- of.interest[1] - of.interest[1] <- "scale" - } - if(!("scale" %in% of.interest) && ("shape" %in% of.interest) && ("shape" != of.interest[1])){ - of.interest[2] <- of.interest[1] - of.interest[1] <- "shape" - } - if(!any(c("scale", "shape") %in% of.interest) && ("quantile" %in% of.interest) - && ("quantile" != of.interest[1])){ - of.interest[2] <- of.interest[1] - of.interest[1] <- "quantile" - } - if(!any(c("scale", "shape", "quantile") %in% of.interest) - && ("expected shortfall" %in% of.interest) - && ("expected shortfall" != of.interest[1])){ - of.interest[2] <- of.interest[1] - of.interest[1] <- "expected shortfall" - } - } - return(of.interest) -} - -.define.tau.Dtau <- function(of.interest, btq, bDq, btes, - bDes, btel, bDel, p, N){ - tau <- NULL - if("scale" %in% of.interest){ - tau <- function(theta){ th <- theta[1]; names(th) <- "scale"; th} - Dtau <- function(theta){ D <- t(c(1, 0)); rownames(D) <- "scale"; D} - } - if("shape" %in% of.interest){ - if(is.null(tau)){ - tau <- function(theta){th <- theta[2]; names(th) <- "shape"; th} - Dtau <- function(theta){D <- t(c(0,1));rownames(D) <- "shape";D} - }else{ - tau <- function(theta){th <- theta - names(th) <- c("scale", "shape"); th} - Dtau <- function(theta){ D <- diag(2); - rownames(D) <- c("scale", "shape");D} - } - } - if("quantile" %in% of.interest){ - if(is.null(p)) stop("Probability 'p' has to be specified.") - if(is.null(tau)){ - tau <- function(theta){ }; body(tau) <- btq - Dtau <- function(theta){ };body(Dtau) <- bDq - }else{ - tau1 <- tau - tau <- function(theta){ } - body(tau) <- substitute({ btq0; c(tau0(theta), q) }, - list(btq0=btq, tau0 = tau1)) - Dtau1 <- Dtau - Dtau <- function(theta){} - body(Dtau) <- substitute({ bDq0; rbind(Dtau0(theta), D) }, - list(Dtau0 = Dtau1, bDq0 = bDq)) - } - } - if("expected shortfall" %in% of.interest){ - if(is.null(p)) stop("Probability 'p' has to be specified.") - if(is.null(tau)){ - tau <- function(theta){ }; body(tau) <- btes - Dtau <- function(theta){ }; body(Dtau) <- bDes - }else{ - tau1 <- tau - tau <- function(theta){ } - body(tau) <- substitute({ btes0; c(tau0(theta), es) }, - list(tau0 = tau1, btes0=btes)) - Dtau1 <- Dtau - Dtau <- function(theta){} - body(Dtau) <- substitute({ bDes0; rbind(Dtau0(theta), D) }, - list(Dtau0 = Dtau1, bDes0=bDes)) - } - } - if("expected loss" %in% of.interest){ - if(is.null(N)) stop("Expected frequency 'N' has to be specified.") - if(is.null(tau)){ - tau <- function(theta){ }; body(tau) <- btel - Dtau <- function(theta){ }; body(Dtau) <- bDel - }else{ - tau1 <- tau - tau <- function(theta){ } - body(tau) <- substitute({ btel0; c(tau0(theta), el) }, - list(tau0 = tau1, btel0=btel)) - Dtau1 <- Dtau - Dtau <- function(theta){} - body(Dtau) <- substitute({ bDel0; rbind(Dtau0(theta), D) }, - list(Dtau0 = Dtau1, bDel0=bDel)) - } - } - trafo <- function(x){ list(fval = tau(x), mat = Dtau(x)) } - return(trafo) -} - -## methods -setMethod("validParameter",signature(object="GEVFamily"), - function(object, param, tol =.Machine$double.eps){ - if (is(param, "ParamFamParameter")) - param <- main(param) - if (!all(is.finite(param))) - return(FALSE) - if (any(param[1] <= tol)) - return(FALSE) - if (any(param[2] <= tol)) - return(FALSE) - return(TRUE) - }) - - -## generating function -## loc: known/fixed threshold/location parameter -## scale: scale parameter -## shape: shape parameter -## trafo: optional parameter transformation -## start0Est: startEstimator for MLE and MDE --- if NULL HybridEstimator is used; - -GEVFamily <- function(loc = 0, scale = 1, shape = 0.5, - of.interest = c("scale", "shape"), - p = NULL, N = NULL, trafo = NULL, - start0Est = NULL, withPos = TRUE, - withCentL2 = FALSE, - withL2derivDistr = FALSE, - ..ignoreTrafo = FALSE){ - theta <- c(loc, scale, shape) - .warningGEVShapeLarge(shape) - - of.interest <- .pretreat.of.interest(of.interest,trafo) - - ##symmetry - distrSymm <- NoSymmetry() - - ## parameters - names(theta) <- c("loc", "scale", "shape") - scaleshapename <- c("scale"="scale", "shape"="shape") - - - btq <- bDq <- btes <- bDes <- btel <- bDel <- NULL - if(!is.null(p)){ - btq <- substitute({ q <- loc0 + theta[1]*((-log(p0))^(-theta[2])-1)/theta[2] - names(q) <- "quantile" - q - }, list(loc0 = loc, p0 = p)) - - bDq <- substitute({ scale <- theta[1]; shape <- theta[2] - D1 <- ((-log(p0))^(-shape)-1)/shape - D2 <- -scale/shape*(D1 + log(-log(p0))*(-log(p0))^(-shape)) - D <- t(c(D1, D2)) - rownames(D) <- "quantile"; colnames(D) <- NULL - D }, list(p0 = p)) - btes <- substitute({ if(theta[2]>=1L) es <- NA else { - pg <- pgamma(-log(p0),1-theta[2], lower.tail = TRUE) - es <- theta[1] * (gamma(1-theta[2]) * pg/ (1-p0) - 1 )/ - theta[2] + loc0 } - names(es) <- "expected shortfall" - es }, list(loc0 = loc, p0 = p)) - bDes <- substitute({ if(theta[2]>=1L){ D1 <- D2 <- NA} else { - scale <- theta[1]; shape <- theta[2] - pg <- pgamma(-log(p0), 1-theta[2], lower.tail = TRUE) - dd <- - ddigamma(-log(p0),1-theta[2]) - g0 <- gamma(1-theta[2]) - D1 <- (g0*pg/(1-p0)-1)/theta[2] - D21 <- theta[1]*D1/theta[2] - D22 <- theta[1]*dd/(1-p0)/theta[2] - D2 <- -D21+D22} - D <- t(c(D1, D2)) - rownames(D) <- "expected shortfall" - colnames(D) <- NULL - D }, list(loc0 = loc, p0 = p)) - } - if(!is.null(N)){ - btel <- substitute({ if(theta[2]>=1L) el <- NA else{ - el <- N0*(loc0+theta[1]*(gamma(1-theta[2])-1)/theta[2])} - names(el) <- "expected loss" - el }, list(loc0 = loc,N0 = N)) - bDel <- substitute({ if(theta[2]>=1L){ D1 <- D2 <- NA}else{ - scale <- theta[1]; shape <- theta[2] - ga <- gamma(1-shape) - D1 <- N0*(ga-1)/shape - D2 <- -N0*scale*ga*digamma(1-shape)/shape- - D1*scale/shape} - D <- t(c(D1, D2)) - rownames(D) <- "expected loss" - colnames(D) <- NULL - D }, list(loc0 = loc, N0 = N)) - } - - fromOfInt <- FALSE - if(is.null(trafo)||..ignoreTrafo){fromOfInt <- TRUE - trafo <- .define.tau.Dtau(of.interest, btq, bDq, btes, bDes, - btel, bDel, p, N) - }else if(is.matrix(trafo) & nrow(trafo) > 2) - stop("number of rows of 'trafo' > 2") -#### - param <- ParamFamParameter(name = "theta", main = c(theta[2],theta[3]), - fixed = theta[1], - trafo = trafo, withPosRestr = withPos, - .returnClsName ="ParamWithScaleAndShapeFamParameter") - - ## distribution - distribution <- GEV(loc = loc, scale = scale, shape = shape) - - ## starting parameters - startPar <- function(x,...){ - mu <- theta[1] - - ## Pickand estimator - if(is.null(start0Est)){ - #source("kMedMad_Qn_Estimators.R") - PF <- GEVFamily(loc = theta[1], scale = theta[2], shape = theta[3]) - e1 <- PickandsEstimator(x,ParamFamily=PF) - e0 <- estimate(e1) - }else{ - if(is(start0Est,"function")){ - e1 <- start0Est(x, ...) - e0 <- if(is(e1,"Estimate")) estimate(e1) else e1 - }else stop("Argument 'start0Est' must be a function or NULL.") - if(!is.null(names(e0))) - e0 <- e0[c("scale", "shape")] - } -# print(e0); print(str(x)); print(head(summary(x))); print(mu) - if(any(x < mu-e0["scale"]/e0["shape"])) - stop("some data smaller than 'loc-scale/shape' ") - - names(e0) <- NULL - return(e0) - } - - ## what to do in case of leaving the parameter domain - makeOKPar <- function(theta) { - if(withPos){ - theta <- abs(theta) - }else{ - if(!is.null(names(theta))){ - theta["scale"] <- abs(theta["scale"]) - }else{ - theta[1] <- abs(theta[1]) - } - } - return(theta) - } - - modifyPar <- function(theta){ - theta <- makeOKPar(theta) - .warningGEVShapeLarge(theta["shape"]) - if(!is.null(names(theta))){ - sc <- theta["scale"] - sh <- theta["shape"] - }else{ - theta <- abs(theta) - sc <- theta[1] - sh <- theta[2] - } - GEV(loc = loc, scale = theta[1], shape = theta[2]) - } - - - ## L2-derivative of the distribution - L2deriv.fct <- function(param) { - sc <- force(main(param)[1]) - k <- force(main(param)[2]) - tr <- fixed(param)[1] - .warningGEVShapeLarge(k) - - Lambda1 <- function(x) { - y <- x*0 - ind <- (x > tr-sc/k) # = [later] (x1>0) - x <- (x[ind]-tr)/sc - x1 <- 1 + k * x - y[ind] <- (x*(1-x1^(-1/k))-1)/x1/sc -# xi*(-1/xi-1)*(x[ind]-mu)/beta^2/(1+xi*(x[ind]-mu)/beta) - (x[ind]-mu)*(1+xi*(x[ind]-mu)/beta)^(-1/xi-1)/beta^2 - return(y) - } - Lambda2 <- function(x) { - y <- x*0 - ind <- (x > tr-sc/k) # = [later] (x1>0) - x <- (x[ind]-tr)/sc - x1 <- 1 + k * x - x2 <- x / x1 - y[ind]<- (1-x1^(-1/k))/k*(log(x1)/k-x2)-x2 -# log(1+xi*(x[ind]-mu)/beta)/xi^2+(-1/xi-1)*(x[ind]-mu)/beta/(1+xi*(x[ind]-mu)/beta) - (1+xi*(x[ind]-mu)/beta)^(-1/xi)*log(1+xi*(x[ind]-mu)/beta)/xi^2 + (1+xi*(x[ind]-mu)/beta)^(-1/xi-1)*(x[ind]-mu)/beta/xi - return(y) - } - ## additional centering of scores to increase numerical precision! - if(withCentL2){ - dist0 <- GEV(scale = sc, shape = k, loc = tr) - suppressWarnings({ - z1 <- E(dist0, fun=Lambda1) - z2 <- E(dist0, fun=Lambda2) - }) - }else{z1 <- z2 <- 0} - return(list(function(x){ Lambda1(x)-z1 },function(x){ Lambda2(x)-z2 })) - } - - ## Fisher Information matrix as a function of parameters - FisherInfo.fct <- function(param) { - sc <- force(main(param)[1]) - k <- force(main(param)[2]) - .warningGEVShapeLarge(k) - G20 <- gamma(2*k) - G10 <- gamma(k) - G11 <- digamma(k)*gamma(k) - G01 <- -0.57721566490153 # digamma(1) - G02 <- 1.9781119906559 #trigamma(1)+digamma(1)^2 - x0 <- (k+1)^2*2*k - I11 <- G20*x0-2*G10*k*(k+1)+1 - I11 <- I11/sc^2/k^2 - I12 <- G20*(-x0)+ G10*(k^3+4*k^2+3*k) - k -1 - I12 <- I12 + G11*(k^3+k^2) -G01*k - I12 <- I12/sc/k^3 - I22 <- G20*x0 +(k+1)^2 -G10*(x0+2*k*(k+1)) - I22 <- I22 - G11*2*k^2*(k+1) + G01*2*k*(1+k)+k^2 *G02 - I22 <- I22 /k^4 - mat <- PosSemDefSymmMatrix(matrix(c(I11,I12,I12,I22),2,2)) - dimnames(mat) <- list(scaleshapename,scaleshapename) - return(mat) - } - - - - FisherInfo <- FisherInfo.fct(param) - name <- "GEV Family" - - ## initializing the GPareto family with components of L2-family - L2Fam <- new("GEVFamily") - L2Fam at scaleshapename <- scaleshapename - L2Fam at name <- name - L2Fam at param <- param - L2Fam at distribution <- distribution - L2Fam at L2deriv.fct <- L2deriv.fct - L2Fam at FisherInfo.fct <- FisherInfo.fct - L2Fam at FisherInfo <- FisherInfo - L2Fam at startPar <- startPar - L2Fam at makeOKPar <- makeOKPar - L2Fam at modifyParam <- modifyPar - L2Fam at L2derivSymm <- FunSymmList(NonSymmetric(), NonSymmetric()) - L2Fam at L2derivDistrSymm <- DistrSymmList(NoSymmetry(), NoSymmetry()) - - L2deriv <- EuclRandVarList(RealRandVariable(L2deriv.fct(param), - Domain = Reals())) - L2derivDistr <- NULL - if(withL2derivDistr){ - suppressWarnings(L2derivDistr <- - imageDistr(RandVar = L2deriv, distr = distribution)) - } - - if(fromOfInt){ - L2Fam at fam.call <- substitute(GEVFamily(loc = loc0, scale = scale0, - shape = shape0, of.interest = of.interest0, - p = p0, N = N0, - withPos = withPos0, withCentL2 = FALSE, - withL2derivDistr = FALSE, ..ignoreTrafo = TRUE), - list(loc0 = loc, scale0 = scale, shape0 = shape, - of.interest0 = of.interest, p0 = p, N0 = N, - withPos0 = withPos)) - }else{ - L2Fam at fam.call <- substitute(GEVFamily(loc = loc0, scale = scale0, - shape = shape0, of.interest = NULL, - p = p0, N = N0, trafo = trafo0, - withPos = withPos0, withCentL2 = FALSE, - withL2derivDistr = FALSE), - list(loc0 = loc, scale0 = scale, shape0 = shape, - p0 = p, N0 = N, - withPos0 = withPos, trafo0 = trafo)) - } - - L2Fam at LogDeriv <- function(x){ - x0 <- (x-loc)/scale - x1 <- 1 + x0 * shape - (shape+1)/scale/x1 + x1^(-1-1/shape)/scale - } - - L2Fam at L2deriv <- L2deriv - L2Fam at L2derivDistr <- L2derivDistr - L2Fam at .withMDE <- FALSE - L2Fam at .withEvalAsVar <- FALSE - L2Fam at .withEvalL2derivDistr <- FALSE - return(L2Fam) -} - -#ddigamma(t,s) is d/ds \int_0^t exp(-x) x^(s-1) dx - -ddigamma <- function(t,s){ - int <- function(x) exp(-x)*(log(x))*x^(s-1) - integrate(int, lower=0, upper=t)$value - } - \ No newline at end of file From noreply at r-forge.r-project.org Mon Sep 23 10:42:45 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 23 Sep 2013 10:42:45 +0200 (CEST) Subject: [Robast-commits] r718 - branches/robast-1.0/pkg/ROptEst/R Message-ID: <20130923084245.5998A18074F@r-forge.r-project.org> Author: ruckdeschel Date: 2013-09-23 10:42:45 +0200 (Mon, 23 Sep 2013) New Revision: 718 Modified: branches/robast-1.0/pkg/ROptEst/R/roptest.new.R Log: added some tobedone Modified: branches/robast-1.0/pkg/ROptEst/R/roptest.new.R =================================================================== --- branches/robast-1.0/pkg/ROptEst/R/roptest.new.R 2013-09-23 08:38:46 UTC (rev 717) +++ branches/robast-1.0/pkg/ROptEst/R/roptest.new.R 2013-09-23 08:42:45 UTC (rev 718) @@ -136,6 +136,10 @@ na.rm = TRUE, ..., debug = FALSE, withTimings = FALSE){ +#### TOBEDONE: set default for risk depending on L2Fam, +### or even better: dispatch acc. to L2Fam, risk +### -> optimal selection of corresponding interpolrisks + es.call <- match.call() es.call0 <- match.call(expand.dots=FALSE) mwt <- !is.null(es.call$withTimings)