[Robast-commits] r583 - branches/robast-0.9/pkg/RobExtremes/R

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

Author: ruckdeschel
Date: 2013-02-01 08:17:45 +0100 (Fri, 01 Feb 2013)
New Revision: 583

Modified:
   branches/robast-0.9/pkg/RobExtremes/R/QBCC.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/R/sysdata.rda
Log:
RobExtremes: yet another time: the grids are rubbish, as the xi-grid was not sorted

Modified: branches/robast-0.9/pkg/RobExtremes/R/QBCC.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/QBCC.R	2013-02-01 04:12:19 UTC (rev 582)
+++ branches/robast-0.9/pkg/RobExtremes/R/QBCC.R	2013-02-01 07:17:45 UTC (rev 583)
@@ -25,6 +25,7 @@
                         trafo = NULL, fixed = NULL,  na.rm = TRUE,
                         ...){
     es.call <- match.call()
+    force(p1); force(p2)
     if(length(p1)>1 || any(!is.finite(p1)) || p1<=0 || p1>=1)
        stop("'p1' has to be in [0,1] and of length 1.")
     if(length(p2)>1 || any(!is.finite(p2)) || p2<=0 || p2>=1 || abs(p1-p2)< 1e-8)

Modified: branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R	2013-02-01 04:12:19 UTC (rev 582)
+++ branches/robast-0.9/pkg/RobExtremes/R/interpolLM.R	2013-02-01 07:17:45 UTC (rev 583)
@@ -40,6 +40,7 @@
                       withSmooth = TRUE, withPrint = FALSE, withCall = FALSE){
    print(match.call())
    call <- match.call()
+   xiGrid <- unique(sort(xiGrid))
    itLM <- 0
    getLM <- function(xi){
                itLM <<- itLM + 1
@@ -83,6 +84,9 @@
    iNA <- apply(LMGrid,1, function(u) any(is.na(u)))
    LMGrid <- LMGrid[!iNA,,drop=FALSE]
    xiGrid <- xiGrid[!iNA]
+   oG <- order(xiGrid)
+   xiGrid <- xiGrid[oG]
+   LMGrid <- LMGrid[oG,,drop=FALSE]
    if(withSmooth)
       LMGrid2 <- apply(LMGrid,2,function(u) smooth.spline(xiGrid,u)$y)
 

Modified: branches/robast-0.9/pkg/RobExtremes/R/interpolSn.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/interpolSn.R	2013-02-01 04:12:19 UTC (rev 582)
+++ branches/robast-0.9/pkg/RobExtremes/R/interpolSn.R	2013-02-01 07:17:45 UTC (rev 583)
@@ -61,6 +61,7 @@
                       upp=1.01, accuracy = 10000, GridFileName="SnGrid.Rdata",
                       withSmooth = TRUE, withPrint = FALSE, withCall = FALSE){
    call <- match.call()
+   xiGrid <- unique(sort(xiGrid))
    itSn <- 0
    getSn <- function(xi){
                itSn <<- itSn + 1

Modified: branches/robast-0.9/pkg/RobExtremes/R/sysdata.rda
===================================================================
(Binary files differ)