[Robast-commits] r624 - in branches/robast-0.9/pkg: ROptEst/R RobExtremes/R RobExtremes/inst/AddMaterial/interpolation

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2013-03-12 20:32:16 +0100 (Tue, 12 Mar 2013)
New Revision: 624

Modified:
   branches/robast-0.9/pkg/ROptEst/R/interpolLM.R
   branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R
   branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
Log:
ROptEst: corrected a bug in .getLMGrid (missed on transposition)

Modified: branches/robast-0.9/pkg/ROptEst/R/interpolLM.R
===================================================================
--- branches/robast-0.9/pkg/ROptEst/R/interpolLM.R	2013-03-12 18:54:53 UTC (rev 623)
+++ branches/robast-0.9/pkg/ROptEst/R/interpolLM.R	2013-03-12 19:32:16 UTC (rev 624)
@@ -55,10 +55,7 @@
    on.exit({do.call(distrExOptions,args=distrExOptions.old)
             do.call(distroptions,args=distroptions.old)
             })
-   LMGrid <- sapply(thGrid,getLM)
-   if(length(dim(LMGrid))==3)
-      LMGrid <- LMGrid[,1,,drop=TRUE]
-   else LMGrid <- LMGrid[,drop=FALSE]
+   LMGrid <- t(sapply(thGrid,getLM))
 
    iNA <- apply(LMGrid,1, function(u) any(is.na(u)))
    LMGrid <- LMGrid[!iNA,,drop=FALSE]
@@ -78,7 +75,7 @@
    write.table(format(Grid,digits=21),
                file=toFileCSV, row.names=FALSE, col.names=FALSE)
    toFileTXT <- gsub("(.+\\.)csv$","\\1txt",toFileCSV)
-   cat(file=toFileTXT,namPFam,"\n",nameInSysdata)
+   cat(file=toFileTXT,gsub(" ","",namPFam),"\n",nameInSysdata)
    return(invisible(NULL))
 }
 

Modified: branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R	2013-03-12 18:54:53 UTC (rev 623)
+++ branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R	2013-03-12 19:32:16 UTC (rev 624)
@@ -28,6 +28,7 @@
 
 
 .svInt <- function(optF = .RMXE.th, xiGrid = getShapeGrid(500, cutoff.at.0=0.005),
+#.svInt <- function(optF = .RMXE.th, xiGrid = getShapeGrid(5, cutoff.at.0=0.005),
                    PFam = GParetoFamily(shape=1,scale=2)){
              namF <- gsub("\\.th$","",paste(deparse(substitute(optF))))
              to <- gsub("XXXX",gsub(" ","",name(PFam)),

Modified: branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R	2013-03-12 18:54:53 UTC (rev 623)
+++ branches/robast-0.9/pkg/RobExtremes/inst/AddMaterial/interpolation/interpolationscripts.R	2013-03-12 19:32:16 UTC (rev 624)
@@ -25,7 +25,7 @@
     RobExtremes:::.generateInterpGridSn(PFam = PF)}
 ## to make this parallel, start this on several processors
 #.svInt1()
-#.svInt0(.OMSE.th, PFam=PF)
+#.svInt(.OMSE.th, PFam=PF)
 .svInt(.MBRE.th, PFam=PF)
-.svInt0(.RMXE.th, PFam=PF)
+.svInt(.RMXE.th, PFam=PF)
 setwd(oldwd)