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

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

Author: ruckdeschel
Date: 2013-04-17 02:02:50 +0200 (Wed, 17 Apr 2013)
New Revision: 652

Modified:
   branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R
   branches/robast-0.9/pkg/RobExtremes/R/internal-getpsi.R
Log:
RobExtremes: fixed 2 bugs: (a) the transformation A_i (in the weight) for beta not=1 was wrong
(b) in WeibullFamily, scaleshapename was not set as a slot

Modified: branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R	2013-04-17 00:01:22 UTC (rev 651)
+++ branches/robast-0.9/pkg/RobExtremes/R/WeibullFamily.R	2013-04-17 00:02:50 UTC (rev 652)
@@ -211,6 +211,7 @@
 
     ## initializing the Weibull family with components of L2-family
     L2Fam <- new("WeibullFamily")
+    L2Fam at scaleshapename <- scaleshapename
     L2Fam at name <- name
     L2Fam at param <- param
     L2Fam at distribution <- distribution
@@ -245,6 +246,7 @@
             }###
     L2Fam at L2deriv <- L2deriv
     L2Fam at L2derivDistr <- L2derivDistr
+
     L2Fam at .withMDE <- FALSE
     L2Fam at .withEvalAsVar <- FALSE
     L2Fam at .withEvalL2derivDistr <- FALSE

Modified: branches/robast-0.9/pkg/RobExtremes/R/internal-getpsi.R
===================================================================
--- branches/robast-0.9/pkg/RobExtremes/R/internal-getpsi.R	2013-04-17 00:01:22 UTC (rev 651)
+++ branches/robast-0.9/pkg/RobExtremes/R/internal-getpsi.R	2013-04-17 00:02:50 UTC (rev 652)
@@ -23,7 +23,7 @@
    am <- mean(c(fct[[7]](xi),fct[[8]](xi)))
    A <-  .dbeta%*%matrix(c(fct[[6]](xi),am,am,fct[[9]](xi)),2,2)%*%.dbeta
    am <- mean(c(fct[[11]](xi),fct[[12]](xi)))
-   Aw <- .dbeta%*%matrix(c(fct[[10]](xi),am,am,fct[[13]](xi)),2,2)%*%.dbeta
+   Aw <- matrix(c(fct[[10]](xi),am,am,fct[[13]](xi)),2,2)%*%.dbeta