[Distr-commits] r1242 - branches/distr-2.8/pkg/distrEx/R

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

Author: ruckdeschel
Date: 2018-08-05 17:52:18 +0200 (Sun, 05 Aug 2018)
New Revision: 1242

Modified:
   branches/distr-2.8/pkg/distrEx/R/GammaWeibullExpectation.R
Log:
[distrEx] branch 2.8: yet another minor clitch in .qtlIntegrate

Modified: branches/distr-2.8/pkg/distrEx/R/GammaWeibullExpectation.R
===================================================================
--- branches/distr-2.8/pkg/distrEx/R/GammaWeibullExpectation.R	2018-08-05 15:46:35 UTC (rev 1241)
+++ branches/distr-2.8/pkg/distrEx/R/GammaWeibullExpectation.R	2018-08-05 15:52:18 UTC (rev 1242)
@@ -43,7 +43,7 @@
             upp.m <- min(upp,0.98)
             if(upp>0.98){
                intV.u <- do.call(distrExIntegrate, c(list(f = integrand,
-                    lower = 0.98,
+                    lower = max(0.98,low),
                     upper = upp,
                     rel.tol = rel.tol, stop.on.error = FALSE,
                     distr = object, dfun = dunif), dots.withoutUseApply))
@@ -54,7 +54,7 @@
             if(low<0.02){
                intV.l <- do.call(distrExIntegrate, c(list(f = integrand,
                     lower = low,
-                    upper = 0.02,
+                    upper = min(0.02, upp),
                     rel.tol = rel.tol, stop.on.error = FALSE,
                     distr = object, dfun = dunif), dots.withoutUseApply))
             }