[Distr-commits] r1450 - in pkg/distr: . inst man tests/Examples

Thu Aug 29 14:48:54 CEST 2024

Author: ruckdeschel
Date: 2024-08-29 14:48:54 +0200 (Thu, 29 Aug 2024)
New Revision: 1450

Modified:
   pkg/distr/DESCRIPTION
   pkg/distr/inst/NEWS
   pkg/distr/man/0distr-package.Rd
   pkg/distr/man/distrARITH.Rd
   pkg/distr/man/distrMASK.Rd
   pkg/distr/tests/Examples/distr-Ex.Rout.save
Log:
[distr] /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/distr/DESCRIPTION
===================================================================

--- pkg/distr/DESCRIPTION	2024-08-29 08:38:14 UTC (rev 1449)
+++ pkg/distr/DESCRIPTION	2024-08-29 12:48:54 UTC (rev 1450)
@@ -1,6 +1,6 @@
 Package: distr
-Version: 2.9.4
-Date: 2024-08-26
+Version: 2.9.5
+Date: 2024-08-29
 Title: Object Oriented Implementation of Distributions
 Description: S4-classes and methods for distributions.
 Authors at R: c(person("Florian", "Camphausen", role="ctb", comment="contributed as student in
@@ -21,4 +21,4 @@
 URL: http://distr.r-forge.r-project.org/
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-VCS/SVNRevision: 1447
+VCS/SVNRevision: 1448

Modified: pkg/distr/inst/NEWS
===================================================================
--- pkg/distr/inst/NEWS	2024-08-29 08:38:14 UTC (rev 1449)
+++ pkg/distr/inst/NEWS	2024-08-29 12:48:54 UTC (rev 1450)
@@ -8,6 +8,15 @@
  information)
  
 ##############
+v 2.9.5
+##############
+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.9.4
 ##############
 

Modified: pkg/distr/man/0distr-package.Rd
===================================================================
--- pkg/distr/man/0distr-package.Rd	2024-08-29 08:38:14 UTC (rev 1449)
+++ pkg/distr/man/0distr-package.Rd	2024-08-29 12:48:54 UTC (rev 1450)
@@ -44,8 +44,8 @@
 \details{
 \tabular{ll}{
 Package: \tab distr \cr
-Version: \tab 2.9.4 \cr
-Date: \tab 2024-08-26 \cr
+Version: \tab 2.9.5 \cr
+Date: \tab 2024-08-29 \cr
 Depends: \tab R(>= 3.4), methods, graphics, startupmsg, sfsmisc \cr
 Suggests: \tab distrEx, svUnit (>= 0.7-11), knitr, distrMod, ROptEst \cr
 Imports: \tab stats, grDevices, utils, MASS \cr
@@ -52,7 +52,7 @@
 LazyLoad: \tab yes \cr
 License: \tab LGPL-3 \cr
 URL: \tab https://distr.r-forge.r-project.org/\cr
-VCS/SVNRevision: \tab 1447 \cr
+VCS/SVNRevision: \tab 1448 \cr
 }}
 \section{Classes}{
 Distribution classes have a slot \code{param} the class of which

Modified: pkg/distr/man/distrARITH.Rd
===================================================================
--- pkg/distr/man/distrARITH.Rd	2024-08-29 08:38:14 UTC (rev 1449)
+++ pkg/distr/man/distrARITH.Rd	2024-08-29 12:48:54 UTC (rev 1450)
@@ -18,7 +18,9 @@
 
 \author{Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
 \examples{
+## IGNORE_RDIFF_BEGIN
 distrARITH()
+## IGNORE_RDIFF_END
 }
 \keyword{math}
 \keyword{distribution}

Modified: pkg/distr/man/distrMASK.Rd
===================================================================
--- pkg/distr/man/distrMASK.Rd	2024-08-29 08:38:14 UTC (rev 1449)
+++ pkg/distr/man/distrMASK.Rd	2024-08-29 12:48:54 UTC (rev 1450)
@@ -18,7 +18,9 @@
 
 \author{Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
 \examples{
+## IGNORE_RDIFF_BEGIN
 distrMASK()
+## IGNORE_RDIFF_END
 }
 \keyword{programming}
 \keyword{distribution}

Modified: pkg/distr/tests/Examples/distr-Ex.Rout.save
===================================================================
--- pkg/distr/tests/Examples/distr-Ex.Rout.save	2024-08-29 08:38:14 UTC (rev 1449)
+++ pkg/distr/tests/Examples/distr-Ex.Rout.save	2024-08-29 12:48:54 UTC (rev 1450)
@@ -23,7 +23,7 @@
 > options(pager = "console")
 > library('distr')
 Loading required package: startupmsg
-:startupmsg>  Utilities for Start-Up Messages (version 0.9.6.1)
+:startupmsg>  Utilities for Start-Up Messages (version 0.9.7)
 :startupmsg> 
 :startupmsg>  For more information see ?"startupmsg",
 :startupmsg>  NEWS("startupmsg")
@@ -30,7 +30,7 @@
 
 Loading required package: sfsmisc
 :distr>  Object Oriented Implementation of Distributions (version
-:distr>  2.9.4)
+:distr>  2.9.5)
 :distr> 
 :distr>  Attention: Arithmetics on distribution objects are
 :distr>  understood as operations on corresponding random variables
@@ -2016,8 +2016,8 @@
                           d0 <-    log(df1(x))-log(stand)
                      else d0 <- df1(x) / stand
                      return (d0)}
-<bytecode: 0x0000021896e44350>
-<environment: 0x000002189c66ef20>
+<bytecode: 0x000002453f54a140>
+<environment: 0x0000024542e328b8>
 
 $pfun
 function (q, lower.tail = TRUE, log.p = FALSE) 
@@ -2032,7 +2032,7 @@
     else p0/nm
     return(p0)
 }
-<environment: 0x0000021897b47d50>
+<environment: 0x000002453ed26e80>
 
 $qfun
 function (p, lower.tail = TRUE, log.p = FALSE) 
@@ -2050,7 +2050,7 @@
     else q.l0(1 - p01)
     return(as.numeric(q0))
 }
-<environment: 0x0000021897ac0080>
+<environment: 0x000002453d54fda0>
 
 > ## IGNORE_RDIFF_END
 > rp2 <- function(n){rpois(n, lambda = 1)^2}
@@ -2091,8 +2091,8 @@
                           d0 <-    log(df1(x))-log(stand)
                      else d0 <- df1(x) / stand
                      return (d0)}
-<bytecode: 0x0000021896e44350>
-<environment: 0x0000021897919d98>
+<bytecode: 0x000002453f54a140>
+<environment: 0x00000245421bfb20>
 
 $pfun
 function (q, lower.tail = TRUE, log.p = FALSE) 
@@ -2107,7 +2107,7 @@
     else p0/nm
     return(p0)
 }
-<environment: 0x00000218975c1698>
+<environment: 0x000002453f8677b8>
 
 $qfun
 function (p, lower.tail = TRUE, log.p = FALSE) 
@@ -2125,7 +2125,7 @@
     else q.l0(1 - p01)
     return(as.numeric(q0))
 }
-<environment: 0x0000021897c8ed88>
+<environment: 0x000002454402d548>
 
 > ## IGNORE_RDIFF_END
 > rp2 <- function(n){rpois(n, lambda = 1)^2}
@@ -2795,6 +2795,7 @@
 > 
 > ### ** Examples
 > 
+> ## IGNORE_RDIFF_BEGIN
 > distrARITH()
 ######################################################################
 #  On arithmetics operating on distributions in package "distr"       
@@ -2870,6 +2871,7 @@
 stochastic estimates. 
 
 So don't be surprised if they will change from call to call.
+> ## IGNORE_RDIFF_END
 > 
 > 
 > 
@@ -2886,6 +2888,7 @@
 > 
 > ### ** Examples
 > 
+> ## IGNORE_RDIFF_BEGIN
 > distrMASK()
 ######################################################################
 #  On masking of and by other functions in package "distr"       
@@ -2923,6 +2926,7 @@
 *** non-intentional masking: ***
 
 ... nothing discovered so far ...
+> ## IGNORE_RDIFF_END
 > 
 > 
 > 
@@ -3810,13 +3814,13 @@
 > ## IGNORE_RDIFF_BEGIN
 > system.time(r(F)(10^6))
    user  system elapsed 
-   0.29    0.01    0.31 
+   0.37    0.00    0.39 
 > ## IGNORE_RDIFF_END
 > simplifyr(F, size = 10^6)
 > ## IGNORE_RDIFF_BEGIN
 > system.time(r(F)(10^6))
    user  system elapsed 
-   0.09    0.00    0.10 
+   0.11    0.00    0.11 
 > ## IGNORE_RDIFF_END
 > 
 > 
@@ -3853,7 +3857,7 @@
 > cleanEx()
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  23.08 1.97 25.3 NA NA 
+Time elapsed:  27.81 2.26 30.89 NA NA 
 > grDevices::dev.off()
 pdf 
  19 

