[Robast-commits] r484 - in branches/robast-0.9/pkg/RandVar: man tests tests/Examples vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jun 5 06:21:01 CEST 2012
Author: stamats
Date: 2012-06-05 06:21:01 +0200 (Tue, 05 Jun 2012)
New Revision: 484
Modified:
branches/robast-0.9/pkg/RandVar/man/EuclRandVariable-class.Rd
branches/robast-0.9/pkg/RandVar/man/EuclRandVariable.Rd
branches/robast-0.9/pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save
branches/robast-0.9/pkg/RandVar/tests/tests.R
branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save
branches/robast-0.9/pkg/RandVar/vignettes/RandVar.Rnw
Log:
some encoding problems with vignette which now includes "\usepackage[utf8]{inputenc}"
update of Rout.save files, added seed for reproducibility
Modified: branches/robast-0.9/pkg/RandVar/man/EuclRandVariable-class.Rd
===================================================================
--- branches/robast-0.9/pkg/RandVar/man/EuclRandVariable-class.Rd 2012-06-05 03:57:02 UTC (rev 483)
+++ branches/robast-0.9/pkg/RandVar/man/EuclRandVariable-class.Rd 2012-06-05 04:21:01 UTC (rev 484)
@@ -189,6 +189,7 @@
Map(R1[3])
Map(R1[c(1,2,4)])
Map(R1[2:4])
+set.seed(123)
evalRandVar(R1, rnorm(1))
x <- as.matrix(rnorm(10))
res.R1 <- evalRandVar(R1, x)
Modified: branches/robast-0.9/pkg/RandVar/man/EuclRandVariable.Rd
===================================================================
--- branches/robast-0.9/pkg/RandVar/man/EuclRandVariable.Rd 2012-06-05 03:57:02 UTC (rev 483)
+++ branches/robast-0.9/pkg/RandVar/man/EuclRandVariable.Rd 2012-06-05 04:21:01 UTC (rev 484)
@@ -36,6 +36,7 @@
Map(R1[3])
Map(R1[c(1,2,4)])
Map(R1[2:4])
+set.seed(123)
evalRandVar(R1, rnorm(1))
x <- as.matrix(rnorm(10))
res.R1 <- evalRandVar(R1, x)
Modified: branches/robast-0.9/pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save
===================================================================
--- branches/robast-0.9/pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save 2012-06-05 03:57:02 UTC (rev 483)
+++ branches/robast-0.9/pkg/RandVar/tests/Examples/RandVar-Ex.Rout.save 2012-06-05 04:21:01 UTC (rev 484)
@@ -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.15.0 Patched (2012-05-26 r59450) -- "Easter Beagle"
+Copyright (C) 2012 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.8)
: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.6)
:SweaveListingUtils>
:SweaveListingUtils> Some functions from package 'base'
:SweaveListingUtils> are intentionally masked ---see
@@ -115,16 +51,14 @@
:SweaveListingUtils> vignette("ExampleSweaveListingUtils").
-Attaching package: 'SweaveListingUtils'
+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.4)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -143,31 +77,22 @@
:distr> vignette("distr").
-Attaching package: 'distr'
+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 :
-
- cm
-
-:distrEx> Extensions of package distr (version 2.2)
+:distrEx> Extensions of package distr (version 2.4)
:distrEx>
:distrEx> Note: Packages "e1071", "moments", "fBasics" should be
-:distrEx> attached /before/ package "distrEx". See distrExMASK().
+:distrEx> attached /before/ package "distrEx". See
+:distrEx> distrExMASK().Note: Extreme value distribution
+:distrEx> functionality has been moved to
:distrEx>
+:distrEx> package "RobExtremes". See distrExMOVED().
+:distrEx>
:distrEx> For more information see ?"distrEx", NEWS("distrEx"), as
:distrEx> well as
:distrEx> http://distr.r-forge.r-project.org/
@@ -176,17 +101,13 @@
:distrEx> vignette("distr").
-Attaching package: 'distrEx'
+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.9)
:RandVar>
:RandVar> For more information see ?"RandVar", NEWS("RandVar"), as
:RandVar> well as
@@ -196,8 +117,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 +135,8 @@
>
>
>
-> cleanEx(); nameEx("EuclRandMatrix-class")
+> cleanEx()
+> nameEx("EuclRandMatrix-class")
> ### * EuclRandMatrix-class
>
> flush(stderr()); flush(stdout())
@@ -285,7 +207,7 @@
}
t(f(x))
}
-<environment: 0x644d848>
+<environment: 0x4fa60b8>
>
> R2 <- EuclRandMatrix(Map = L2, ncol = 2, Domain = Reals(), dimension = 1)
@@ -314,7 +236,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x4133e50>
[[2]]
function (x)
@@ -325,7 +247,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x4133e50>
[[3]]
function (x)
@@ -336,7 +258,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x4133e50>
[[4]]
function (x)
@@ -347,7 +269,7 @@
}
gamma(f1(x))
}
-<environment: 0x5921648>
+<environment: 0x4133e50>
>
> ## "Arith" group
@@ -361,7 +283,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33258e8>
[[2]]
function (x)
@@ -372,7 +294,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33258e8>
[[3]]
function (x)
@@ -383,7 +305,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33258e8>
[[4]]
function (x)
@@ -394,7 +316,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33258e8>
[[5]]
function (x)
@@ -405,7 +327,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33258e8>
[[6]]
function (x)
@@ -416,7 +338,7 @@
}
2/f2(x)
}
-<environment: 0x686cc60>
+<environment: 0x33258e8>
> Map(R2 * R2)
[[1]]
@@ -432,7 +354,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2018df8>
[[2]]
function (x)
@@ -447,7 +369,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2018df8>
[[3]]
function (x)
@@ -462,7 +384,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2018df8>
[[4]]
function (x)
@@ -477,12 +399,13 @@
}
f1(x) * f2(x)
}
-<environment: 0x6756b00>
+<environment: 0x2018df8>
>
>
>
-> cleanEx(); nameEx("EuclRandMatrix")
+> cleanEx()
+> nameEx("EuclRandMatrix")
> ### * EuclRandMatrix
>
> flush(stderr()); flush(stdout())
@@ -527,7 +450,7 @@
}
t(f(x))
}
-<environment: 0x62cc628>
+<environment: 0x667d658>
>
> R2 <- EuclRandMatrix(Map = L2, ncol = 2, Domain = Reals(), dimension = 1)
@@ -554,7 +477,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x5623950>
[[2]]
function (x)
@@ -565,7 +488,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x5623950>
[[3]]
function (x)
@@ -576,7 +499,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x5623950>
[[4]]
function (x)
@@ -587,7 +510,7 @@
}
gamma(f1(x))
}
-<environment: 0x59d6db0>
+<environment: 0x5623950>
>
> ## "Arith" group
@@ -601,7 +524,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x55b01c8>
[[2]]
function (x)
@@ -612,7 +535,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x55b01c8>
[[3]]
function (x)
@@ -623,7 +546,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x55b01c8>
[[4]]
function (x)
@@ -634,7 +557,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x55b01c8>
[[5]]
function (x)
@@ -645,7 +568,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x55b01c8>
[[6]]
function (x)
@@ -656,7 +579,7 @@
}
2/f2(x)
}
-<environment: 0x59314f0>
+<environment: 0x55b01c8>
> Map(R2 * R2)
[[1]]
@@ -672,7 +595,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x54f4108>
[[2]]
function (x)
@@ -687,7 +610,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x54f4108>
[[3]]
function (x)
@@ -702,7 +625,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x54f4108>
[[4]]
function (x)
@@ -717,7 +640,7 @@
}
f1(x) * f2(x)
}
-<environment: 0x57d5bb8>
+<environment: 0x54f4108>
>
>
@@ -755,7 +678,8 @@
>
>
>
-> cleanEx(); nameEx("EuclRandVarList-class")
+> cleanEx()
+> nameEx("EuclRandVarList-class")
> ### * EuclRandVarList-class
>
> flush(stderr()); flush(stdout())
@@ -834,7 +758,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x4eca220>
[[2]]
function (x)
@@ -845,7 +769,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x4eca220>
[[3]]
function (x)
@@ -856,7 +780,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x4eca220>
[[4]]
function (x)
@@ -867,7 +791,7 @@
}
exp(f1(x))
}
-<environment: 0x48a6100>
+<environment: 0x4eca220>
>
> ## "Arith" group
@@ -881,7 +805,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x45b30e8>
[[2]]
function (x)
@@ -892,7 +816,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x45b30e8>
[[3]]
function (x)
@@ -903,7 +827,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x45b30e8>
[[4]]
function (x)
@@ -914,7 +838,7 @@
}
1 + f2(x)
}
-<environment: 0x4363ff8>
+<environment: 0x45b30e8>
> Map((RL1 * 2)[[2]])
[[1]]
@@ -926,7 +850,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x47dd4d8>
[[2]]
function (x)
@@ -937,7 +861,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x47dd4d8>
[[3]]
function (x)
@@ -948,7 +872,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x47dd4d8>
[[4]]
function (x)
@@ -959,7 +883,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x47dd4d8>
[[5]]
function (x)
@@ -970,7 +894,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x47dd4d8>
[[6]]
function (x)
@@ -981,7 +905,7 @@
}
f1(x) * 2
}
-<environment: 0x5bbaa18>
+<environment: 0x47dd4d8>
> Map((RL1 / RL1)[[3]])
[[1]]
@@ -997,7 +921,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x2281cf8>
[[2]]
function (x)
@@ -1012,7 +936,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x2281cf8>
[[3]]
function (x)
@@ -1027,7 +951,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x2281cf8>
[[4]]
function (x)
@@ -1042,12 +966,13 @@
}
f1(x)/f2(x)
}
-<environment: 0x711acc8>
+<environment: 0x2281cf8>
>
>
>
-> cleanEx(); nameEx("EuclRandVarList")
+> cleanEx()
+> nameEx("EuclRandVarList")
> ### * EuclRandVarList
>
> flush(stderr()); flush(stdout())
@@ -1107,7 +1032,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x659f0a0>
[[2]]
function (x)
@@ -1118,7 +1043,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x659f0a0>
[[3]]
function (x)
@@ -1129,7 +1054,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x659f0a0>
[[4]]
function (x)
@@ -1140,7 +1065,7 @@
}
exp(f1(x))
}
-<environment: 0x6e2a820>
+<environment: 0x659f0a0>
>
> ## "Arith" group
@@ -1154,7 +1079,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x6e49ac0>
[[2]]
function (x)
@@ -1165,7 +1090,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x6e49ac0>
[[3]]
function (x)
@@ -1176,7 +1101,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x6e49ac0>
[[4]]
function (x)
@@ -1187,7 +1112,7 @@
}
1 + f2(x)
}
-<environment: 0x68ff6a8>
+<environment: 0x6e49ac0>
> Map((RL1 * 2)[[2]])
[[1]]
@@ -1199,7 +1124,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x6ff4cf0>
[[2]]
function (x)
@@ -1210,7 +1135,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x6ff4cf0>
[[3]]
function (x)
@@ -1221,7 +1146,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x6ff4cf0>
[[4]]
function (x)
@@ -1232,7 +1157,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x6ff4cf0>
[[5]]
function (x)
@@ -1243,7 +1168,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x6ff4cf0>
[[6]]
function (x)
@@ -1254,7 +1179,7 @@
}
f1(x) * 2
}
-<environment: 0x6542588>
+<environment: 0x6ff4cf0>
> Map((RL1 / RL1)[[3]])
[[1]]
@@ -1270,7 +1195,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x727c008>
[[2]]
function (x)
@@ -1285,7 +1210,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x727c008>
[[3]]
function (x)
@@ -1300,7 +1225,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x727c008>
[[4]]
function (x)
@@ -1315,7 +1240,7 @@
}
f1(x)/f2(x)
}
-<environment: 0x6213da0>
+<environment: 0x727c008>
>
> ## The function is currently defined as
@@ -1329,7 +1254,8 @@
>
>
>
-> cleanEx(); nameEx("EuclRandVariable-class")
+> cleanEx()
+> nameEx("EuclRandVariable-class")
> ### * EuclRandVariable-class
>
> flush(stderr()); flush(stdout())
@@ -1402,7 +1328,7 @@
}
> Range(R1)
-An object of class “Reals”
+An object of class "Reals"
Slot "dimension":
[1] 1
@@ -1459,19 +1385,20 @@
x^4
}
+> set.seed(123)
> evalRandVar(R1, rnorm(1))
- [,1]
-[1,] -0.6264538
-[2,] 0.3924444
-[3,] -0.2458483
-[4,] 0.1540126
+ [,1]
+[1,] -0.56047565
+[2,] 0.31413295
+[3,] -0.17606387
+[4,] 0.09867951
> x <- as.matrix(rnorm(10))
> res.R1 <- evalRandVar(R1, x)
> res.R1[2,,] # results for Map(R1)[[2]](x)
- [1] 0.03372487 0.69827518 2.54492084 0.10857537 0.67316837 0.23758708
- [7] 0.54512337 0.33152416 0.09326207 2.28548230
+ [1] 0.052981677 2.429571609 0.004971433 0.016715318 2.941447909 0.212443749
+ [7] 1.600379927 0.471766840 0.198614592 1.498376247
> res.R1[2,1,] # results for Map(R1)[[2]](x[1,])
-[1] 0.03372487
+[1] 0.05298168
>
> R2 <- EuclRandVariable(L2, Domain = Reals(), dimension = 1)
> dimension(R2)
@@ -1484,21 +1411,21 @@
> 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.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
> 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
- [7] 0.6730498 0.5444903 -0.3006636 0.9982591
+ [1] -0.22815034 0.99992694 0.07044998 0.12892786 0.98961131 0.44476889
+ [7] -0.95362595 -0.63410681 -0.43105529 0.94049422
>
> Map(log(abs(R2))) # "Math" group generic
[[1]]
@@ -1514,7 +1441,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x66429f8>
[[2]]
function (x)
@@ -1529,7 +1456,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x66429f8>
[[3]]
function (x)
@@ -1544,7 +1471,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x66429f8>
[[4]]
function (x)
@@ -1559,7 +1486,7 @@
}
log(f1(x))
}
-<environment: 0x5b07ff8>
+<environment: 0x66429f8>
>
> # "Arith" group generic
@@ -1573,7 +1500,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x6617190>
[[2]]
function (x)
@@ -1584,7 +1511,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x6617190>
[[3]]
function (x)
@@ -1595,7 +1522,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x6617190>
[[4]]
function (x)
@@ -1606,7 +1533,7 @@
}
3 + f2(x)
}
-<environment: 0x5adaf00>
+<environment: 0x6617190>
> Map(c(1,3,5) * R1)
Warning in c(1, 3, 5) * R1 :
@@ -1620,7 +1547,7 @@
}
1 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x5ba7968>
[[2]]
function (x)
@@ -1631,7 +1558,7 @@
}
3 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x5ba7968>
[[3]]
function (x)
@@ -1642,7 +1569,7 @@
}
5 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x5ba7968>
[[4]]
function (x)
@@ -1653,7 +1580,7 @@
}
1 * f2(x)
}
-<environment: 0x5a782e0>
+<environment: 0x5ba7968>
> try(1:5 * R1) # error
Error in 1:5 * R1 :
@@ -1668,7 +1595,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x5b19248>
[[2]]
function (x)
@@ -1679,7 +1606,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x5b19248>
[[3]]
function (x)
@@ -1690,7 +1617,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x5b19248>
[[4]]
function (x)
@@ -1701,7 +1628,7 @@
}
1:2 * f2(x)
}
-<environment: 0x58eea48>
+<environment: 0x5b19248>
> Map(R2 - 5)
[[1]]
@@ -1713,7 +1640,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x57b7dd0>
[[2]]
function (x)
@@ -1724,7 +1651,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x57b7dd0>
[[3]]
function (x)
@@ -1735,7 +1662,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x57b7dd0>
[[4]]
function (x)
@@ -1746,7 +1673,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5835b18>
+<environment: 0x57b7dd0>
> Map(R1 ^ R1)
[[1]]
@@ -1762,7 +1689,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x5730d80>
[[2]]
function (x)
@@ -1777,7 +1704,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x5730d80>
[[3]]
function (x)
@@ -1792,7 +1719,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x5730d80>
[[4]]
function (x)
@@ -1807,13 +1734,14 @@
}
f1(x)^f2(x)
}
-<environment: 0x57a3ff8>
+<environment: 0x5730d80>
>
>
>
>
-> cleanEx(); nameEx("EuclRandVariable")
+> cleanEx()
+> nameEx("EuclRandVariable")
> ### * EuclRandVariable
>
> flush(stderr()); flush(stdout())
@@ -1856,7 +1784,7 @@
}
> Range(R1)
-An object of class “EuclideanSpace”
+An object of class "EuclideanSpace"
Slot "dimension":
[1] 1
@@ -1914,19 +1842,20 @@
x^4
}
+> set.seed(123)
> evalRandVar(R1, rnorm(1))
- [,1]
-[1,] -0.6264538
-[2,] 0.3924444
-[3,] -0.2458483
-[4,] 0.1540126
+ [,1]
+[1,] -0.56047565
+[2,] 0.31413295
+[3,] -0.17606387
+[4,] 0.09867951
> x <- as.matrix(rnorm(10))
> res.R1 <- evalRandVar(R1, x)
> res.R1[2,,] # results for Map(R1)[[2]](x)
- [1] 0.03372487 0.69827518 2.54492084 0.10857537 0.67316837 0.23758708
- [7] 0.54512337 0.33152416 0.09326207 2.28548230
+ [1] 0.052981677 2.429571609 0.004971433 0.016715318 2.941447909 0.212443749
+ [7] 1.600379927 0.471766840 0.198614592 1.498376247
> res.R1[2,1,] # results for Map(R1)[[2]](x[1,])
-[1] 0.03372487
+[1] 0.05298168
>
> R2 <- EuclRandVariable(L2, Domain = Reals(), dimension = 1)
> DL1 <- imageDistr(R2, Norm())
@@ -1935,21 +1864,21 @@
> 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.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
> 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
- [7] 0.6730498 0.5444903 -0.3006636 0.9982591
+ [1] -0.22815034 0.99992694 0.07044998 0.12892786 0.98961131 0.44476889
+ [7] -0.95362595 -0.63410681 -0.43105529 0.94049422
>
> Map(log(abs(R2))) # "Math" group generic
[[1]]
@@ -1965,7 +1894,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x66bb020>
[[2]]
function (x)
@@ -1980,7 +1909,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x66bb020>
[[3]]
function (x)
@@ -1995,7 +1924,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x66bb020>
[[4]]
function (x)
@@ -2010,7 +1939,7 @@
}
log(f1(x))
}
-<environment: 0x6192378>
+<environment: 0x66bb020>
>
> # "Arith" group generic
@@ -2024,7 +1953,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x6690818>
[[2]]
function (x)
@@ -2035,7 +1964,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x6690818>
[[3]]
function (x)
@@ -2046,7 +1975,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x6690818>
[[4]]
function (x)
@@ -2057,7 +1986,7 @@
}
3 + f2(x)
}
-<environment: 0x6174cb0>
+<environment: 0x6690818>
> Map(c(1,3,5) * R1)
Warning in c(1, 3, 5) * R1 :
@@ -2071,7 +2000,7 @@
}
1 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x665cee0>
[[2]]
function (x)
@@ -2082,7 +2011,7 @@
}
3 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x665cee0>
[[3]]
function (x)
@@ -2093,7 +2022,7 @@
}
5 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x665cee0>
[[4]]
function (x)
@@ -2104,7 +2033,7 @@
}
1 * f2(x)
}
-<environment: 0x614be68>
+<environment: 0x665cee0>
> try(1:5 * R1) # error
Error in 1:5 * R1 :
@@ -2119,7 +2048,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x660aa78>
[[2]]
function (x)
@@ -2130,7 +2059,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x660aa78>
[[3]]
function (x)
@@ -2141,7 +2070,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x660aa78>
[[4]]
function (x)
@@ -2152,7 +2081,7 @@
}
1:2 * f2(x)
}
-<environment: 0x60fb660>
+<environment: 0x660aa78>
> Map(R2 - 5)
[[1]]
@@ -2164,7 +2093,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x5bb7248>
[[2]]
function (x)
@@ -2175,7 +2104,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x5bb7248>
[[3]]
function (x)
@@ -2186,7 +2115,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x5bb7248>
[[4]]
function (x)
@@ -2197,7 +2126,7 @@
}
f1(x) - c(5, 5)
}
-<environment: 0x5f72990>
+<environment: 0x5bb7248>
> Map(R1 ^ R1)
[[1]]
@@ -2213,7 +2142,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x5b84d28>
[[2]]
function (x)
@@ -2228,7 +2157,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x5b84d28>
[[3]]
function (x)
@@ -2243,7 +2172,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x5b84d28>
[[4]]
function (x)
@@ -2258,7 +2187,7 @@
}
f1(x)^f2(x)
}
-<environment: 0x5f328b8>
+<environment: 0x5b84d28>
>
>
@@ -2284,7 +2213,8 @@
>
>
>
-> cleanEx(); nameEx("RandVariable-class")
+> cleanEx()
+> nameEx("RandVariable-class")
> ### * RandVariable-class
>
> flush(stderr()); flush(stdout())
@@ -2312,6 +2242,7 @@
function (x)
{
}
+<bytecode: 0x47160d0>
<environment: namespace:RandVar>
> Domain(R1)
@@ -2358,7 +2289,8 @@
>
>
>
-> cleanEx(); nameEx("RandVariable")
+> cleanEx()
+> nameEx("RandVariable")
> ### * RandVariable
>
> flush(stderr()); flush(stdout())
@@ -2380,7 +2312,7 @@
function (x)
{
}
-<environment: 0x5adfa00>
+<environment: 0x5583290>
> Domain(R1)
NULL
@@ -2436,7 +2368,8 @@
>
>
>
-> cleanEx(); nameEx("RealRandVariable-class")
+> cleanEx()
+> nameEx("RealRandVariable-class")
> ### * RealRandVariable-class
>
> flush(stderr()); flush(stdout())
@@ -2456,7 +2389,8 @@
>
>
>
-> cleanEx(); nameEx("RealRandVariable")
+> cleanEx()
+> nameEx("RealRandVariable")
> ### * RealRandVariable
>
> flush(stderr()); flush(stdout())
@@ -2500,7 +2434,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.784 0.044 5.852 0 0
> grDevices::dev.off()
null device
1
Modified: branches/robast-0.9/pkg/RandVar/tests/tests.R
===================================================================
--- branches/robast-0.9/pkg/RandVar/tests/tests.R 2012-06-05 03:57:02 UTC (rev 483)
+++ branches/robast-0.9/pkg/RandVar/tests/tests.R 2012-06-05 04:21:01 UTC (rev 484)
@@ -47,6 +47,7 @@
Map(R3[3])
Map(R3[c(1,2,4)])
Map(R3[2:4])
+set.seed(123)
evalRandVar(R3, rnorm(1))
x <- as.matrix(rnorm(10))
res.R3 <- evalRandVar(R3, x)
Modified: branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save
===================================================================
--- branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save 2012-06-05 03:57:02 UTC (rev 483)
+++ branches/robast-0.9/pkg/RandVar/tests/tests.Rout.save 2012-06-05 04:21:01 UTC (rev 484)
@@ -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.15.0 Patched (2012-05-26 r59450) -- "Easter Beagle"
+Copyright (C) 2012 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.8)
: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.6)
: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.4)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -75,28 +74,20 @@
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 :
-
- cm
-
-:distrEx> Extensions of package distr (version 2.2)
+:distrEx> Extensions of package distr (version 2.4)
:distrEx>
:distrEx> Note: Packages "e1071", "moments", "fBasics" should be
-:distrEx> attached /before/ package "distrEx". See distrExMASK().
+:distrEx> attached /before/ package "distrEx". See
+:distrEx> distrExMASK().Note: Extreme value distribution
+:distrEx> functionality has been moved to
:distrEx>
+:distrEx> package "RobExtremes". See distrExMOVED().
+:distrEx>
:distrEx> For more information see ?"distrEx", NEWS("distrEx"), as
:distrEx> well as
:distrEx> http://distr.r-forge.r-project.org/
@@ -107,15 +98,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.9)
:RandVar>
:RandVar> For more information see ?"RandVar", NEWS("RandVar"), as
:RandVar> well as
@@ -145,7 +132,7 @@
function (x)
{
}
-<environment: 0x4449680>
+<environment: 0x6213468>
> Domain(R1)
NULL
@@ -286,6 +273,7 @@
x^4
}
+> set.seed(123)
> evalRandVar(R3, rnorm(1))
[,1]
[1,] -0.56047565
@@ -318,16 +306,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 +355,15 @@
>
> res2.R5 <- evalRandVar(R5, X)
> res2.R5[,,1,2]
-[1] 1.4474990 0.3698373 0.3614637 0.0000000
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/robast -r 484
More information about the Robast-commits
mailing list