[Robast-commits] r1072 - branches/robast-1.1/pkg/RobAStRDA/R branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation branches/robast-1.1/pkg/RobExtremesBuffer branches/robast-1.2/pkg/RobAStRDA/R branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation pkg/RobAStRDA/R pkg/RobExtremes/inst/AddMaterial/interpolation
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Jul 29 15:18:26 CEST 2018
Author: ruckdeschel
Date: 2018-07-29 15:18:26 +0200 (Sun, 29 Jul 2018)
New Revision: 1072
Modified:
branches/robast-1.1/pkg/RobAStRDA/R/sysdata.rda
branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R
branches/robast-1.1/pkg/RobExtremesBuffer/sysdataOnlyGridsOnlyR-2.15.1.rda
branches/robast-1.1/pkg/RobExtremesBuffer/sysdataOnlyGridsOnlyR-3.5.1rc.rda
branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpMerge.rda
branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpMergeZip.rda
branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpOnlyR-2.15.1.rda
branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpOnlyR-3.5.1rc.rda
branches/robast-1.2/pkg/RobAStRDA/R/sysdata.rda
branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R
pkg/RobAStRDA/R/sysdata.rda
pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R
Log:
[RobAStRDA] trunk & branch 1.2 & branch1.1: recreated sysdata.rda / MBRE for Gamma
Modified: branches/robast-1.1/pkg/RobAStRDA/R/sysdata.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
===================================================================
--- branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R 2018-07-29 13:09:14 UTC (rev 1071)
+++ branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R 2018-07-29 13:18:26 UTC (rev 1072)
@@ -82,6 +82,17 @@
namPFam <- csv1$namPFam
namInSysdata <- ".MBRE"
.saveGridToCSV(Grid,"interpolGamma familyMBRE.csv",namPFam,namInSysdata)
+ RobAStRDA:::.saveGridToRda(fromFileCSV="interpolGamma familyMBRE.csv",toFileRDA = "sysdata.rda")
+
+myplot <- function(whichLM, plotGridRestriction = NULL,
+ df = NULL, gridRestrForSmooth = NULL, withSmooth=TRUE, ..., filen="sysdata.rda")
+ plotLM("MBRE",Famnam="Gam",whichLM=whichLM, baseDir=baseDir0, withSmooth=withSmooth,
+ plotGridRestriction=plotGridRestriction,
+ smoothtry = TRUE, df = df,
+ gridRestrForSmooth = gridRestrForSmooth, ..., rdaFilen=filen)
+
+myplot(1, gridR=c(200:700),withS=TRUE)
+myplot(1, gridR=c(1:183,228:234,242:286,293), withS=FALSE)
}
if(FALSE){
Modified: branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R
===================================================================
--- branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R 2018-07-29 13:09:14 UTC (rev 1071)
+++ branches/robast-1.1/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R 2018-07-29 13:18:26 UTC (rev 1072)
@@ -3,7 +3,9 @@
withSmooth = FALSE, plotGridRestriction = NULL,
smoothtry = FALSE, df = NULL, gridRestrForSmooth = NULL,
prehook={}, posthook={}, ylab=NULL, xlab=NULL, main = NULL,
- lwd=NULL, lty= NULL, col =NULL, inputSmooth = FALSE, ...){
+ lwd=NULL, lty= NULL, col =NULL, inputSmooth = FALSE, ...,
+ rdaFilen = "sysdata.rda",
+ rdaRelPath = "branches/robast-1.1/pkg/RobExtremesBuffer"){
## Gridnam in (Sn,OMSE,RMXE,MBRE) ## uses partial matching!!
## Famnam in "Generalized Pareto Family", ## uses partial matching!!
## "GEV Family",
@@ -55,7 +57,7 @@
# with columnwise restrictions of \code{Y} (and \code{NULL} entries
# are interpreted as no restriction). }
- file <- file.path(baseDir, "branches/robast-1.0/pkg/RobExtremesBuffer/sysdata.rda")
+ file <- file.path(baseDir, rdaRelPath, rdaFilen)
# file <- file.path(baseDir, "branches/robast-1.0/pkg/RobAStRDA/R/sysdata.rda")
if(!file.exists(file)) stop("Fehler mit Checkout")
nE <- new.env()
Modified: branches/robast-1.1/pkg/RobExtremesBuffer/sysdataOnlyGridsOnlyR-2.15.1.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.1/pkg/RobExtremesBuffer/sysdataOnlyGridsOnlyR-3.5.1rc.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpMerge.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpMergeZip.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpOnlyR-2.15.1.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.1/pkg/RobExtremesBuffer/sysdataWithInterpOnlyR-3.5.1rc.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.2/pkg/RobAStRDA/R/sysdata.rda
===================================================================
(Binary files differ)
Modified: branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R 2018-07-29 13:09:14 UTC (rev 1071)
+++ branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R 2018-07-29 13:18:26 UTC (rev 1072)
@@ -5,8 +5,8 @@
### open R session
require(RobExtremes)
### -> change this according to where you checked out the svn repo:
-#.basepath <- "C:/rtest/RobASt/branches/robast-1.0./pkg"
-.basepath <- "/p/fm/PeterRuckdeschel/rtest/RobASt/branches/robast-1.0/pkg"
+.basepath <- "C:/rtest/RobASt/branches/robast-1.1/pkg"
+#.basepath <- "/p/fm/PeterRuckdeschel/rtest/RobASt/branches/robast-1.1/pkg"
.myFolderTo <- file.path(.basepath,"RobExtremesBuffer")
## <-
oldwd <- getwd()
@@ -48,8 +48,54 @@
#
# in the end, the results are stored in files like
# interpol.OMSEpos1GEVUFamily.csv in
-#
+
+
+# done 20180729: recomputation MBRE grid for Gamma
if(FALSE){
+ ## Block01:: interpol.MBREpos1Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos1,namFzus="pos1")
+}
+if(FALSE){
+ ## Block02:: interpol.MBREpos2Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos2,namFzus="pos2")
+}
+if(FALSE){
+ ## Block03:: interpol.MBREpos3Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos3,namFzus="pos3")
+}
+if(FALSE){
+ ## Block04:: interpol.MBREpos4Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos4,namFzus="pos4")
+}
+
+if(FALSE){
+## merge blocks 1-4
+ csv1 <- .readGridFromCSV("interpol.MBREpos1Gammafamily.csv")
+ csv2 <- .readGridFromCSV("interpol.MBREpos2Gammafamily.csv")
+ csv3 <- .readGridFromCSV("interpol.MBREpos3Gammafamily.csv")
+ csv4 <- .readGridFromCSV("interpol.MBREpos4Gammafamily.csv")
+ Grid <- rbind(csv1$Grid,csv2$Grid,csv3$Grid,csv4$Grid)
+ namPFam <- csv1$namPFam
+ namInSysdata <- ".MBRE"
+ .saveGridToCSV(Grid,"interpolGamma familyMBRE.csv",namPFam,namInSysdata)
+ RobAStRDA:::.saveGridToRda(fromFileCSV="interpolGamma familyMBRE.csv",toFileRDA = "sysdata.rda")
+
+myplot <- function(whichLM, plotGridRestriction = NULL,
+ df = NULL, gridRestrForSmooth = NULL, withSmooth=TRUE, ..., filen="sysdata.rda")
+ plotLM("MBRE",Famnam="Gam",whichLM=whichLM, baseDir=baseDir0, withSmooth=withSmooth,
+ plotGridRestriction=plotGridRestriction,
+ smoothtry = TRUE, df = df,
+ gridRestrForSmooth = gridRestrForSmooth, ..., rdaFilen=filen)
+
+myplot(1, gridR=c(200:700),withS=TRUE)
+myplot(1, gridR=c(1:183,228:234,242:286,293), withS=FALSE)
+}
+
+if(FALSE){
## Block01:: interpol.RMXEpos1GEVUFamily.csv
PF <- GEVFamilyMuUnknown(withPos=FALSE, ..name="GEVU Family")
.svInt(.RMXE.th, PFam=PF, xiGrid = xiGridpos1,namFzus="pos1")
Modified: branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R
===================================================================
--- branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R 2018-07-29 13:09:14 UTC (rev 1071)
+++ branches/robast-1.2/pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R 2018-07-29 13:18:26 UTC (rev 1072)
@@ -3,7 +3,9 @@
withSmooth = FALSE, plotGridRestriction = NULL,
smoothtry = FALSE, df = NULL, gridRestrForSmooth = NULL,
prehook={}, posthook={}, ylab=NULL, xlab=NULL, main = NULL,
- lwd=NULL, lty= NULL, col =NULL, inputSmooth = FALSE, ...){
+ lwd=NULL, lty= NULL, col =NULL, inputSmooth = FALSE, ...,
+ rdaFilen = "sysdata.rda",
+ rdaRelPath = "branches/robast-1.1/pkg/RobExtremesBuffer"){
## Gridnam in (Sn,OMSE,RMXE,MBRE) ## uses partial matching!!
## Famnam in "Generalized Pareto Family", ## uses partial matching!!
## "GEV Family",
@@ -55,7 +57,7 @@
# with columnwise restrictions of \code{Y} (and \code{NULL} entries
# are interpreted as no restriction). }
- file <- file.path(baseDir, "branches/robast-1.0/pkg/RobExtremesBuffer/sysdata.rda")
+ file <- file.path(baseDir, rdaRelPath, rdaFilen)
# file <- file.path(baseDir, "branches/robast-1.0/pkg/RobAStRDA/R/sysdata.rda")
if(!file.exists(file)) stop("Fehler mit Checkout")
nE <- new.env()
Modified: pkg/RobAStRDA/R/sysdata.rda
===================================================================
(Binary files differ)
Modified: pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
===================================================================
--- pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R 2018-07-29 13:09:14 UTC (rev 1071)
+++ pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R 2018-07-29 13:18:26 UTC (rev 1072)
@@ -5,8 +5,8 @@
### open R session
require(RobExtremes)
### -> change this according to where you checked out the svn repo:
-#.basepath <- "C:/rtest/RobASt/branches/robast-1.0./pkg"
-.basepath <- "/p/fm/PeterRuckdeschel/rtest/RobASt/branches/robast-1.0/pkg"
+.basepath <- "C:/rtest/RobASt/branches/robast-1.1/pkg"
+#.basepath <- "/p/fm/PeterRuckdeschel/rtest/RobASt/branches/robast-1.1/pkg"
.myFolderTo <- file.path(.basepath,"RobExtremesBuffer")
## <-
oldwd <- getwd()
@@ -48,8 +48,54 @@
#
# in the end, the results are stored in files like
# interpol.OMSEpos1GEVUFamily.csv in
-#
+
+
+# done 20180729: recomputation MBRE grid for Gamma
if(FALSE){
+ ## Block01:: interpol.MBREpos1Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos1,namFzus="pos1")
+}
+if(FALSE){
+ ## Block02:: interpol.MBREpos2Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos2,namFzus="pos2")
+}
+if(FALSE){
+ ## Block03:: interpol.MBREpos3Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos3,namFzus="pos3")
+}
+if(FALSE){
+ ## Block04:: interpol.MBREpos4Gammafamily.csv
+ PF <- GammaFamily()
+ .svInt(.MBRE.th, PFam=PF, xiGrid = xiGridpos4,namFzus="pos4")
+}
+
+if(FALSE){
+## merge blocks 1-4
+ csv1 <- .readGridFromCSV("interpol.MBREpos1Gammafamily.csv")
+ csv2 <- .readGridFromCSV("interpol.MBREpos2Gammafamily.csv")
+ csv3 <- .readGridFromCSV("interpol.MBREpos3Gammafamily.csv")
+ csv4 <- .readGridFromCSV("interpol.MBREpos4Gammafamily.csv")
+ Grid <- rbind(csv1$Grid,csv2$Grid,csv3$Grid,csv4$Grid)
+ namPFam <- csv1$namPFam
+ namInSysdata <- ".MBRE"
+ .saveGridToCSV(Grid,"interpolGamma familyMBRE.csv",namPFam,namInSysdata)
+ RobAStRDA:::.saveGridToRda(fromFileCSV="interpolGamma familyMBRE.csv",toFileRDA = "sysdata.rda")
+
+myplot <- function(whichLM, plotGridRestriction = NULL,
+ df = NULL, gridRestrForSmooth = NULL, withSmooth=TRUE, ..., filen="sysdata.rda")
+ plotLM("MBRE",Famnam="Gam",whichLM=whichLM, baseDir=baseDir0, withSmooth=withSmooth,
+ plotGridRestriction=plotGridRestriction,
+ smoothtry = TRUE, df = df,
+ gridRestrForSmooth = gridRestrForSmooth, ..., rdaFilen=filen)
+
+myplot(1, gridR=c(200:700),withS=TRUE)
+myplot(1, gridR=c(1:183,228:234,242:286,293), withS=FALSE)
+}
+
+if(FALSE){
## Block01:: interpol.RMXEpos1GEVUFamily.csv
PF <- GEVFamilyMuUnknown(withPos=FALSE, ..name="GEVU Family")
.svInt(.RMXE.th, PFam=PF, xiGrid = xiGridpos1,namFzus="pos1")
Modified: pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R
===================================================================
--- pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R 2018-07-29 13:09:14 UTC (rev 1071)
+++ pkg/RobExtremes/inst/AddMaterial/interpolation/plotInterpol.R 2018-07-29 13:18:26 UTC (rev 1072)
@@ -3,7 +3,9 @@
withSmooth = FALSE, plotGridRestriction = NULL,
smoothtry = FALSE, df = NULL, gridRestrForSmooth = NULL,
prehook={}, posthook={}, ylab=NULL, xlab=NULL, main = NULL,
- lwd=NULL, lty= NULL, col =NULL, inputSmooth = FALSE, ...){
+ lwd=NULL, lty= NULL, col =NULL, inputSmooth = FALSE, ...,
+ rdaFilen = "sysdata.rda",
+ rdaRelPath = "branches/robast-1.1/pkg/RobExtremesBuffer"){
## Gridnam in (Sn,OMSE,RMXE,MBRE) ## uses partial matching!!
## Famnam in "Generalized Pareto Family", ## uses partial matching!!
## "GEV Family",
@@ -55,7 +57,7 @@
# with columnwise restrictions of \code{Y} (and \code{NULL} entries
# are interpreted as no restriction). }
- file <- file.path(baseDir, "branches/robast-1.0/pkg/RobExtremesBuffer/sysdata.rda")
+ file <- file.path(baseDir, rdaRelPath, rdaFilen)
# file <- file.path(baseDir, "branches/robast-1.0/pkg/RobAStRDA/R/sysdata.rda")
if(!file.exists(file)) stop("Fehler mit Checkout")
nE <- new.env()
More information about the Robast-commits
mailing list