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

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

Author: ruckdeschel
Date: 2012-05-23 02:17:44 +0200 (Wed, 23 May 2012)
New Revision: 481

Modified:
   branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R
   branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R
Log:
argh: yet another one...

Modified: branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R	2012-05-23 00:07:31 UTC (rev 480)
+++ branches/robast-0.9/pkg/RobExtremes/R/LDEstimator.R	2012-05-23 00:17:44 UTC (rev 481)
@@ -90,13 +90,12 @@
                       na.rm = na.rm.0, ...)
     if(missing(asvar)) asvar <- NULL
     if(is.null(asvar))
-       if(!missing(asvar.fct))
-          if(!is.null(asvar.fct))
+       if(!missing(asvar.fct)&&!is.null(asvar.fct))
              asvar <- asvar.fct(ParamFamily, estimate, ...)
 
     estimate at untransformed.asvar <- asvar
+    estimate at asvar <- asvar
 
-
     l.e <- length(estimate at untransformed.estimate)
     idx <- NULL
     idm <- 1:l.e

Modified: branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R	2012-05-23 00:07:31 UTC (rev 480)
+++ branches/robast-0.9/pkg/RobExtremes/R/PickandsEstimator.R	2012-05-23 00:17:44 UTC (rev 481)
@@ -44,6 +44,7 @@
                       na.rm = na.rm.0, alpha = alpha, ...)
 
     estimate at untransformed.asvar <- asvar(estimate)
+    estimate at asvar <- asvar
 
 
     l.e <- length(estimate at untransformed.estimate)