[Robast-commits] r252 - branches/robast-0.7/pkg/RandVar/R branches/robast-0.7/pkg/RandVar/chm branches/robast-0.7/pkg/RandVar/inst/doc pkg/RandVar/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Feb 23 10:55:25 CET 2009
Author: ruckdeschel
Date: 2009-02-23 10:55:25 +0100 (Mon, 23 Feb 2009)
New Revision: 252
Modified:
branches/robast-0.7/pkg/RandVar/R/Arith.R
branches/robast-0.7/pkg/RandVar/R/EuclRandVariable.R
branches/robast-0.7/pkg/RandVar/R/Math.R
branches/robast-0.7/pkg/RandVar/R/Matrixmult.R
branches/robast-0.7/pkg/RandVar/chm/00Index.html
branches/robast-0.7/pkg/RandVar/chm/RandVar.chm
branches/robast-0.7/pkg/RandVar/chm/RandVar.toc
branches/robast-0.7/pkg/RandVar/inst/doc/RandVar.pdf
pkg/RandVar/R/Arith.R
pkg/RandVar/R/EuclRandVariable.R
pkg/RandVar/R/Math.R
pkg/RandVar/R/Matrixmult.R
Log:
fixed "NOTE" in R CMD check for RandVar
Modified: branches/robast-0.7/pkg/RandVar/R/Arith.R
===================================================================
--- branches/robast-0.7/pkg/RandVar/R/Arith.R 2009-02-02 16:53:03 UTC (rev 251)
+++ branches/robast-0.7/pkg/RandVar/R/Arith.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -17,6 +17,7 @@
}
}
+ 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)) }
@@ -79,6 +80,7 @@
}
}
+ 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) }
@@ -148,6 +150,7 @@
}
}
+ 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/EuclRandVariable.R
===================================================================
--- branches/robast-0.7/pkg/RandVar/R/EuclRandVariable.R 2009-02-02 16:53:03 UTC (rev 251)
+++ branches/robast-0.7/pkg/RandVar/R/EuclRandVariable.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -336,6 +336,7 @@
function(x){
nrvalues <- length(x)
map <- vector(mode = "list", length = nrvalues)
+ fct <- NULL
for(i in 1:nrvalues){
map[[i]] <- function(x){ f <- fct; t(f(x)) }
body(map[[i]]) <- substitute({ f <- fct; t(f(x)) },
@@ -354,6 +355,7 @@
function(x){
map <- matrix(x at Map, nrow = x at Dim[1])
+ fkt <- NULL
d <- x at Dim
map <- vector(mode = "list", length = d[1]*d[2])
for(i in 1:d[1])
Modified: branches/robast-0.7/pkg/RandVar/R/Math.R
===================================================================
--- branches/robast-0.7/pkg/RandVar/R/Math.R 2009-02-02 16:53:03 UTC (rev 251)
+++ branches/robast-0.7/pkg/RandVar/R/Math.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -4,6 +4,7 @@
nrvalues <- length(x)
map <- vector("list", nrvalues)
+ 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/R/Matrixmult.R
===================================================================
--- branches/robast-0.7/pkg/RandVar/R/Matrixmult.R 2009-02-02 16:53:03 UTC (rev 251)
+++ branches/robast-0.7/pkg/RandVar/R/Matrixmult.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -6,6 +6,7 @@
if(ncol(x) != dimension(y))
stop("the number of columns of x != dimension of y")
+ fct1 <- NULL; e <- NULL
dimn <- y at Range@dimension
map <- vector("list", nrow(x))
for(i in 1:nrow(x)){
@@ -73,6 +74,7 @@
if(ncol(x) != dimension(y))
stop("the number of columns of x != dimension of y")
+ fct1 <- NULL; e <- NULL
map <- vector("list", nrow(x))
for(i in 1:nrow(x)){
if(numberOfMaps(y) == 1){
@@ -154,6 +156,7 @@
if(!compatibleDomains(x, y))
stop("the domains of the two random variables are not compatible")
+ fct1 <- NULL; fct2 <- NULL
fct <- function(x){ f1 <- fct1; f2 <- fct2; f1(x) %*% f2(x) }
body(fct) <- substitute({ f1 <- fct1; f2 <- fct2; f1(x) %*% f2(x) },
list(fct1 = x at Map[[1]], fct2 = y at Map[[1]]))
Modified: branches/robast-0.7/pkg/RandVar/chm/00Index.html
===================================================================
--- branches/robast-0.7/pkg/RandVar/chm/00Index.html 2009-02-02 16:53:03 UTC (rev 251)
+++ branches/robast-0.7/pkg/RandVar/chm/00Index.html 2009-02-23 09:55:25 UTC (rev 252)
@@ -13,8 +13,8 @@
<h2>Help pages for package ‘RandVar’ version 0.7</h2>
<p align="center">
+<a href="# "> </a>
<a href="#"></a>
-<a href="# "> </a>
<a href="#A">A</a>
<a href="#C">C</a>
<a href="#D">D</a>
@@ -29,14 +29,13 @@
<a href="#T">T</a>
<a href="#misc">misc</a>
</p>
-<table width="100%">
-</table>
+
<h2><a name=" ">-- --</a></h2>
<table width="100%">
<tr><td width="25%"><a href="0RandVar-package.html">RandVar-package</a></td>
-<td>Implementation of random variables </td></tr>
+<td>Implementation of random variables</td></tr>
</table>
<h2><a name="">-- --</a></h2>
@@ -121,6 +120,8 @@
<td>Euclidean random matrix</td></tr>
<tr><td width="25%"><a href="EuclRandMatrix-class.html">Dim,EuclRandMatrix-method</a></td>
<td>Euclidean random matrix</td></tr>
+<tr><td width="25%"><a href="EuclRandMatrix-class.html">Dim<-</a></td>
+<td>Euclidean random matrix</td></tr>
<tr><td width="25%"><a href="EuclRandMatrix-class.html">Dim<-,EuclRandMatrix-method</a></td>
<td>Euclidean random matrix</td></tr>
<tr><td width="25%"><a href="EuclRandMatrix-class.html">dimension,EuclRandMatrix-method</a></td>
@@ -133,6 +134,8 @@
<td>Random variable</td></tr>
<tr><td width="25%"><a href="RandVariable-class.html">Domain,RandVariable-method</a></td>
<td>Random variable</td></tr>
+<tr><td width="25%"><a href="RandVariable-class.html">Domain<-</a></td>
+<td>Random variable</td></tr>
<tr><td width="25%"><a href="RandVariable-class.html">Domain<-,RandVariable-method</a></td>
<td>Random variable</td></tr>
</table>
@@ -253,6 +256,8 @@
<td>Random variable</td></tr>
<tr><td width="25%"><a href="RandVariable-class.html">Map,RandVariable-method</a></td>
<td>Random variable</td></tr>
+<tr><td width="25%"><a href="RandVariable-class.html">Map<-</a></td>
+<td>Random variable</td></tr>
<tr><td width="25%"><a href="RandVariable-class.html">Map<-,RandVariable-method</a></td>
<td>Random variable</td></tr>
<tr><td width="25%"><a href="EuclRandMatrix-class.html">Math,EuclRandMatrix-method</a></td>
@@ -287,7 +292,7 @@
<table width="100%">
<tr><td width="25%"><a href="0RandVar-package.html">RandVar</a></td>
-<td>Implementation of random variables </td></tr>
+<td>Implementation of random variables</td></tr>
<tr><td width="25%"><a href="RandVariable.html">RandVariable</a></td>
<td>Generating function for RandVariable-class</td></tr>
<tr><td width="25%"><a href="RandVariable-class.html">RandVariable-class</a></td>
@@ -296,6 +301,8 @@
<td>Random variable</td></tr>
<tr><td width="25%"><a href="RandVariable-class.html">Range,RandVariable-method</a></td>
<td>Random variable</td></tr>
+<tr><td width="25%"><a href="RandVariable-class.html">Range<-</a></td>
+<td>Random variable</td></tr>
<tr><td width="25%"><a href="EuclRandVariable-class.html">Range<-,EuclRandVariable-method</a></td>
<td>Euclidean random variable</td></tr>
<tr><td width="25%"><a href="RandVariable-class.html">Range<-,RandVariable-method</a></td>
Modified: branches/robast-0.7/pkg/RandVar/chm/RandVar.chm
===================================================================
(Binary files differ)
Modified: branches/robast-0.7/pkg/RandVar/chm/RandVar.toc
===================================================================
--- branches/robast-0.7/pkg/RandVar/chm/RandVar.toc 2009-02-02 16:53:03 UTC (rev 251)
+++ branches/robast-0.7/pkg/RandVar/chm/RandVar.toc 2009-02-23 09:55:25 UTC (rev 252)
@@ -78,10 +78,6 @@
<param name="Local" value="EuclRandVarList-class.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
-<param name="Name" value=".getImageDistr">
-<param name="Local" value="util.html">
-</OBJECT>
-<LI> <OBJECT type="text/sitemap">
<param name="Name" value="Arith,EuclRandMatrix,EuclRandMatrix-method">
<param name="Local" value="EuclRandMatrix-class.html">
</OBJECT>
@@ -527,11 +523,7 @@
<param name="Local" value="RealRandVariable.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
-<param name="Name" value="Help function for generation of image distributions">
-<param name="Local" value="util.html">
-</OBJECT>
-<LI> <OBJECT type="text/sitemap">
-<param name="Name" value="Implementation of random variables ">
+<param name="Name" value="Implementation of random variables">
<param name="Local" value="0RandVar-package.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
Modified: branches/robast-0.7/pkg/RandVar/inst/doc/RandVar.pdf
===================================================================
(Binary files differ)
Modified: pkg/RandVar/R/Arith.R
===================================================================
--- pkg/RandVar/R/Arith.R 2009-02-02 16:53:03 UTC (rev 251)
+++ pkg/RandVar/R/Arith.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -17,6 +17,7 @@
}
}
+ 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)) }
@@ -79,6 +80,7 @@
}
}
+ 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) }
@@ -148,6 +150,7 @@
}
}
+ 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/EuclRandVariable.R
===================================================================
--- pkg/RandVar/R/EuclRandVariable.R 2009-02-02 16:53:03 UTC (rev 251)
+++ pkg/RandVar/R/EuclRandVariable.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -336,6 +336,7 @@
function(x){
nrvalues <- length(x)
map <- vector(mode = "list", length = nrvalues)
+ fct <- NULL
for(i in 1:nrvalues){
map[[i]] <- function(x){ f <- fct; t(f(x)) }
body(map[[i]]) <- substitute({ f <- fct; t(f(x)) },
@@ -354,6 +355,7 @@
function(x){
map <- matrix(x at Map, nrow = x at Dim[1])
+ fkt <- NULL
d <- x at Dim
map <- vector(mode = "list", length = d[1]*d[2])
for(i in 1:d[1])
Modified: pkg/RandVar/R/Math.R
===================================================================
--- pkg/RandVar/R/Math.R 2009-02-02 16:53:03 UTC (rev 251)
+++ pkg/RandVar/R/Math.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -4,6 +4,7 @@
nrvalues <- length(x)
map <- vector("list", nrvalues)
+ 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/R/Matrixmult.R
===================================================================
--- pkg/RandVar/R/Matrixmult.R 2009-02-02 16:53:03 UTC (rev 251)
+++ pkg/RandVar/R/Matrixmult.R 2009-02-23 09:55:25 UTC (rev 252)
@@ -6,6 +6,7 @@
if(ncol(x) != dimension(y))
stop("the number of columns of x != dimension of y")
+ fct1 <- NULL; e <- NULL
dimn <- y at Range@dimension
map <- vector("list", nrow(x))
for(i in 1:nrow(x)){
@@ -73,6 +74,7 @@
if(ncol(x) != dimension(y))
stop("the number of columns of x != dimension of y")
+ fct1 <- NULL; e <- NULL
map <- vector("list", nrow(x))
for(i in 1:nrow(x)){
if(numberOfMaps(y) == 1){
@@ -154,6 +156,7 @@
if(!compatibleDomains(x, y))
stop("the domains of the two random variables are not compatible")
+ fct1 <- NULL; fct2 <- NULL
fct <- function(x){ f1 <- fct1; f2 <- fct2; f1(x) %*% f2(x) }
body(fct) <- substitute({ f1 <- fct1; f2 <- fct2; f1(x) %*% f2(x) },
list(fct1 = x at Map[[1]], fct2 = y at Map[[1]]))
More information about the Robast-commits
mailing list