[Robast-commits] r441 - in pkg/RandVar/tests: . Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Jan 5 15:16:47 CET 2011
Author: stamats
Date: 2011-01-05 15:16:47 +0100 (Wed, 05 Jan 2011)
New Revision: 441
Modified:
pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save
pkg/RandVar/tests/tests.Rout.save
Log:
updated *.Rout.save files to R 2.12.1 patched
Modified: pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save
===================================================================
--- pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save 2010-12-03 11:13:24 UTC (rev 440)
+++ pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save 2011-01-05 14:16:47 UTC (rev 441)
@@ -1,7 +1,8 @@
-R version 2.10.0 beta (2009-10-15 r50107)
-Copyright (C) 2009 The R Foundation for Statistical Computing
+R version 2.12.1 Patched (2011-01-04 r53913)
+Copyright (C) 2011 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
+Platform: x86_64-unknown-linux-gnu (64-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -17,77 +18,12 @@
'help.start()' for an HTML browser interface to help.
Type 'q()' to quit R.
-> ### * <HEADER>
-> ###
-> attach(NULL, name = "CheckExEnv")
-> assign("nameEx",
-+ local({
-+ s <- "__{must remake R-ex/*.R}__"
-+ function(new) {
-+ if(!missing(new)) s <<- new else s
-+ }
-+ }),
-+ pos = "CheckExEnv")
-> ## Add some hooks to label plot pages for base and grid graphics
-> assign("base_plot_hook",
-+ function() {
-+ pp <- par(c("mfg","mfcol","oma","mar"))
-+ if(all(pp$mfg[1:2] == c(1, pp$mfcol[2]))) {
-+ outer <- (oma4 <- pp$oma[4]) > 0; mar4 <- pp$mar[4]
-+ mtext(sprintf("help(\"%s\")", nameEx()), side = 4,
-+ line = if(outer)max(1, oma4 - 1) else min(1, mar4 - 1),
-+ outer = outer, adj = 1, cex = .8, col = "orchid", las=3)
-+ }
-+ },
-+ pos = "CheckExEnv")
-> assign("grid_plot_hook",
-+ function() {
-+ grid::pushViewport(grid::viewport(width=grid::unit(1, "npc") -
-+ grid::unit(1, "lines"), x=0, just="left"))
-+ grid::grid.text(sprintf("help(\"%s\")", nameEx()),
-+ x=grid::unit(1, "npc") + grid::unit(0.5, "lines"),
-+ y=grid::unit(0.8, "npc"), rot=90,
-+ gp=grid::gpar(col="orchid"))
-+ },
-+ pos = "CheckExEnv")
-> setHook("plot.new", get("base_plot_hook", pos = "CheckExEnv"))
-> setHook("persp", get("base_plot_hook", pos = "CheckExEnv"))
-> setHook("grid.newpage", get("grid_plot_hook", pos = "CheckExEnv"))
-> assign("cleanEx",
-+ function(env = .GlobalEnv) {
-+ rm(list = ls(envir = env, all.names = TRUE), envir = env)
-+ RNGkind("default", "default")
-+ set.seed(1)
-+ options(warn = 1)
-+ .CheckExEnv <- as.environment("CheckExEnv")
-+ delayedAssign("T", stop("T used instead of TRUE"),
-+ assign.env = .CheckExEnv)
-+ delayedAssign("F", stop("F used instead of FALSE"),
-+ assign.env = .CheckExEnv)
-+ sch <- search()
-+ newitems <- sch[! sch %in% .oldSearch]
-+ for(item in rev(newitems))
-+ eval(substitute(detach(item), list(item=item)))
-+ missitems <- .oldSearch[! .oldSearch %in% sch]
-+ if(length(missitems))
-+ warning("items ", paste(missitems, collapse=", "),
-+ " have been removed from the search path")
-+ },
-+ pos = "CheckExEnv")
-> assign("ptime", proc.time(), pos = "CheckExEnv")
-> ## at least one package changes these via ps.options(), so do this
-> ## before loading the package.
-> ## Use postscript as incomplete files may be viewable, unlike PDF.
-> ## Choose a size that is close to on-screen devices, fix paper
-> grDevices::ps.options(width = 7, height = 7, paper = "a4", reset = TRUE)
-> grDevices::postscript("RandVar-Ex.ps")
->
-> assign("par.postscript", graphics::par(no.readonly = TRUE), pos = "CheckExEnv")
-> options(contrasts = c(unordered = "contr.treatment", ordered = "contr.poly"))
+> pkgname <- "RandVar"
+> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
> library('RandVar')
Loading required package: startupmsg
-:startupmsg> Utilities for start-up messages (version 0.7)
+:startupmsg> Utilities for start-up messages (version 0.7.1)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
@@ -96,7 +32,7 @@
Loading required package: sfsmisc
Loading required package: SweaveListingUtils
:SweaveListingUtils> Utilities for Sweave together with
-:SweaveListingUtils> TeX listings package (version 0.4)
+:SweaveListingUtils> TeX listings package (version 0.5)
:SweaveListingUtils>
:SweaveListingUtils> Some functions from package 'base'
:SweaveListingUtils> are intentionally masked ---see
@@ -117,14 +53,12 @@
Attaching package: 'SweaveListingUtils'
+The following object(s) are masked from 'package:base':
- The following object(s) are masked from package:base :
+ library, require
- library,
- require
-
-:distr> Object orientated implementation of distributions (version
-:distr> 2.2)
+:distr> Object oriented implementation of distributions (version
+:distr> 2.3)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -145,25 +79,21 @@
Attaching package: 'distr'
+The following object(s) are masked from 'package:stats':
- The following object(s) are masked from package:stats :
+ df, qqplot, sd
- df,
- qqplot,
- sd
-
Loading required package: distrEx
Loading required package: evd
Loading required package: actuar
Attaching package: 'actuar'
+The following object(s) are masked from 'package:grDevices':
- The following object(s) are masked from package:grDevices :
+ cm
- cm
-
-:distrEx> Extensions of package distr (version 2.2)
+:distrEx> Extensions of package distr (version 2.3)
:distrEx>
:distrEx> Note: Packages "e1071", "moments", "fBasics" should be
:distrEx> attached /before/ package "distrEx". See distrExMASK().
@@ -178,15 +108,11 @@
Attaching package: 'distrEx'
+The following object(s) are masked from 'package:stats':
- The following object(s) are masked from package:stats :
+ IQR, mad, median, var
- IQR,
- mad,
- median,
- var
-
-:RandVar> Implementation of random variables (version 0.7)
+:RandVar> Implementation of random variables (version 0.8)
:RandVar>
:RandVar> For more information see ?"RandVar", NEWS("RandVar"), as
:RandVar> well as
@@ -196,8 +122,8 @@
>
> assign(".oldSearch", search(), pos = 'CheckExEnv')
-> assign(".oldNS", loadedNamespaces(), pos = 'CheckExEnv')
-> cleanEx(); nameEx("0RandVar-package")
+> cleanEx()
+> nameEx("0RandVar-package")
> ### * 0RandVar-package
>
> flush(stderr()); flush(stdout())
@@ -214,7 +140,8 @@
>
>
>
-> cleanEx(); nameEx("EuclRandMatrix-class")
+> cleanEx()
+> nameEx("EuclRandMatrix-class")
> ### * EuclRandMatrix-class
>
> flush(stderr()); flush(stdout())
@@ -285,7 +212,7 @@
}
t(f(x))
}
-<environment: 0x644d848>
+<environment: 0x382ce28>
>
> R2 <- EuclRandMatrix(Map = L2, ncol = 2, Domain = Reals(), dimension = 1)
@@ -314,7 +241,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x3754358>
[[2]]
function (x)
@@ -325,7 +252,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x3754358>
[[3]]
function (x)
@@ -336,7 +263,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x3754358>
[[4]]
function (x)
@@ -347,7 +274,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x3754358>
>
> ## "Arith" group
@@ -361,7 +288,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33fcc98>
[[2]]
function (x)
@@ -372,7 +299,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33fcc98>
[[3]]
function (x)
@@ -383,7 +310,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33fcc98>
[[4]]
function (x)
@@ -394,7 +321,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33fcc98>
[[5]]
function (x)
@@ -405,7 +332,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33fcc98>
[[6]]
function (x)
@@ -416,7 +343,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33fcc98>
> Map(R2 * R2)
[[1]]
@@ -432,7 +359,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2f63368>
[[2]]
function (x)
@@ -447,7 +374,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2f63368>
[[3]]
function (x)
@@ -462,7 +389,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2f63368>
[[4]]
function (x)
@@ -477,12 +404,13 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2f63368>
>
>
>
-> cleanEx(); nameEx("EuclRandMatrix")
+> cleanEx()
+> nameEx("EuclRandMatrix")
> ### * EuclRandMatrix
>
> flush(stderr()); flush(stdout())
@@ -527,7 +455,7 @@
}
t(f(x))
}
-<environment: 0x62cc628>
+<environment: 0x4fa6ab0>
>
> R2 <- EuclRandMatrix(Map = L2, ncol = 2, Domain = Reals(), dimension = 1)
@@ -554,7 +482,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x41b86b0>
[[2]]
function (x)
@@ -565,7 +493,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x41b86b0>
[[3]]
function (x)
@@ -576,7 +504,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x41b86b0>
[[4]]
function (x)
@@ -587,7 +515,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x41b86b0>
>
> ## "Arith" group
@@ -601,7 +529,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x414d1b8>
[[2]]
function (x)
@@ -612,7 +540,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x414d1b8>
[[3]]
function (x)
@@ -623,7 +551,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x414d1b8>
[[4]]
function (x)
@@ -634,7 +562,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x414d1b8>
[[5]]
function (x)
@@ -645,7 +573,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x414d1b8>
[[6]]
function (x)
@@ -656,7 +584,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x414d1b8>
> Map(R2 * R2)
[[1]]
@@ -672,7 +600,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x404e430>
[[2]]
function (x)
@@ -687,7 +615,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x404e430>
[[3]]
function (x)
@@ -702,7 +630,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x404e430>
[[4]]
function (x)
@@ -717,7 +645,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x404e430>
>
>
@@ -755,7 +683,8 @@
>
>
>
-> cleanEx(); nameEx("EuclRandVarList-class")
+> cleanEx()
+> nameEx("EuclRandVarList-class")
> ### * EuclRandVarList-class
>
> flush(stderr()); flush(stdout())
@@ -834,7 +763,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x36e9098>
[[2]]
function (x)
@@ -845,7 +774,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x36e9098>
[[3]]
function (x)
@@ -856,7 +785,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x36e9098>
[[4]]
function (x)
@@ -867,7 +796,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x36e9098>
>
> ## "Arith" group
@@ -881,7 +810,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x2ea4a30>
[[2]]
function (x)
@@ -892,7 +821,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x2ea4a30>
[[3]]
function (x)
@@ -903,7 +832,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x2ea4a30>
[[4]]
function (x)
@@ -914,7 +843,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x2ea4a30>
> Map((RL1 * 2)[[2]])
[[1]]
@@ -926,7 +855,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x5767cd8>
[[2]]
function (x)
@@ -937,7 +866,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x5767cd8>
[[3]]
function (x)
@@ -948,7 +877,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x5767cd8>
[[4]]
function (x)
@@ -959,7 +888,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x5767cd8>
[[5]]
function (x)
@@ -970,7 +899,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x5767cd8>
[[6]]
function (x)
@@ -981,7 +910,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x5767cd8>
> Map((RL1 / RL1)[[3]])
[[1]]
@@ -997,7 +926,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x49871a8>
[[2]]
function (x)
@@ -1012,7 +941,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x49871a8>
[[3]]
function (x)
@@ -1027,7 +956,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x49871a8>
[[4]]
function (x)
@@ -1042,12 +971,13 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x49871a8>
>
>
>
-> cleanEx(); nameEx("EuclRandVarList")
+> cleanEx()
+> nameEx("EuclRandVarList")
> ### * EuclRandVarList
>
> flush(stderr()); flush(stdout())
@@ -1107,7 +1037,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x5ba23b0>
[[2]]
function (x)
@@ -1118,7 +1048,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x5ba23b0>
[[3]]
function (x)
@@ -1129,7 +1059,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x5ba23b0>
[[4]]
function (x)
@@ -1140,7 +1070,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x5ba23b0>
>
> ## "Arith" group
@@ -1154,7 +1084,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x5e710b0>
[[2]]
function (x)
@@ -1165,7 +1095,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x5e710b0>
[[3]]
function (x)
@@ -1176,7 +1106,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x5e710b0>
[[4]]
function (x)
@@ -1187,7 +1117,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x5e710b0>
> Map((RL1 * 2)[[2]])
[[1]]
@@ -1199,7 +1129,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x5fcdee0>
[[2]]
function (x)
@@ -1210,7 +1140,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x5fcdee0>
[[3]]
function (x)
@@ -1221,7 +1151,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x5fcdee0>
[[4]]
function (x)
@@ -1232,7 +1162,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x5fcdee0>
[[5]]
function (x)
@@ -1243,7 +1173,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x5fcdee0>
[[6]]
function (x)
@@ -1254,7 +1184,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x5fcdee0>
> Map((RL1 / RL1)[[3]])
[[1]]
@@ -1270,7 +1200,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x52190e8>
[[2]]
function (x)
@@ -1285,7 +1215,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x52190e8>
[[3]]
function (x)
@@ -1300,7 +1230,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x52190e8>
[[4]]
function (x)
@@ -1315,7 +1245,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x52190e8>
>
> ## The function is currently defined as
@@ -1329,7 +1259,8 @@
>
>
>
-> cleanEx(); nameEx("EuclRandVariable-class")
+> cleanEx()
+> nameEx("EuclRandVariable-class")
> ### * EuclRandVariable-class
>
> flush(stderr()); flush(stdout())
@@ -1402,7 +1333,7 @@
}
> Range(R1)
-An object of class “Reals”
+An object of class "Reals"
Slot "dimension":
[1] 1
@@ -1484,17 +1415,17 @@
> dimension(R2)
[1] 8
> (X <- matrix(c(x, rnorm(10)), ncol = 2))
- [,1] [,2]
- [1,] 0.1836433 -0.943362702
- [2,] -0.8356286 0.002961913
- [3,] 1.5952808 0.614183669
- [4,] 0.3295078 1.507011427
- [5,] -0.8204684 1.108554991
- [6,] 0.4874291 0.020064917
- [7,] 0.7383247 1.279486901
- [8,] 0.5757814 0.130896651
- [9,] -0.3053884 0.967460652
-[10,] 1.5117812 -0.435764415
+ [,1] [,2]
+ [1,] 0.1836433 0.38984324
+ [2,] -0.8356286 -0.62124058
+ [3,] 1.5952808 -2.21469989
+ [4,] 0.3295078 1.12493092
+ [5,] -0.8204684 -0.04493361
+ [6,] 0.4874291 -0.01619026
+ [7,] 0.7383247 0.94383621
+ [8,] 0.5757814 0.82122120
+ [9,] -0.3053884 0.59390132
+[10,] 1.5117812 0.91897737
> res.R2 <- evalRandVar(R2, X)
> res.R2[3,,1] # results for Map(R2)[[3]](X[,1])
[1] 0.1826128 -0.7417183 0.9997003 0.3235773 -0.7314653 0.4683559
@@ -1514,7 +1445,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x44a60d8>
[[2]]
function (x)
@@ -1529,7 +1460,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x44a60d8>
[[3]]
function (x)
@@ -1544,7 +1475,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x44a60d8>
[[4]]
function (x)
@@ -1559,7 +1490,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x44a60d8>
>
> # "Arith" group generic
@@ -1573,7 +1504,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x447c1e0>
[[2]]
function (x)
@@ -1584,7 +1515,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x447c1e0>
[[3]]
function (x)
@@ -1595,7 +1526,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x447c1e0>
[[4]]
function (x)
@@ -1606,7 +1537,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x447c1e0>
> Map(c(1,3,5) * R1)
Warning in c(1, 3, 5) * R1 :
@@ -1620,7 +1551,7 @@
}
1 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x442ee58>
[[2]]
function (x)
@@ -1631,7 +1562,7 @@
}
3 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x442ee58>
[[3]]
function (x)
@@ -1642,7 +1573,7 @@
}
5 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x442ee58>
[[4]]
function (x)
@@ -1653,7 +1584,7 @@
}
1 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x442ee58>
> try(1:5 * R1) # error
Error in 1:5 * R1 :
@@ -1668,7 +1599,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x4367520>
[[2]]
function (x)
@@ -1679,7 +1610,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x4367520>
[[3]]
function (x)
@@ -1690,7 +1621,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x4367520>
[[4]]
function (x)
@@ -1701,7 +1632,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x4367520>
> Map(R2 - 5)
[[1]]
@@ -1713,7 +1644,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x4320a80>
[[2]]
function (x)
@@ -1724,7 +1655,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x4320a80>
[[3]]
function (x)
@@ -1735,7 +1666,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x4320a80>
[[4]]
function (x)
@@ -1746,7 +1677,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x4320a80>
> Map(R1 ^ R1)
[[1]]
@@ -1762,7 +1693,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x42d7b18>
[[2]]
function (x)
@@ -1777,7 +1708,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x42d7b18>
[[3]]
function (x)
@@ -1792,7 +1723,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x42d7b18>
[[4]]
function (x)
@@ -1807,13 +1738,14 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x42d7b18>
>
>
>
>
-> cleanEx(); nameEx("EuclRandVariable")
+> cleanEx()
+> nameEx("EuclRandVariable")
> ### * EuclRandVariable
>
> flush(stderr()); flush(stdout())
@@ -1856,7 +1788,7 @@
}
> Range(R1)
-An object of class “EuclideanSpace”
+An object of class "EuclideanSpace"
Slot "dimension":
[1] 1
@@ -1935,17 +1867,17 @@
> Domain(R2) <- EuclideanSpace(dimension = 2)
> Range(R2) <- EuclideanSpace(dimension = 2)
> (X <- matrix(c(x, rnorm(10)), ncol = 2))
- [,1] [,2]
- [1,] 0.1836433 -0.943362702
- [2,] -0.8356286 0.002961913
- [3,] 1.5952808 0.614183669
- [4,] 0.3295078 1.507011427
- [5,] -0.8204684 1.108554991
- [6,] 0.4874291 0.020064917
- [7,] 0.7383247 1.279486901
- [8,] 0.5757814 0.130896651
- [9,] -0.3053884 0.967460652
-[10,] 1.5117812 -0.435764415
+ [,1] [,2]
+ [1,] 0.1836433 0.38984324
+ [2,] -0.8356286 -0.62124058
+ [3,] 1.5952808 -2.21469989
+ [4,] 0.3295078 1.12493092
+ [5,] -0.8204684 -0.04493361
+ [6,] 0.4874291 -0.01619026
+ [7,] 0.7383247 0.94383621
+ [8,] 0.5757814 0.82122120
+ [9,] -0.3053884 0.59390132
+[10,] 1.5117812 0.91897737
> res.R2 <- evalRandVar(R2, X)
> res.R2[3,,1] # results for Map(R2)[[3]](X[,1])
[1] 0.1826128 -0.7417183 0.9997003 0.3235773 -0.7314653 0.4683559
@@ -1965,7 +1897,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x4f5d008>
[[2]]
function (x)
@@ -1980,7 +1912,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x4f5d008>
[[3]]
function (x)
@@ -1995,7 +1927,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x4f5d008>
[[4]]
function (x)
@@ -2010,7 +1942,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x4f5d008>
>
> # "Arith" group generic
@@ -2024,7 +1956,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x4f3f6a0>
[[2]]
function (x)
@@ -2035,7 +1967,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x4f3f6a0>
[[3]]
function (x)
@@ -2046,7 +1978,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x4f3f6a0>
[[4]]
function (x)
@@ -2057,7 +1989,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x4f3f6a0>
> Map(c(1,3,5) * R1)
Warning in c(1, 3, 5) * R1 :
@@ -2071,7 +2003,7 @@
}
1 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x4f1c5b0>
[[2]]
function (x)
@@ -2082,7 +2014,7 @@
}
3 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x4f1c5b0>
[[3]]
function (x)
@@ -2093,7 +2025,7 @@
}
5 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x4f1c5b0>
[[4]]
function (x)
@@ -2104,7 +2036,7 @@
}
1 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x4f1c5b0>
> try(1:5 * R1) # error
Error in 1:5 * R1 :
@@ -2119,7 +2051,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x492cf48>
[[2]]
function (x)
@@ -2130,7 +2062,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x492cf48>
[[3]]
function (x)
@@ -2141,7 +2073,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x492cf48>
[[4]]
function (x)
@@ -2152,7 +2084,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x492cf48>
> Map(R2 - 5)
[[1]]
@@ -2164,7 +2096,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x4908730>
[[2]]
function (x)
@@ -2175,7 +2107,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x4908730>
[[3]]
function (x)
@@ -2186,7 +2118,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x4908730>
[[4]]
function (x)
@@ -2197,7 +2129,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x4908730>
> Map(R1 ^ R1)
[[1]]
@@ -2213,7 +2145,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x48e25b0>
[[2]]
function (x)
@@ -2228,7 +2160,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x48e25b0>
[[3]]
function (x)
@@ -2243,7 +2175,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x48e25b0>
[[4]]
function (x)
@@ -2258,7 +2190,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x48e25b0>
>
>
@@ -2284,7 +2216,8 @@
>
>
>
-> cleanEx(); nameEx("RandVariable-class")
+> cleanEx()
+> nameEx("RandVariable-class")
> ### * RandVariable-class
>
> flush(stderr()); flush(stdout())
@@ -2358,7 +2291,8 @@
>
>
>
-> cleanEx(); nameEx("RandVariable")
+> cleanEx()
+> nameEx("RandVariable")
> ### * RandVariable
>
> flush(stderr()); flush(stdout())
@@ -2380,7 +2314,7 @@
function (x)
{
}
-<environment: 0x5adfa00>
+<environment: 0x42dcb88>
> Domain(R1)
NULL
@@ -2436,7 +2370,8 @@
>
>
>
-> cleanEx(); nameEx("RealRandVariable-class")
+> cleanEx()
+> nameEx("RealRandVariable-class")
> ### * RealRandVariable-class
>
> flush(stderr()); flush(stdout())
@@ -2456,7 +2391,8 @@
>
>
>
-> cleanEx(); nameEx("RealRandVariable")
+> cleanEx()
+> nameEx("RealRandVariable")
> ### * RealRandVariable
>
> flush(stderr()); flush(stdout())
@@ -2500,7 +2436,7 @@
> ### * <FOOTER>
> ###
> cat("Time elapsed: ", proc.time() - get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 9.892 0.112 10.888 0.008 0.008
+Time elapsed: 5.23 0.05 5.307 0 0
> grDevices::dev.off()
null device
1
Modified: pkg/RandVar/tests/tests.Rout.save
===================================================================
--- pkg/RandVar/tests/tests.Rout.save 2010-12-03 11:13:24 UTC (rev 440)
+++ pkg/RandVar/tests/tests.Rout.save 2011-01-05 14:16:47 UTC (rev 441)
@@ -1,7 +1,8 @@
-R version 2.10.0 Under development (unstable) (2009-08-31 r49488)
-Copyright (C) 2009 The R Foundation for Statistical Computing
+R version 2.12.1 Patched (2011-01-04 r53913)
+Copyright (C) 2011 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
+Platform: x86_64-unknown-linux-gnu (64-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -17,7 +18,7 @@
> library(RandVar)
Loading required package: startupmsg
-:startupmsg> Utilities for start-up messages (version 0.7)
+:startupmsg> Utilities for start-up messages (version 0.7.1)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
@@ -26,7 +27,7 @@
Loading required package: sfsmisc
Loading required package: SweaveListingUtils
:SweaveListingUtils> Utilities for Sweave together with
-:SweaveListingUtils> TeX listings package (version 0.4)
+:SweaveListingUtils> TeX listings package (version 0.5)
:SweaveListingUtils>
:SweaveListingUtils> Some functions from package 'base'
:SweaveListingUtils> are intentionally masked ---see
@@ -47,14 +48,12 @@
Attaching package: 'SweaveListingUtils'
+The following object(s) are masked from 'package:base':
- The following object(s) are masked from package:base :
+ library, require
- library,
- require
-
-:distr> Object orientated implementation of distributions (version
-:distr> 2.2)
+:distr> Object oriented implementation of distributions (version
+:distr> 2.3)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -75,24 +74,21 @@
Attaching package: 'distr'
+The following object(s) are masked from 'package:stats':
- The following object(s) are masked from package:stats :
+ df, qqplot, sd
- df,
- sd
-
Loading required package: distrEx
Loading required package: evd
Loading required package: actuar
Attaching package: 'actuar'
+The following object(s) are masked from 'package:grDevices':
- The following object(s) are masked from package:grDevices :
+ cm
- cm
-
-:distrEx> Extensions of package distr (version 2.2)
+:distrEx> Extensions of package distr (version 2.3)
:distrEx>
:distrEx> Note: Packages "e1071", "moments", "fBasics" should be
:distrEx> attached /before/ package "distrEx". See distrExMASK().
@@ -107,15 +103,11 @@
Attaching package: 'distrEx'
+The following object(s) are masked from 'package:stats':
- The following object(s) are masked from package:stats :
+ IQR, mad, median, var
- IQR,
- mad,
- median,
- var
-
-:RandVar> Implementation of random variables (version 0.7)
+:RandVar> Implementation of random variables (version 0.8)
:RandVar>
:RandVar> For more information see ?"RandVar", NEWS("RandVar"), as
:RandVar> well as
@@ -145,7 +137,7 @@
function (x)
{
}
-<environment: 0x4449680>
+<environment: 0x4a3a5a8>
> Domain(R1)
NULL
@@ -318,16 +310,16 @@
> Range(R4) <- EuclideanSpace(dimension = 2)
> (X <- matrix(c(x, rnorm(10)), ncol = 2))
[,1] [,2]
- [1,] -0.23017749 0.3698373
- [2,] 1.55870831 1.2409212
- [3,] 0.07050839 -0.9586259
- [4,] 0.12928774 -0.7157439
- [5,] 1.71506499 -0.3035521
- [6,] 0.46091621 -1.0161404
- [7,] -1.26506123 0.2723583
- [8,] -0.68685285 1.5429931
- [9,] -0.44566197 -1.0066128
-[10,] 1.22408180 1.1973871
+ [1,] -0.23017749 0.3598138
+ [2,] 1.55870831 0.4007715
+ [3,] 0.07050839 0.1106827
+ [4,] 0.12928774 -0.5558411
+ [5,] 1.71506499 1.7869131
+ [6,] 0.46091621 0.4978505
+ [7,] -1.26506123 -1.9666172
+ [8,] -0.68685285 0.7013559
+ [9,] -0.44566197 -0.4727914
+[10,] 1.22408180 -1.0678237
> res2.R4 <- evalRandVar(R4, X)
> res2.R4[3,,1] # results for Map(R4)[[3]](X[,1])
[1] -0.22815034 0.99992694 0.07044998 0.12892786 0.98961131 0.44476889
@@ -367,15 +359,15 @@
>
> res2.R5 <- evalRandVar(R5, X)
> res2.R5[,,1,2]
-[1] 1.4474990 0.3698373 0.3614637 0.0000000
+[1] 1.4330626 0.3598138 0.3521000 0.0000000
> res2.R5[,1,2,1:2]
[,1] [,2]
-[1,] 4.752678 3.4587982
-[2,] 1.558708 1.2409212
-[3,] 0.999927 0.9460828
-[4,] 1.000000 1.0000000
+[1,] 4.752678 1.4929760
+[2,] 1.558708 0.4007715
+[3,] 0.999927 0.3901288
+[4,] 1.000000 0.0000000
> res2.R5[1,1,1:2,2]
-[1] 1.447499 3.458798
+[1] 1.433063 1.492976
>
> new("EuclRandMatrix", Map = L2, Dim = as.integer(c(3,2)), Domain = Reals(), Range = Reals())
An object of class "EuclRandMatrix"
@@ -414,7 +406,7 @@
}
t(f(x))
}
-<environment: 0x4cfa6c0>
+<environment: 0x4aa9ec8>
> dimension(R6)
[1] 6
@@ -503,19 +495,19 @@
> ## "Math" group
> system.time(Map(log(abs(R4))), gcFirst = TRUE)
user system elapsed
- 0.004 0.000 0.002
+ 0.000 0.000 0.001
> system.time(Map(gamma(R7)), gcFirst = TRUE)
user system elapsed
0.000 0.000 0.003
> system.time(Map(exp(RL1)[[1]]), gcFirst = TRUE)
user system elapsed
- 0.004 0.000 0.004
+ 0.000 0.000 0.004
>
>
> ## "Arith" group
> system.time(Map(3 + R3), gcFirst = TRUE)
user system elapsed
- 0.004 0.000 0.001
+ 0.000 0.000 0.001
> Map(c(1,3,5) * R3)
[[1]]
function (x)
@@ -526,7 +518,7 @@
}
1 * f2(x)
}
-<environment: 0x635e9d8>
+<environment: 0x75ac100>
[[2]]
function (x)
@@ -537,7 +529,7 @@
}
3 * f2(x)
}
-<environment: 0x635e9d8>
+<environment: 0x75ac100>
[[3]]
function (x)
@@ -548,7 +540,7 @@
}
5 * f2(x)
}
-<environment: 0x635e9d8>
+<environment: 0x75ac100>
[[4]]
function (x)
@@ -559,7 +551,7 @@
}
1 * f2(x)
}
-<environment: 0x635e9d8>
+<environment: 0x75ac100>
Warning message:
In c(1, 3, 5) * R3 :
@@ -577,7 +569,7 @@
}
1:2 * f2(x)
}
-<environment: 0x623ff28>
+<environment: 0x7b07730>
[[2]]
function (x)
@@ -588,7 +580,7 @@
}
1:2 * f2(x)
}
-<environment: 0x623ff28>
+<environment: 0x7b07730>
[[3]]
function (x)
@@ -599,7 +591,7 @@
}
1:2 * f2(x)
}
-<environment: 0x623ff28>
+<environment: 0x7b07730>
[[4]]
function (x)
@@ -610,7 +602,7 @@
}
1:2 * f2(x)
}
-<environment: 0x623ff28>
+<environment: 0x7b07730>
> Map(2/R6)
[[1]]
@@ -622,7 +614,7 @@
}
2/f2(x)
}
-<environment: 0x5d9d6c0>
+<environment: 0x82964a8>
[[2]]
function (x)
@@ -633,7 +625,7 @@
}
2/f2(x)
}
-<environment: 0x5d9d6c0>
+<environment: 0x82964a8>
[[3]]
function (x)
@@ -644,7 +636,7 @@
}
2/f2(x)
}
-<environment: 0x5d9d6c0>
+<environment: 0x82964a8>
[[4]]
function (x)
@@ -655,7 +647,7 @@
}
2/f2(x)
}
-<environment: 0x5d9d6c0>
+<environment: 0x82964a8>
[[5]]
function (x)
@@ -666,7 +658,7 @@
}
2/f2(x)
}
-<environment: 0x5d9d6c0>
+<environment: 0x82964a8>
[[6]]
function (x)
@@ -677,7 +669,7 @@
}
2/f2(x)
}
-<environment: 0x5d9d6c0>
+<environment: 0x82964a8>
> Map(c(1,3,5) %% R6)
[[1]]
@@ -689,7 +681,7 @@
}
1%%f2(x)
}
-<environment: 0x5c4be50>
+<environment: 0x7c55a08>
[[2]]
function (x)
@@ -700,7 +692,7 @@
}
3%%f2(x)
}
-<environment: 0x5c4be50>
+<environment: 0x7c55a08>
[[3]]
function (x)
@@ -711,7 +703,7 @@
}
5%%f2(x)
}
-<environment: 0x5c4be50>
+<environment: 0x7c55a08>
[[4]]
function (x)
@@ -722,7 +714,7 @@
}
1%%f2(x)
}
-<environment: 0x5c4be50>
+<environment: 0x7c55a08>
[[5]]
function (x)
@@ -733,7 +725,7 @@
}
3%%f2(x)
}
-<environment: 0x5c4be50>
+<environment: 0x7c55a08>
[[6]]
function (x)
@@ -744,7 +736,7 @@
}
5%%f2(x)
}
-<environment: 0x5c4be50>
+<environment: 0x7c55a08>
> Map(R4 - 5)
[[1]]
@@ -756,7 +748,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5bb6e98>
+<environment: 0x66c5ea0>
[[2]]
function (x)
@@ -767,7 +759,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5bb6e98>
+<environment: 0x66c5ea0>
[[3]]
function (x)
@@ -778,7 +770,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5bb6e98>
+<environment: 0x66c5ea0>
[[4]]
function (x)
@@ -789,7 +781,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5bb6e98>
+<environment: 0x66c5ea0>
> Map(R6 %/% 2)
[[1]]
@@ -801,7 +793,7 @@
}
f1(x)%/%2
}
-<environment: 0x59a8da8>
+<environment: 0x57888b8>
[[2]]
function (x)
@@ -812,7 +804,7 @@
}
f1(x)%/%2
}
-<environment: 0x59a8da8>
+<environment: 0x57888b8>
[[3]]
function (x)
@@ -823,7 +815,7 @@
}
f1(x)%/%2
}
-<environment: 0x59a8da8>
+<environment: 0x57888b8>
[[4]]
function (x)
@@ -834,7 +826,7 @@
}
f1(x)%/%2
}
-<environment: 0x59a8da8>
+<environment: 0x57888b8>
[[5]]
function (x)
@@ -845,7 +837,7 @@
}
f1(x)%/%2
}
-<environment: 0x59a8da8>
+<environment: 0x57888b8>
[[6]]
function (x)
@@ -856,7 +848,7 @@
}
f1(x)%/%2
}
-<environment: 0x59a8da8>
+<environment: 0x57888b8>
> Map(R3 ^ R3)
[[1]]
@@ -872,7 +864,7 @@
}
f1(x)^f2(x)
}
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/robast -r 441
More information about the Robast-commits
mailing list