[Distr-commits] r1470 - branches/distr-2.9/pkg/distrMod branches/distr-2.9/pkg/distrMod/man branches/distr-2.9/pkg/distrMod/tests/Examples pkg/distrMod pkg/distrMod/man pkg/distrMod/tests/Examples pkg/utils www

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Mon Sep 2 18:24:37 CEST 2024


Author: ruckdeschel
Date: 2024-09-02 18:24:37 +0200 (Mon, 02 Sep 2024)
New Revision: 1470

Modified:
   branches/distr-2.9/pkg/distrMod/DESCRIPTION
   branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd
   branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
   pkg/distrMod/DESCRIPTION
   pkg/distrMod/man/0distrMod-package.Rd
   pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
   pkg/utils/DESCRIPTIONutilsExamples.R
   www/distrMod.html
Log:
[distrMod] trunk and branch distr-2.9: new version 2.9.4, fixing an issue raised in K. Hornik's mail "Re: [CRAN-pretest-waiting] CRAN Submission RandVar 1.2.4" Mon, 2 Sep 2024 14:47:59 +0200 as to version discrepancies in distrEx, RandVar, and distrMod as to comparisons with reference output


Modified: branches/distr-2.9/pkg/distrMod/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrMod/DESCRIPTION	2024-08-29 20:23:47 UTC (rev 1469)
+++ branches/distr-2.9/pkg/distrMod/DESCRIPTION	2024-09-02 16:24:37 UTC (rev 1470)
@@ -1,6 +1,6 @@
 Package: distrMod
-Version: 2.9.4
-Date: 2024-08-29
+Version: 2.9.5
+Date: 2024-09-02
 Title: Object Oriented Implementation of Probability Models
 Description: Implements S4 classes for probability models based on packages 'distr' and
             'distrEx' as described in <doi:10.18637/jss.v035.i10>.
@@ -17,4 +17,4 @@
 URL: https://r-forge.r-project.org/projects/distr/
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-VCS/SVNRevision: 1463
+VCS/SVNRevision: 1469

Modified: branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd	2024-08-29 20:23:47 UTC (rev 1469)
+++ branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd	2024-09-02 16:24:37 UTC (rev 1470)
@@ -13,8 +13,8 @@
 \details{
 \tabular{ll}{
 Package: \tab distrMod \cr
-Version: \tab 2.9.4 \cr
-Date: \tab 2024-08-29 \cr
+Version: \tab 2.9.5 \cr
+Date: \tab 2024-09-02 \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://r-forge.r-project.org/projects/distr/\cr
-VCS/SVNRevision: \tab 1463 \cr
+VCS/SVNRevision: \tab 1469 \cr
 }}
 \section{Classes}{
 \preformatted{

Modified: branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2024-08-29 20:23:47 UTC (rev 1469)
+++ branches/distr-2.9/pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2024-09-02 16:24:37 UTC (rev 1470)
@@ -57,7 +57,7 @@
     df, qqplot, sd
 
 Loading required package: distrEx
-:distrEx>  Extensions of Package 'distr' (version 2.9.2)
+:distrEx>  Extensions of Package 'distr' (version 2.9.5)
 :distrEx> 
 :distrEx>  Note: Packages "e1071", "moments", "fBasics" should be
 :distrEx>  attached /before/ package "distrEx". See
@@ -81,7 +81,7 @@
     IQR, mad, median, var
 
 Loading required package: RandVar
-:RandVar>  Implementation of Random Variables (version 1.2.3)
+:RandVar>  Implementation of Random Variables (version 1.2.4)
 :RandVar> 
 :RandVar>  For more information see ?"RandVar", NEWS("RandVar"), as
 :RandVar>  well as
@@ -92,7 +92,7 @@
 Loading required package: MASS
 Loading required package: stats4
 :distrMod>  Object Oriented Implementation of Probability Models
-:distrMod>  (version 2.9.3)
+:distrMod>  (version 2.9.4)
 :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: 0x000001e789a2e7b8>
+<bytecode: 0x000001b4c3e1d098>
 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: 0x000001e780973ed8>
+<environment: 0x000001b4c5710f80>
 
 > ## IGNORE_RDIFF_BEGIN
 > checkL2deriv(E1)
@@ -797,8 +797,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x000001e70e6ade98>
-<environment: 0x000001e70e6a9c68>
+<bytecode: 0x000001b4bdb55228>
+<environment: 0x000001b4bdb4d308>
 
 > 
 > ## The function is currently defined as
@@ -1081,7 +1081,7 @@
         1)/c(meanlog = 1)
     return(y)
 }
-<environment: 0x000001e70d321bd8>
+<environment: 0x000001b4c9285568>
 
 > checkL2deriv(L1)
 precision of centering:	 -0.003003394 
@@ -2123,7 +2123,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x000001e7898a0668>
+<bytecode: 0x000001b4c47b9680>
 <environment: namespace:distrMod>
 > name(EuclNorm)
 [1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x000001e7898a0668>
+<bytecode: 0x000001b4c47b9680>
 <environment: namespace:distrMod>
 
 > ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x000001e789a95858>
-<environment: 0x000001e70ac304e0>
+<bytecode: 0x000001b4c495ab88>
+<environment: 0x000001b4be16a8c8>
 
 > 
 > ## The function is currently defined as
@@ -2654,8 +2654,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x000001e7093be128>
-<environment: 0x000001e70af3e898>
+<bytecode: 0x000001b4c43c1d98>
+<environment: 0x000001b4bdd78890>
 
 > 
 > ## The function is currently defined as
@@ -3680,7 +3680,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001e70d318b00>
+<bytecode: 0x000001b4be71b060>
 > print(param(NS), show.details = "minimal")
 An object of class "ParamWithScaleFamParameter"
 name:	location and scale
@@ -3729,7 +3729,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001e70d318b00>
+<bytecode: 0x000001b4be71b060>
 Trafo / derivative matrix:
             mean         sd
 mu/sig 0.3668695 -0.3024814
@@ -3772,7 +3772,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001e70d318b00>
+<bytecode: 0x000001b4be71b060>
 Trafo / derivative matrix:
          mean      sd
 mu/sig 0.3669 -0.3025
@@ -4138,7 +4138,7 @@
 > cleanEx()
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  33.22 1.22 35.36 NA NA 
+Time elapsed:  23.95 0.8 25.08 NA NA 
 > grDevices::dev.off()
 null device 
           1 

Modified: pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION	2024-08-29 20:23:47 UTC (rev 1469)
+++ pkg/distrMod/DESCRIPTION	2024-09-02 16:24:37 UTC (rev 1470)
@@ -1,6 +1,6 @@
 Package: distrMod
-Version: 2.9.3
-Date: 2024-08-29
+Version: 2.9.4
+Date: 2024-09-02
 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: 1463
+VCS/SVNRevision: 1469

Modified: pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- pkg/distrMod/man/0distrMod-package.Rd	2024-08-29 20:23:47 UTC (rev 1469)
+++ pkg/distrMod/man/0distrMod-package.Rd	2024-09-02 16:24:37 UTC (rev 1470)
@@ -13,8 +13,8 @@
 \details{
 \tabular{ll}{
 Package: \tab distrMod \cr
-Version: \tab 2.9.3 \cr
-Date: \tab 2024-08-29 \cr
+Version: \tab 2.9.4 \cr
+Date: \tab 2024-09-02 \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 1463 \cr
+VCS/SVNRevision: \tab 1469 \cr
 }}
 \section{Classes}{
 \preformatted{

Modified: pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save
===================================================================
--- pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2024-08-29 20:23:47 UTC (rev 1469)
+++ pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save	2024-09-02 16:24:37 UTC (rev 1470)
@@ -31,7 +31,7 @@
 
 Loading required package: sfsmisc
 :distr>  Object Oriented Implementation of Distributions (version
-:distr>  2.9.5)
+:distr>  2.9.4)
 :distr> 
 :distr>  Attention: Arithmetics on distribution objects are
 :distr>  understood as operations on corresponding random variables
@@ -57,7 +57,7 @@
     df, qqplot, sd
 
 Loading required package: distrEx
-:distrEx>  Extensions of Package 'distr' (version 2.9.3)
+:distrEx>  Extensions of Package 'distr' (version 2.9.5)
 :distrEx> 
 :distrEx>  Note: Packages "e1071", "moments", "fBasics" should be
 :distrEx>  attached /before/ package "distrEx". See
@@ -81,7 +81,7 @@
     IQR, mad, median, var
 
 Loading required package: RandVar
-:RandVar>  Implementation of Random Variables (version 1.2.3)
+:RandVar>  Implementation of Random Variables (version 1.2.4)
 :RandVar> 
 :RandVar>  For more information see ?"RandVar", NEWS("RandVar"), as
 :RandVar>  well as
@@ -92,7 +92,7 @@
 Loading required package: MASS
 Loading required package: stats4
 :distrMod>  Object Oriented Implementation of Probability Models
-:distrMod>  (version 2.9.3)
+:distrMod>  (version 2.9.4)
 :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: 0x000001e789a2e7b8>
+<bytecode: 0x000001b4c3e1d098>
 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: 0x000001e780973ed8>
+<environment: 0x000001b4c5710f80>
 
 > ## IGNORE_RDIFF_BEGIN
 > checkL2deriv(E1)
@@ -797,8 +797,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x000001e70e6ade98>
-<environment: 0x000001e70e6a9c68>
+<bytecode: 0x000001b4bdb55228>
+<environment: 0x000001b4bdb4d308>
 
 > 
 > ## The function is currently defined as
@@ -1081,7 +1081,7 @@
         1)/c(meanlog = 1)
     return(y)
 }
-<environment: 0x000001e70d321bd8>
+<environment: 0x000001b4c9285568>
 
 > checkL2deriv(L1)
 precision of centering:	 -0.003003394 
@@ -2123,7 +2123,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x000001e7898a0668>
+<bytecode: 0x000001b4c47b9680>
 <environment: namespace:distrMod>
 > name(EuclNorm)
 [1] "EuclideanNorm"
@@ -2157,7 +2157,7 @@
     else 
         return(sqrt(colSums(x^2)))
 }
-<bytecode: 0x000001e7898a0668>
+<bytecode: 0x000001b4c47b9680>
 <environment: namespace:distrMod>
 
 > ## IGNORE_RDIFF_END
@@ -2614,8 +2614,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A= A0)
-<bytecode: 0x000001e789a95858>
-<environment: 0x000001e70ac304e0>
+<bytecode: 0x000001b4c495ab88>
+<environment: 0x000001b4be16a8c8>
 
 > 
 > ## The function is currently defined as
@@ -2654,8 +2654,8 @@
 
 Slot "fct":
 function(x) QuadFormNorm(x, A = A)
-<bytecode: 0x000001e7093be128>
-<environment: 0x000001e70af3e898>
+<bytecode: 0x000001b4c43c1d98>
+<environment: 0x000001b4bdd78890>
 
 > 
 > ## The function is currently defined as
@@ -3680,7 +3680,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001e70d318b00>
+<bytecode: 0x000001b4be71b060>
 > print(param(NS), show.details = "minimal")
 An object of class "ParamWithScaleFamParameter"
 name:	location and scale
@@ -3729,7 +3729,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001e70d318b00>
+<bytecode: 0x000001b4be71b060>
 Trafo / derivative matrix:
             mean         sd
 mu/sig 0.3668695 -0.3024814
@@ -3772,7 +3772,7 @@
     dimnames(mat) <- list(nfval, c("mean", "sd"))
     return(list(fval = fval, mat = mat))
 }
-<bytecode: 0x000001e70d318b00>
+<bytecode: 0x000001b4be71b060>
 Trafo / derivative matrix:
          mean      sd
 mu/sig 0.3669 -0.3025
@@ -4138,7 +4138,7 @@
 > cleanEx()
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  33.22 1.22 35.36 NA NA 
+Time elapsed:  23.95 0.8 25.08 NA NA 
 > grDevices::dev.off()
 null device 
           1 

Modified: pkg/utils/DESCRIPTIONutilsExamples.R
===================================================================
--- pkg/utils/DESCRIPTIONutilsExamples.R	2024-08-29 20:23:47 UTC (rev 1469)
+++ pkg/utils/DESCRIPTIONutilsExamples.R	2024-09-02 16:24:37 UTC (rev 1470)
@@ -430,6 +430,23 @@
 }
 
 if(FALSE){
+Pkgs <- c("distrMod")
+Names <- c("Version")    ## 20240902
+Values <- matrix(c("2.9.4"),1,length(Pkgs))
+colnames(Values) <- Pkgs
+rownames(Values)  <- Names
+changeDescription(startDir = "C:/rtest/distr",names=Names,
+                  pkgs=Pkgs, values=Values)
+updateHTMLpages(pkgNames ="distrMod", pkgVersions = "2.9.4")
+
+Pkgs <- c("distrMod")
+Names <- c("Version")    ## 20240902
+Values <- matrix(c("2.9.5"),1,length(Pkgs))
+colnames(Values) <- Pkgs
+rownames(Values)  <- Names
+changeDescription(startDir = "C:/rtest/distr/branches/distr-2.9",names=Names,
+                  pkgs=Pkgs, values=Values)
+
 Pkgs <- c("distr")
 Names <- c("Version")    ## 20240829
 Values <- matrix(c("2.9.5"),1,length(Pkgs))
@@ -483,23 +500,7 @@
                   pkgs=Pkgs, values=Values)
 updateHTMLpages(pkgNames ="distrSim", pkgVersions = "2.8.5")
 
-Pkgs <- c("distrMod")
-Names <- c("Version")    ## 20240829
-Values <- matrix(c("2.9.3"),1,length(Pkgs))
-colnames(Values) <- Pkgs
-rownames(Values)  <- Names
-changeDescription(startDir = "C:/rtest/distr",names=Names,
-                  pkgs=Pkgs, values=Values)
-updateHTMLpages(pkgNames ="distrMod", pkgVersions = "2.9.3")
 
-Pkgs <- c("distrMod")
-Names <- c("Version")    ## 20240829
-Values <- matrix(c("2.9.4"),1,length(Pkgs))
-colnames(Values) <- Pkgs
-rownames(Values)  <- Names
-changeDescription(startDir = "C:/rtest/distr/branches/distr-2.9",names=Names,
-                  pkgs=Pkgs, values=Values)
-
 Pkgs <- c("RobAStBase")
 Names <- c("Version")    ## 20240829
 Values <- matrix(c("1.2.6"),1,length(Pkgs))

Modified: www/distrMod.html
===================================================================
--- www/distrMod.html	2024-08-29 20:23:47 UTC (rev 1469)
+++ www/distrMod.html	2024-09-02 16:24:37 UTC (rev 1470)
@@ -29,11 +29,11 @@
 
 
 <hr style="width: 100%; height: 2px;">
-<div style="text-align: justify;"> Version: 2.9.3 <br>
+<div style="text-align: justify;"> Version: 2.9.4 <br>
 
 
 
-Release Date: 2024-08-29 <br>
+Release Date: 2024-09-02 <br>
 
 
 
@@ -1028,7 +1028,7 @@
 <div style="text-align: justify; color: rgb(0, 0, 0);">This page is
 maintained by <a href="mailto:peter.ruckdeschel at uni-oldenburg.de?subject=distr-package">Peter
 Ruckdeschel</a>
-and last updated on 2024-08-29. <br>
+and last updated on 2024-09-02. <br>
 
 
 



More information about the Distr-commits mailing list