[Distr-commits] r1452 - in pkg/distrSim: . inst man tests/Examples

Thu Aug 29 16:27:05 CEST 2024

Author: ruckdeschel
Date: 2024-08-29 16:27:04 +0200 (Thu, 29 Aug 2024)
New Revision: 1452

Modified:
   pkg/distrSim/DESCRIPTION
   pkg/distrSim/inst/NEWS
   pkg/distrSim/man/0distrSim-package.Rd
   pkg/distrSim/man/distrSimMASK.Rd
   pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save
Log:
[distrSim] /trunk: fixes a platform-dependent LF/CR issue tracked down by K. Hornik in
pkg distr which arises when checking against reference output while testing

Modified: pkg/distrSim/DESCRIPTION
===================================================================

--- pkg/distrSim/DESCRIPTION	2024-08-29 12:52:05 UTC (rev 1451)
+++ pkg/distrSim/DESCRIPTION	2024-08-29 14:27:04 UTC (rev 1452)
@@ -1,6 +1,6 @@
 Package: distrSim
-Version: 2.8.2
-Date: 2024-01-30
+Version: 2.8.1
+Date: 2024-08-29
 Title: Simulation Classes Based on Package 'distr'
 Description: S4-classes for setting up a coherent framework for simulation within the distr
             family of packages.
@@ -18,4 +18,4 @@
 URL: http://distr.r-forge.r-project.org/
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-VCS/SVNRevision: 1427
+VCS/SVNRevision: 1448

Modified: pkg/distrSim/inst/NEWS
===================================================================
--- pkg/distrSim/inst/NEWS	2024-08-29 12:52:05 UTC (rev 1451)
+++ pkg/distrSim/inst/NEWS	2024-08-29 14:27:04 UTC (rev 1452)
@@ -8,6 +8,16 @@
  information)
 
 ##############
+v 2.8.1
+##############
+
+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: pkg/distrSim/man/0distrSim-package.Rd
===================================================================
--- pkg/distrSim/man/0distrSim-package.Rd	2024-08-29 12:52:05 UTC (rev 1451)
+++ pkg/distrSim/man/0distrSim-package.Rd	2024-08-29 14:27:04 UTC (rev 1452)
@@ -13,8 +13,8 @@
 \details{
 \tabular{ll}{
 Package: \tab distrSim \cr
-Version: \tab 2.8.2 \cr
-Date: \tab 2024-01-30 \cr
+Version: \tab 2.8.1 \cr
+Date: \tab 2024-08-29 \cr
 Depends: \tab R(>= 3.4), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.5.2) \cr
 Suggests: \tab distrEx(>= 2.2) \cr
 Imports: \tab startupmsg, stats, grDevices \cr
@@ -21,7 +21,7 @@
 LazyLoad: \tab yes \cr
 License: \tab LGPL-3 \cr
 URL: \tab https://distr.r-forge.r-project.org/\cr
-VCS/SVNRevision: \tab 1427 \cr
+VCS/SVNRevision: \tab 1448 \cr
 }
 }
 \section{Classes}{

Modified: pkg/distrSim/man/distrSimMASK.Rd
===================================================================
--- pkg/distrSim/man/distrSimMASK.Rd	2024-08-29 12:52:05 UTC (rev 1451)
+++ pkg/distrSim/man/distrSimMASK.Rd	2024-08-29 14:27:04 UTC (rev 1452)
@@ -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: pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save
===================================================================
--- pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save	2024-08-29 12:52:05 UTC (rev 1451)
+++ pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save	2024-08-29 14:27:04 UTC (rev 1452)
@@ -1,7 +1,7 @@
 
-R Under development (unstable) (2022-09-25 r82916 ucrt) -- "Unsuffered Consequences"
-Copyright (C) 2022 The R Foundation for Statistical Computing
-Platform: x86_64-w64-mingw32/x64 (64-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.6)
+: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.9.0)
+:distr>  2.9.4)
 :distr> 
 :distr>  Attention: Arithmetics on distribution objects are
 :distr>  understood as operations on corresponding random variables
@@ -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
@@ -490,8 +477,6 @@
 > 
 > 
 > 
-> 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
@@ -498,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
@@ -550,8 +534,6 @@
 > 
 > 
 > 
-> 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
@@ -558,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
@@ -794,8 +775,6 @@
 > 
 > 
 > 
-> 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
@@ -802,7 +781,6 @@
 > 
 > flush(stderr()); flush(stdout())
 > 
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
 > ### Name: cload
 > ### Title: cload
 > ### Aliases: cload
@@ -823,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
@@ -831,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
@@ -839,6 +814,7 @@
 > 
 > ### ** Examples
 > 
+> ## IGNORE_RDIFF_BEGIN
 > distrSimMASK()
 ######################################################################
 #  On masking of and by other functions in package "distrSim"       
@@ -852,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
@@ -863,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'
@@ -910,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
@@ -918,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'
@@ -938,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:  4.54 0.15 4.73 NA NA 
+Time elapsed:  4.12 0.17 4.54 NA NA 
 > grDevices::dev.off()
 null device 
           1 

