[Distr-commits] r1460 - in branches/distr-2.9/pkg/distrSim: inst man tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Aug 29 18:29:14 CEST 2024
Author: ruckdeschel
Date: 2024-08-29 18:29:14 +0200 (Thu, 29 Aug 2024)
New Revision: 1460
Modified:
branches/distr-2.9/pkg/distrSim/inst/NEWS
branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd
branches/distr-2.9/pkg/distrSim/man/distrSimMASK.Rd
branches/distr-2.9/pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save
Log:
[distrSim] ported changes from trunk to devel branch distr-2.9
Modified: branches/distr-2.9/pkg/distrSim/inst/NEWS
===================================================================
--- branches/distr-2.9/pkg/distrSim/inst/NEWS 2024-08-29 16:25:21 UTC (rev 1459)
+++ branches/distr-2.9/pkg/distrSim/inst/NEWS 2024-08-29 16:29:14 UTC (rev 1460)
@@ -18,6 +18,16 @@
as.personList(....)
##############
+v 2.8.3
+##############
+
+under the hood:
+with the help of K. Hornik identified spurious, platform dependent LF/CR issue
+and capsulated calls to infoShow() in Rd files by
+## IGNORE_RDIFF_BEGIN
+## IGNORE_RDIFF_END
+
+##############
v 2.8
##############
Modified: branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd 2024-08-29 16:25:21 UTC (rev 1459)
+++ branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd 2024-08-29 16:29:14 UTC (rev 1460)
@@ -14,7 +14,7 @@
\tabular{ll}{
Package: \tab distrSim \cr
Version: \tab 2.9.0 \cr
-Date: \tab 2019-03-13 \cr
+Date: \tab 2024-08-29 \cr
Depends: \tab R(>= 3.4), methods, graphics, setRNG(>= 2006.2-1),
distr(>= 2.8.0) \cr
Suggests: \tab distrEx(>= 2.8.0) \cr
@@ -22,7 +22,7 @@
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab https://r-forge.r-project.org/projects/distr/\cr
-VCS/SVNRevision: \tab 1324 \cr
+VCS/SVNRevision: \tab 1454 \cr
}
}
\section{Classes}{
Modified: branches/distr-2.9/pkg/distrSim/man/distrSimMASK.Rd
===================================================================
--- branches/distr-2.9/pkg/distrSim/man/distrSimMASK.Rd 2024-08-29 16:25:21 UTC (rev 1459)
+++ branches/distr-2.9/pkg/distrSim/man/distrSimMASK.Rd 2024-08-29 16:29:14 UTC (rev 1460)
@@ -18,7 +18,9 @@
\author{Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
\examples{
+## IGNORE_RDIFF_BEGIN
distrSimMASK()
+## IGNORE_RDIFF_END
}
\keyword{programming}
\keyword{distribution}
Modified: branches/distr-2.9/pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save
===================================================================
--- branches/distr-2.9/pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save 2024-08-29 16:25:21 UTC (rev 1459)
+++ branches/distr-2.9/pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save 2024-08-29 16:29:14 UTC (rev 1460)
@@ -1,7 +1,7 @@
-R version 3.5.1 RC (2018-06-24 r74935) -- "Feather Spray"
-Copyright (C) 2018 The R Foundation for Statistical Computing
-Platform: i386-w64-mingw32/i386 (32-bit)
+R Under development (unstable) (2024-08-17 r87027 ucrt) -- "Unsuffered Consequences"
+Copyright (C) 2024 The R Foundation for Statistical Computing
+Platform: x86_64-w64-mingw32/x64
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -21,23 +21,11 @@
> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
> options(pager = "console")
-> base::assign(".ExTimings", "distrSim-Ex.timings", pos = 'CheckExEnv')
-> base::cat("name\tuser\tsystem\telapsed\n", file=base::get(".ExTimings", pos = 'CheckExEnv'))
-> base::assign(".format_ptime",
-+ function(x) {
-+ if(!is.na(x[4L])) x[1L] <- x[1L] + x[4L]
-+ if(!is.na(x[5L])) x[2L] <- x[2L] + x[5L]
-+ options(OutDec = '.')
-+ format(x[1L:3L], digits = 7L)
-+ },
-+ pos = 'CheckExEnv')
->
-> ### * </HEADER>
> library('distrSim')
Loading required package: setRNG
Loading required package: distr
Loading required package: startupmsg
-:startupmsg> Utilities for Start-Up Messages (version 0.9.5)
+:startupmsg> Utilities for Start-Up Messages (version 0.9.7)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
@@ -44,7 +32,7 @@
Loading required package: sfsmisc
:distr> Object Oriented Implementation of Distributions (version
-:distr> 2.8.0)
+:distr> 2.9.4)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -70,7 +58,7 @@
df, qqplot, sd
:distrSim> Simulation Classes Based on Package 'distr' (version
-:distrSim> 2.7.0)
+:distrSim> 2.8.1)
:distrSim>
:distrSim> Some functions from package 'stats' are intentionally
:distrSim> masked ---see distrSimMASK().
@@ -103,7 +91,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Contsimulation-class
> ### Title: Class "Contsimulation"
> ### Aliases: Contsimulation-class Contsimulation
@@ -485,11 +472,11 @@
> load("csim") # loads it again...
> Data(cs) # ...without the data - use simulate to return it!
NULL
+> ## clean up
+> unlink("csim")
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("Contsimulation-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("Dataclass-class")
> ### * Dataclass-class
@@ -496,7 +483,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Dataclass-class
> ### Title: Class "Dataclass"
> ### Aliases: Dataclass-class initialize,Dataclass-method
@@ -511,7 +497,7 @@
number of runs: 1
dimension of the observations: 6
size of sample: 6
-object was generated by version: 2.7.0
+object was generated by version: 2.8.1
> #
> D <- Dataclass(Data = array(c(1,2,3,4,5,6),c(samplesize=2,obsdim=3,Runs=1)),
+ filename = "xyz.sav")
@@ -531,7 +517,7 @@
number of runs: 1
dimension of the observations: 3
size of sample: 2
-object was generated by version: 2.7.0
+object was generated by version: 2.8.1
> load("xyz.sav") # loads the original object "D"
> Data(D) # the original data: matrix(c(1,2,3,4,5,6),2)
, , 1
@@ -542,11 +528,12 @@
> #if you have distrTEst available:
> #evaluate(object = D, estimator = mean) # returns the mean of each variable
+> ## clean up
+> unlink("xyz.sav")
+> unlink("xyz.sav.comment")
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("Dataclass-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("Simulation-class")
> ### * Simulation-class
@@ -553,7 +540,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Simulation-class
> ### Title: Class "Simulation"
> ### Aliases: Simulation-class Simulation initialize,Simulation-method
@@ -785,11 +771,10 @@
> load("xyz") # loads it again...
> Data(S) # ...without the data - use simulate to return it!
NULL
+> unlink("xyz")
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("Simulation-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("cload")
> ### * cload
@@ -796,7 +781,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: cload
> ### Title: cload
> ### Aliases: cload
@@ -817,8 +801,6 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("cload", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("distrSimMASK")
> ### * distrSimMASK
@@ -825,7 +807,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distrSimMASK
> ### Title: Masking of/by other functions in package "distrSim"
> ### Aliases: distrSimMASK MASKING
@@ -833,6 +814,7 @@
>
> ### ** Examples
>
+> ## IGNORE_RDIFF_BEGIN
> distrSimMASK()
######################################################################
# On masking of and by other functions in package "distrSim"
@@ -846,11 +828,10 @@
we intentionally mask the base function "rbind"
however "rbind" may still be used in exactly the same way
as before masking.
+> ## IGNORE_RDIFF_END
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("distrSimMASK", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("distrSimoptions")
> ### * distrSimoptions
@@ -857,7 +838,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distrSimoptions
> ### Title: functions to change the global variables of the package
> ### 'distrSim'
@@ -904,8 +884,6 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("distrSimoptions", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("subsetting-methods")
> ### * subsetting-methods
@@ -912,7 +890,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Subsetting-methods
> ### Title: Subsetting/Indexing methods for SeqDataFrames objects in Package
> ### 'distrSim'
@@ -932,14 +909,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("subsetting-methods", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> ### * <FOOTER>
> ###
> cleanEx()
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 1.99 0.27 2.45 NA NA
+Time elapsed: 4.12 0.17 4.54 NA NA
> grDevices::dev.off()
null device
1
More information about the Distr-commits
mailing list