[Distr-commits] r1453 - in pkg/distrMod: . inst man tests/Examples

Thu Aug 29 16:41:21 CEST 2024

Author: ruckdeschel
Date: 2024-08-29 16:41:21 +0200 (Thu, 29 Aug 2024)
New Revision: 1453

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

--- pkg/distrMod/DESCRIPTION	2024-08-29 14:27:04 UTC (rev 1452)
+++ pkg/distrMod/DESCRIPTION	2024-08-29 14:41:21 UTC (rev 1453)
@@ -1,6 +1,6 @@
 Package: distrMod
-Version: 2.9.1
-Date: 2024-01-30
+Version: 2.9.2
+Date: 2024-08-29
 Title: Object Oriented Implementation of Probability Models
 Description: Implements S4 classes for probability models based on packages 'distr' and
             'distrEx'.
@@ -17,4 +17,4 @@
 URL: http://distr.r-forge.r-project.org/
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-VCS/SVNRevision: 1429
+VCS/SVNRevision: 1448

Modified: pkg/distrMod/inst/NEWS
===================================================================
--- pkg/distrMod/inst/NEWS	2024-08-29 14:27:04 UTC (rev 1452)
+++ pkg/distrMod/inst/NEWS	2024-08-29 14:41:21 UTC (rev 1453)
@@ -8,6 +8,16 @@
  information)
 
 ##############
+v 2.9.2
+##############
+
+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.1
 ##############
 bug fixes

Modified: pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- pkg/distrMod/man/0distrMod-package.Rd	2024-08-29 14:27:04 UTC (rev 1452)
+++ pkg/distrMod/man/0distrMod-package.Rd	2024-08-29 14:41:21 UTC (rev 1453)
@@ -13,8 +13,8 @@
 \details{
 \tabular{ll}{
 Package: \tab distrMod \cr
-Version: \tab 2.9.1 \cr
-Date: \tab 2024-01-30 \cr
+Version: \tab 2.9.2 \cr
+Date: \tab 2024-08-29 \cr
 Depends: \tab R(>= 3.4), distr(>= 2.8.0), distrEx(>= 2.8.0), RandVar(>= 1.2.0), MASS, stats4,methods \cr
 Imports: \tab startupmsg, sfsmisc, graphics, stats, grDevices \cr
 Suggests: \tab ismev, evd, \cr
@@ -22,7 +22,7 @@
 ByteCompile: \tab yes \cr
 License: \tab LGPL-3 \cr
 URL: \tab https://distr.r-forge.r-project.org/\cr
-VCS/SVNRevision: \tab 1429 \cr
+VCS/SVNRevision: \tab 1448 \cr
 }}
 \section{Classes}{
 \preformatted{

Modified: pkg/distrMod/man/distrModMASK.Rd
===================================================================
--- pkg/distrMod/man/distrModMASK.Rd	2024-08-29 14:27:04 UTC (rev 1452)
+++ pkg/distrMod/man/distrModMASK.Rd	2024-08-29 14:41:21 UTC (rev 1453)
@@ -18,7 +18,9 @@
 
 \author{Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
 \examples{
+## IGNORE_RDIFF_BEGIN
 distrModMASK()
+## IGNORE_RDIFF_END
 }
 \keyword{programming}
 \keyword{distribution}

Modified: pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2024-08-29 14:27:04 UTC (rev 1452)
+++ pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2024-08-29 14:41:21 UTC (rev 1453)
@@ -1,5 +1,5 @@
 
-R Under development (unstable) (2024-01-25 r85826 ucrt) -- "Unsuffered Consequences"
+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
 
@@ -24,7 +24,7 @@
 > library('distrMod')
 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")
@@ -31,7 +31,7 @@
 
 Loading required package: sfsmisc
 :distr>  Object Oriented Implementation of Distributions (version
-:distr>  2.9.3)
+:distr>  2.9.4)
 :distr> 
 :distr>  Attention: Arithmetics on distribution objects are
 :distr>  understood as operations on corresponding random variables
@@ -92,7 +92,7 @@
 Loading required package: MASS
 Loading required package: stats4
 :distrMod>  Object Oriented Implementation of Probability Models
-:distrMod>  (version 2.9.1)
+:distrMod>  (version 2.9.2)
 :distrMod> 
 :distrMod>  Some functions from pkg's 'base' and 'stats' are
 :distrMod>  intentionally masked ---see distrModMASK().
@@ -422,7 +422,7 @@
         dimnames = list(nms, nms0))
     list(fval = fval0, mat = mat0)
 }
-<bytecode: 0x000001791e030a58>
+<bytecode: 0x000001e789a2e7b8>
 Trafo / derivative matrix at which estimate was produced:
        scale shape
 shape  0.000     1
@@ -623,7 +623,7 @@
         1)/c(scale = 1)
     return(y)
 }
-<environment: 0x0000017925f4e840>
+<environment: 0x000001e780973ed8>
 
 > ## IGNORE_RDIFF_BEGIN
 > checkL2deriv(E1)
@@ -797,8 +797,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0000017923225eb0>
-<environment: 0x0000017923216f98>
+<bytecode: 0x000001e70e6ade98>
+<environment: 0x000001e70e6a9c68>
 
 > 
 > ## The function is currently defined as
@@ -1081,7 +1081,7 @@
         1)/c(meanlog = 1)
     return(y)
 }
-<environment: 0x000001792c72bbd8>
+<environment: 0x000001e70d321bd8>
 
 > checkL2deriv(L1)
 precision of centering:	 -0.003003394 
@@ -2123,7 +2123,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x0000017924f3be60>
+<bytecode: 0x000001e7898a0668>
 <environment: namespace:distrMod>
 > name(EuclNorm)
 [1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x0000017924f3be60>
+<bytecode: 0x000001e7898a0668>
 <environment: namespace:distrMod>
 
 > ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x000001792507a5a0>
-<environment: 0x0000017927c247b8>
+<bytecode: 0x000001e789a95858>
+<environment: 0x000001e70ac304e0>
 
 > 
 > ## The function is currently defined as
@@ -2654,8 +2654,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x0000017923037b68>
-<environment: 0x00000179279c0538>
+<bytecode: 0x000001e7093be128>
+<environment: 0x000001e70af3e898>
 
 > 
 > ## The function is currently defined as
@@ -3187,6 +3187,7 @@
 > 
 > ### ** Examples
 > 
+> ## IGNORE_RDIFF_BEGIN
 > distrModMASK()
 ######################################################################
 #  On masking of and by other functions in package "distrMod"       
@@ -3202,6 +3203,7 @@
 masking:
 
 +confint()    (package "stats")
+> ## IGNORE_RDIFF_END
 > 
 > 
 > 
@@ -3678,7 +3680,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001791f39b1e8>
+<bytecode: 0x000001e70d318b00>
 > print(param(NS), show.details = "minimal")
 An object of class "ParamWithScaleFamParameter"
 name:	location and scale
@@ -3727,7 +3729,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001791f39b1e8>
+<bytecode: 0x000001e70d318b00>
 Trafo / derivative matrix:
             mean         sd
 mu/sig 0.3668695 -0.3024814
@@ -3770,7 +3772,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001791f39b1e8>
+<bytecode: 0x000001e70d318b00>
 Trafo / derivative matrix:
          mean      sd
 mu/sig 0.3669 -0.3025
@@ -4136,7 +4138,7 @@
 > cleanEx()
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  36.73 1.42 39.43 NA NA 
+Time elapsed:  33.22 1.22 35.36 NA NA 
 > grDevices::dev.off()
 null device 
           1 

