[Robast-commits] r1180 - branches/robast-1.2/pkg/RandVar/R

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

Author: ruckdeschel
Date: 2019-03-02 16:42:24 +0100 (Sat, 02 Mar 2019)
New Revision: 1180

Modified:
   branches/robast-1.2/pkg/RandVar/R/Expectation.R
Log:
[RandVar] branch 1.2: some additional diagnostic info 

Modified: branches/robast-1.2/pkg/RandVar/R/Expectation.R
===================================================================
--- branches/robast-1.2/pkg/RandVar/R/Expectation.R	2019-03-01 16:22:17 UTC (rev 1179)
+++ branches/robast-1.2/pkg/RandVar/R/Expectation.R	2019-03-02 15:42:24 UTC (rev 1180)
@@ -30,8 +30,8 @@
         for(i in 1:dimn){
             dotsFun  <- .filterFunargs(dots, fun at Map[[i]])
 
-            funwD <- function(x)  do.call(fun at Map[[i]], c(list(x), dotsFun))
-            funwDc <- function(x,cond){ y <- c(x,cond);  do.call(fun at Map[[i]], c(list(x=y), dotsFun))}
+            funwD <- function(x)  do.call(fun at Map[[i]], c(list(x), eval.parent(dotsFun,1)))
+            funwDc <- function(x,cond){ y <- c(x,cond);  do.call(fun at Map[[i]], c(list(x=y), eval.parent(dotsFun,1)))}
 
             Eargs <- c(Eargs0, list(fun=if(withCond)funwDc else funwD), Eargs1, dotsI)
             res[i] <- buf <- do.call(E, Eargs)