[Distr-commits] r1448 - in pkg/distr: . R man tests/Examples

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2024-08-27 19:16:18 +0200 (Tue, 27 Aug 2024)
New Revision: 1448

Modified:
   pkg/distr/DESCRIPTION
   pkg/distr/R/makedots.R
   pkg/distr/man/0distr-package.Rd
   pkg/distr/tests/Examples/distr-Ex.Rout.save
Log:
[distr] (trunk) rebuilt tar ball for resubmission

Modified: pkg/distr/DESCRIPTION
===================================================================
--- pkg/distr/DESCRIPTION	2024-08-22 06:44:13 UTC (rev 1447)
+++ pkg/distr/DESCRIPTION	2024-08-27 17:16:18 UTC (rev 1448)
@@ -1,6 +1,6 @@
 Package: distr
 Version: 2.9.4
-Date: 2024-08-19
+Date: 2024-08-26
 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: 1443
+VCS/SVNRevision: 1447

Modified: pkg/distr/R/makedots.R
===================================================================
--- pkg/distr/R/makedots.R	2024-08-22 06:44:13 UTC (rev 1447)
+++ pkg/distr/R/makedots.R	2024-08-27 17:16:18 UTC (rev 1448)
@@ -3,16 +3,22 @@
        dots$xlim <- dots$ylim <- dots$yaxt <- dots$axes <- dots$xaxt <- NULL
        dots$panel.last <- dots$panel.first <- dots$frame.plot <- dots$ann <-NULL
        dots$log <- dots$bg <- dots$asp <- NULL
+       # 20240822 added an additional layer of security
+       if (length(dots) == 0 ) dots <- NULL
        return(dots)
 }
 .makedotsL <- function(dots){
     dots <- .makedotsLowLevel(dots)
     dots$pch <- dots$cex <- NULL
+    # 20240822 added an additional layer of security
+    if (length(dots) == 0 ) dots <- NULL
     dots
 }
 .makedotsP <- function(dots){
     dots <- .makedotsLowLevel(dots)
     dots$lwd <- dots$lty <- NULL
+    # 20240822 added an additional layer of security
+    if (length(dots) == 0 ) dots <- NULL
     dots
 }
 .makedotsPt <- function(dots){

Modified: pkg/distr/man/0distr-package.Rd
===================================================================
--- pkg/distr/man/0distr-package.Rd	2024-08-22 06:44:13 UTC (rev 1447)
+++ pkg/distr/man/0distr-package.Rd	2024-08-27 17:16:18 UTC (rev 1448)
@@ -45,7 +45,7 @@
 \tabular{ll}{
 Package: \tab distr \cr
 Version: \tab 2.9.4 \cr
-Date: \tab 2024-08-19 \cr
+Date: \tab 2024-08-26 \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 1443 \cr
+VCS/SVNRevision: \tab 1447 \cr
 }}
 \section{Classes}{
 Distribution classes have a slot \code{param} the class of which

Modified: pkg/distr/tests/Examples/distr-Ex.Rout.save
===================================================================
--- pkg/distr/tests/Examples/distr-Ex.Rout.save	2024-08-22 06:44:13 UTC (rev 1447)
+++ pkg/distr/tests/Examples/distr-Ex.Rout.save	2024-08-27 17:16:18 UTC (rev 1448)
@@ -2016,8 +2016,8 @@
                           d0 <-    log(df1(x))-log(stand)
                      else d0 <- df1(x) / stand
                      return (d0)}
-<bytecode: 0x000001bdc208d238>
-<environment: 0x000001bdc7984f28>
+<bytecode: 0x0000021896e44350>
+<environment: 0x000002189c66ef20>
 
 $pfun
 function (q, lower.tail = TRUE, log.p = FALSE) 
@@ -2032,7 +2032,7 @@
     else p0/nm
     return(p0)
 }
-<environment: 0x000001bdc2d8cbc8>
+<environment: 0x0000021897b47d50>
 
 $qfun
 function (p, lower.tail = TRUE, log.p = FALSE) 
@@ -2050,7 +2050,7 @@
     else q.l0(1 - p01)
     return(as.numeric(q0))
 }
-<environment: 0x000001bdc2d3a7f0>
+<environment: 0x0000021897ac0080>
 
 > ## 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: 0x000001bdc208d238>
-<environment: 0x000001bdc2b5ea18>
+<bytecode: 0x0000021896e44350>
+<environment: 0x0000021897919d98>
 
 $pfun
 function (q, lower.tail = TRUE, log.p = FALSE) 
@@ -2107,7 +2107,7 @@
     else p0/nm
     return(p0)
 }
-<environment: 0x000001bdc283b2a8>
+<environment: 0x00000218975c1698>
 
 $qfun
 function (p, lower.tail = TRUE, log.p = FALSE) 
@@ -2125,7 +2125,7 @@
     else q.l0(1 - p01)
     return(as.numeric(q0))
 }
-<environment: 0x000001bdc5d04b20>
+<environment: 0x0000021897c8ed88>
 
 > ## IGNORE_RDIFF_END
 > rp2 <- function(n){rpois(n, lambda = 1)^2}
@@ -3810,13 +3810,13 @@
 > ## IGNORE_RDIFF_BEGIN
 > system.time(r(F)(10^6))
    user  system elapsed 
-   0.30    0.01    0.31 
+   0.29    0.01    0.31 
 > ## IGNORE_RDIFF_END
 > simplifyr(F, size = 10^6)
 > ## IGNORE_RDIFF_BEGIN
 > system.time(r(F)(10^6))
    user  system elapsed 
-   0.10    0.02    0.10 
+   0.09    0.00    0.10 
 > ## IGNORE_RDIFF_END
 > 
 > 
@@ -3853,7 +3853,7 @@
 > cleanEx()
 > options(digits = 7L)
 > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  23.82 1.72 26 NA NA 
+Time elapsed:  23.08 1.97 25.3 NA NA 
 > grDevices::dev.off()
 pdf 
  19