[Robast-commits] r744 - in branches/robast-1.0/pkg/RobExtremes: R inst/scripts

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

Author: ruckdeschel
Date: 2014-04-03 17:15:14 +0200 (Thu, 03 Apr 2014)
New Revision: 744

Modified:
   branches/robast-1.0/pkg/RobExtremes/R/startEstGEV.R
   branches/robast-1.0/pkg/RobExtremes/inst/scripts/GEVcheck.R
Log:
RobExtremes:: yet two more fixes

Modified: branches/robast-1.0/pkg/RobExtremes/R/startEstGEV.R
===================================================================
--- branches/robast-1.0/pkg/RobExtremes/R/startEstGEV.R	2014-04-03 15:04:49 UTC (rev 743)
+++ branches/robast-1.0/pkg/RobExtremes/R/startEstGEV.R	2014-04-03 15:15:14 UTC (rev 744)
@@ -11,7 +11,9 @@
          mygev1 <- GEV(loc=0,scale=sig,shape=xi)
          CvMDist(x0,mygev1)
       }
-      intv <- if(xi<0) c(max(1e-5,xi/4*min(x)-mu), max(xi*min(x)-mu,2e-5)) else c(max(1e-5,xi*max(x)-mu),max(s0,2*xi*max(x)-mu))
+      intup <- min(xi*(x-mu))
+      if(intup<0) break
+      intv <-  c(1e-5,min(s0,intup))
       sigCvMMD1 <- optimize(funl, interval=intv)$minimum
       mygev <- GEVFamily(loc=0,scale=sigCvMMD1,shape=xi, withPos=withPos,
                          start0Est = fu, ..withWarningGEV=FALSE)

Modified: branches/robast-1.0/pkg/RobExtremes/inst/scripts/GEVcheck.R
===================================================================
--- branches/robast-1.0/pkg/RobExtremes/inst/scripts/GEVcheck.R	2014-04-03 15:04:49 UTC (rev 743)
+++ branches/robast-1.0/pkg/RobExtremes/inst/scripts/GEVcheck.R	2014-04-03 15:15:14 UTC (rev 744)
@@ -4,7 +4,7 @@
 x <- rgev(100,shape=2,scale=30,loc=4) ### x still causes problems....
 x1 <- rgev(100,shape=-.2,scale=30,loc=4)
 gev0 <- GEVFamilyMuUnknown(withPos=FALSE)
-gev1 <- GEVFamilyMuUnknown(loc=quantile(x,exp(-1)),withPos=FALSE)
+gev1 <- GEVFamily(loc=quantile(x,exp(-1)),withPos=FALSE)
 MLEstimator(x,gev0)
 MLEstimator(x,gev1)
 MLEstimator(x1,gev0)