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

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

Author: ruckdeschel
Date: 2013-01-28 00:58:54 +0100 (Mon, 28 Jan 2013)
New Revision: 573

Modified:
   branches/robast-0.9/pkg/RobExtremes/R/GEVFamily.R
   branches/robast-0.9/pkg/RobExtremes/R/GParetoFamily.R
   branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R
Log:
RobExtremes: fixed a minor issue in GEVFamily.R and suppressed warnings in call to imageDistr

Modified: branches/robast-0.9/pkg/RobExtremes/R/GEVFamily.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/GEVFamily.R	2013-01-27 19:10:04 UTC (rev 572)
+++ branches/robast-0.9/pkg/RobExtremes/R/GEVFamily.R	2013-01-27 23:58:54 UTC (rev 573)
@@ -217,8 +217,8 @@
         ## Pickand estimator
         if(is.null(start0Est)){
         #source("kMedMad_Qn_Estimators.R")
-           e0 <- PickandsEstimator(x,ParamFamily=GParetoFamily(loc = theta[1],
-                            scale = theta[2], shape = theta[3]))
+           e0 <- estimate(PickandsEstimator(x,ParamFamily=GParetoFamily(
+                            loc = theta[1], scale = theta[2], shape = theta[3])))
         }else{
            if(is(start0Est,"function")){
               e1 <- start0Est(x, ...)
@@ -355,9 +355,9 @@
                   }
 
     L2Fam at L2deriv <- L2deriv
-
+    suppressWarnings(
     L2Fam at L2derivDistr <- imageDistr(RandVar = L2deriv, distr = distribution)
-
+    )
     return(L2Fam)
 }
 

Modified: branches/robast-0.9/pkg/RobExtremes/R/GParetoFamily.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/GParetoFamily.R	2013-01-27 19:10:04 UTC (rev 572)
+++ branches/robast-0.9/pkg/RobExtremes/R/GParetoFamily.R	2013-01-27 23:58:54 UTC (rev 573)
@@ -240,9 +240,10 @@
     L2Fam at LogDeriv <- function(x) (shape+1)/(scale+shape*(x-loc))
     L2Fam at L2deriv <- L2deriv
 
-    L2Fam at L2derivDistr <- imageDistr(RandVar = L2deriv, distr = distribution)
+    suppressWarnings(
+      L2Fam at L2derivDistr <- imageDistr(RandVar = L2deriv, distr = distribution)
+    )
 
-
     return(L2Fam)
 }
 

Modified: branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R	2013-01-27 19:10:04 UTC (rev 572)
+++ branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R	2013-01-27 23:58:54 UTC (rev 573)
@@ -234,9 +234,10 @@
             }###
     L2Fam at L2deriv <- L2deriv
 
+    suppressWarnings(
     L2Fam at L2derivDistr <- imageDistr(RandVar = L2deriv, distr = distribution)
+    )
 
-
     return(L2Fam)
 }