[Robast-commits] r253 - branches/robast-0.7/pkg/RandVar/R branches/robast-0.7/pkg/RandVar/chm pkg/RandVar pkg/RandVar/R pkg/RandVar/man

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

Author: ruckdeschel
Date: 2009-02-24 20:17:55 +0100 (Tue, 24 Feb 2009)
New Revision: 253

Modified:
   branches/robast-0.7/pkg/RandVar/R/Arith.R
   branches/robast-0.7/pkg/RandVar/R/Math.R
   branches/robast-0.7/pkg/RandVar/chm/RandVar.chm
   pkg/RandVar/DESCRIPTION
   pkg/RandVar/R/Arith.R
   pkg/RandVar/R/Math.R
   pkg/RandVar/man/0RandVar-package.Rd
Log:
fixed a bug introduced in the last version:
    function(x); 
is incorrect R-code ! ...

Modified: branches/robast-0.7/pkg/RandVar/R/Arith.R
===================================================================
--- branches/robast-0.7/pkg/RandVar/R/Arith.R	2009-02-23 09:55:25 UTC (rev 252)
+++ branches/robast-0.7/pkg/RandVar/R/Arith.R	2009-02-24 19:17:55 UTC (rev 253)
@@ -17,7 +17,7 @@
             }
         }
 
-        fct <- NULL;  f <- function(x,y);
+        fct <- NULL;  f <- function(x,y){}
         map <- vector("list", length(e2))
         for(i in 1:length(e2)){
             map[[i]] <- function(x){ f2 <- fct; f(e1, f2(x)) }
@@ -80,7 +80,7 @@
             }
         }
 
-        fct <- NULL;  f <- function(x,y);
+        fct <- NULL;  f <- function(x,y){}
         map <- vector("list", length(e1))
         for(i in 1:length(e1)){
             map[[i]] <- function(x){ f1 <- fct; f(f1(x), e2) }
@@ -150,7 +150,7 @@
             }
         }
 
-        fct1 <- NULL;  fct2 <- NULL; f <- function(x,y);
+        fct1 <- NULL;  fct2 <- NULL; f <- function(x,y){}
         nrvalues <- max(nrvalues1, nrvalues2)
         map <- vector("list", nrvalues)
         for(i in 1:nrvalues){

Modified: branches/robast-0.7/pkg/RandVar/R/Math.R
===================================================================
--- branches/robast-0.7/pkg/RandVar/R/Math.R	2009-02-23 09:55:25 UTC (rev 252)
+++ branches/robast-0.7/pkg/RandVar/R/Math.R	2009-02-24 19:17:55 UTC (rev 253)
@@ -4,7 +4,7 @@
         nrvalues <- length(x)
         map <- vector("list", nrvalues)
 
-        fct1 <- NULL; f <- function(x);
+        fct1 <- NULL; f <- function(x){};
         for(i in 1:nrvalues){
             map[[i]] <- function(x){ f1 <- fct1; f(f1(x)) }
             body(map[[i]]) <- substitute({ f1 <- fct1; f(f1(x)) },

Modified: branches/robast-0.7/pkg/RandVar/chm/RandVar.chm
===================================================================
(Binary files differ)

Modified: pkg/RandVar/DESCRIPTION
===================================================================
--- pkg/RandVar/DESCRIPTION	2009-02-23 09:55:25 UTC (rev 252)
+++ pkg/RandVar/DESCRIPTION	2009-02-24 19:17:55 UTC (rev 253)
@@ -1,6 +1,6 @@
 Package: RandVar
-Version: 0.6.6
-Date: 2008-11-27
+Version: 0.6.7
+Date: 2009-02-25
 Title: Implementation of random variables
 Description: Implementation of random variables by means of S4 classes
         and methods

Modified: pkg/RandVar/R/Arith.R
===================================================================
--- pkg/RandVar/R/Arith.R	2009-02-23 09:55:25 UTC (rev 252)
+++ pkg/RandVar/R/Arith.R	2009-02-24 19:17:55 UTC (rev 253)
@@ -17,7 +17,7 @@
             }
         }
 
-        fct <- NULL;  f <- function(x,y);
+        fct <- NULL;  f <- function(x,y){}
         map <- vector("list", length(e2))
         for(i in 1:length(e2)){
             map[[i]] <- function(x){ f2 <- fct; f(e1, f2(x)) }
@@ -80,7 +80,7 @@
             }
         }
 
-        fct <- NULL;  f <- function(x,y);
+        fct <- NULL;  f <- function(x,y){}
         map <- vector("list", length(e1))
         for(i in 1:length(e1)){
             map[[i]] <- function(x){ f1 <- fct; f(f1(x), e2) }
@@ -150,7 +150,7 @@
             }
         }
 
-        fct1 <- NULL;  fct2 <- NULL; f <- function(x,y);
+        fct1 <- NULL;  fct2 <- NULL; f <- function(x,y){}
         nrvalues <- max(nrvalues1, nrvalues2)
         map <- vector("list", nrvalues)
         for(i in 1:nrvalues){

Modified: pkg/RandVar/R/Math.R
===================================================================
--- pkg/RandVar/R/Math.R	2009-02-23 09:55:25 UTC (rev 252)
+++ pkg/RandVar/R/Math.R	2009-02-24 19:17:55 UTC (rev 253)
@@ -4,7 +4,7 @@
         nrvalues <- length(x)
         map <- vector("list", nrvalues)
 
-        fct1 <- NULL; f <- function(x);
+        fct1 <- NULL; f <- function(x){};
         for(i in 1:nrvalues){
             map[[i]] <- function(x){ f1 <- fct1; f(f1(x)) }
             body(map[[i]]) <- substitute({ f1 <- fct1; f(f1(x)) },

Modified: pkg/RandVar/man/0RandVar-package.Rd
===================================================================
--- pkg/RandVar/man/0RandVar-package.Rd	2009-02-23 09:55:25 UTC (rev 252)
+++ pkg/RandVar/man/0RandVar-package.Rd	2009-02-24 19:17:55 UTC (rev 253)
@@ -11,8 +11,8 @@
 \details{
 \tabular{ll}{
 Package: \tab RandVar\cr
-Version: \tab 0.6.6 \cr
-Date: \tab 2008-11-27 \cr
+Version: \tab 0.6.7 \cr
+Date: \tab 2009-02-25 \cr
 Depends: \tab R (>= 2.7.0), methods, startupmsg, distr(>= 2.0), distrEx(>=
 2.0)\cr
 LazyLoad: \tab yes\cr