[Distr-commits] r1493 - in branches/distr-2.9/pkg/distrTEst: . inst man tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 11 22:58:38 CET 2025
Author: ruckdeschel
Date: 2025-01-11 22:58:37 +0100 (Sat, 11 Jan 2025)
New Revision: 1493
Modified:
branches/distr-2.9/pkg/distrTEst/DESCRIPTION
branches/distr-2.9/pkg/distrTEst/inst/CITATION
branches/distr-2.9/pkg/distrTEst/inst/NEWS
branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd
branches/distr-2.9/pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save
Log:
[distrTEst] ported changes from v 2.8.3 to branch 2.9
Modified: branches/distr-2.9/pkg/distrTEst/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrTEst/DESCRIPTION 2025-01-11 21:57:55 UTC (rev 1492)
+++ branches/distr-2.9/pkg/distrTEst/DESCRIPTION 2025-01-11 21:58:37 UTC (rev 1493)
@@ -5,7 +5,7 @@
Description: Evaluation (S4-)classes based on package distr for evaluating procedures
(estimators/tests) at data/simulation in a unified way.
Depends: R(>= 3.4), methods, graphics, setRNG(>= 2006.2-1), distrSim(>= 2.2)
-Imports: startupmsg, utils
+Imports: startupmsg(>= 1.0.0), utils
Suggests: distrEx(>= 2.8.0)
Enhances: distr
Authors at R: c(person("Florian", "Camphausen", role="ctb", comment="contributed as student in
Modified: branches/distr-2.9/pkg/distrTEst/inst/CITATION
===================================================================
--- branches/distr-2.9/pkg/distrTEst/inst/CITATION 2025-01-11 21:57:55 UTC (rev 1492)
+++ branches/distr-2.9/pkg/distrTEst/inst/CITATION 2025-01-11 21:58:37 UTC (rev 1493)
@@ -1,5 +1,5 @@
bibentry(bibtype = "Article",
- mheader = "To cite package distrEx (and other packages of the distr family of packages) in publications use:",
+ mheader = "To cite package distrTEst (and other packages of the distr family of packages) in publications use:",
title = "S4 Classes for Distributions",
author = c(person("Peter", "Ruckdeschel", comment = c(ORCID = "0000-0001-7815-4809")),
person("Matthias", "Kohl", comment = c(ORCID = "0000-0001-9514-8910")),
Modified: branches/distr-2.9/pkg/distrTEst/inst/NEWS
===================================================================
--- branches/distr-2.9/pkg/distrTEst/inst/NEWS 2025-01-11 21:57:55 UTC (rev 1492)
+++ branches/distr-2.9/pkg/distrTEst/inst/NEWS 2025-01-11 21:58:37 UTC (rev 1493)
@@ -11,19 +11,22 @@
v 2.9
##############
+
+##############
+v 2.8.3
+##############
+
++ taken up pkg "distr" into "Enhances" in DESCRIPTION to ensure all
+ inter-pkg xrefs in Rd-files work
+
under the hood:
++ adapted reference output for new startupmsg
+ converted encoding to UTF-8
+ transformed CITATION file to new format, i.e., bibentry() instead of citEntry(),
c(as.person( .... ), as.person( .... ), ...), instead of
as.personList(....)
-##############
-v 2.8.4
-##############
-+ taken up pkg "distr" into "Enhances" in DESCRIPTION to ensure all
- inter-pkg xrefs in Rd-files work
-
##############
v 2.8
##############
Modified: branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd 2025-01-11 21:57:55 UTC (rev 1492)
+++ branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd 2025-01-11 21:58:37 UTC (rev 1493)
@@ -15,16 +15,15 @@
\details{
\tabular{ll}{
Package: \tab distrTEst \cr
-Version: \tab 2.9.0 \cr
-Date: \tab 2019-03-13 \cr
-Depends: \tab R(>= 3.4), methods, graphics, setRNG(>= 2006.2-1),
- distrSim(>= 2.2) \cr
-Imports: \tab startupmsg, utils \cr
-Suggests: \tab distrEx(>= 2.8.0) \cr
+Version: \tab 2.8.3 \cr
+Date: \tab 2025-01-11 \cr
+Depends: \tab R(>= 3.4), methods, graphics, setRNG(>= 2006.2-1), distrSim(>= 2.2) \cr
+Imports: \tab startupmsg(>= 1.0.0), utils \cr
+Suggests: \tab distrEx(>= 2.2) \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://r-forge.r-project.org/projects/distr/\cr
-VCS/SVNRevision: \tab 1324 \cr
+URL: \tab https://distr.r-forge.r-project.org/\cr
+VCS/SVNRevision: \tab 1490 \cr
}}
\section{Classes}{
\preformatted{
@@ -39,7 +38,6 @@
}
Objects of class "Evaluation" are generated by a call to \code{\link{evaluate}}.
}
-
\section{Methods}{
\preformatted{
plot plot method for "Evaluation" and for "EvaluationList"
@@ -48,7 +46,6 @@
Data accessor method for "Evaluation", and, for "EvaluationList"
returns common Data
}}
-
\section{Slot accessors / -replacement functions}{
All slots are inspected / modified by corresponding
accessors / -replacement functions, e.g. \code{call.ev(X)}
@@ -55,28 +52,22 @@
or \code{filename(X)<-"myevaluation.sav"} for
an object of class \code{"Evaluation"}.
}
-
\section{Start-up-Banner}{
You may suppress the start-up banner/message completely by setting \code{options("StartupBanner"="off")}
somewhere before loading this package by \code{library} or \code{require} in your R-code / R-session.
-
If option \code{"StartupBanner"} is not defined (default) or setting
\code{options("StartupBanner"=NULL)} or \code{options("StartupBanner"="complete")}
the complete start-up banner is displayed.
-
For any other value of option \code{"StartupBanner"} (i.e., not in \code{c(NULL,"off","complete")})
only the version information is displayed.
-
The same can be achieved by wrapping the \code{library} or \code{require} call into
either \code{\link[startupmsg:StartupUtilities]{suppressStartupMessages}()} or
\code{\link[startupmsg:StartupUtilities]{onlytypeStartupMessages}(.,atypes="version")}.
-
As for general \code{packageStartupMessage}'s, you may also suppress all
the start-up banner by wrapping the \code{library} or \code{require}
call into \code{suppressPackageStartupMessages()} from
\pkg{startupmsg}-version 0.5 on.
}
-
\author{
Thomas Stabla \email{statho3 at web.de},\cr
Florian Camphausen \email{fcampi at gmx.de},\cr
@@ -84,12 +75,10 @@
Matthias Kohl \email{Matthias.Kohl at stamats.de}\cr
\emph{Maintainer:} Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}
}
-
\note{Global options controlling the plots and summaries of Evaluationlist
objects may be inspected / set by \code{\link{distrTEstoptions}()}
and \code{\link{getdistrTEstOption}()}.
}
-
\section{Package versions}{
Note: The first two numbers of package versions do not necessarily reflect
package-individual development, but rather are chosen for the
@@ -96,19 +85,15 @@
distrXXX family as a whole in order to ease updating "depends"
information.
}
-
\references{
%A more detailed manual for \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, and \pkg{distrEx} may be downloaded from
%\url{http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf}.
-
A vignette for packages \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, and \pkg{distrEx}
is included into the mere documentation package \pkg{distrDoc} and may be called by
\code{require("distrDoc");vignette("distr")}.
-
A homepage to this package is available under\cr
\url{https://distr.r-forge.r-project.org/}
}
-
\keyword{ package }
\concept{S4 evaluation class}
\seealso{
Modified: branches/distr-2.9/pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save
===================================================================
--- branches/distr-2.9/pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save 2025-01-11 21:57:55 UTC (rev 1492)
+++ branches/distr-2.9/pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save 2025-01-11 21:58:37 UTC (rev 1493)
@@ -1,7 +1,7 @@
-R version 3.5.1 RC (2018-06-24 r74935) -- "Feather Spray"
-Copyright (C) 2018 The R Foundation for Statistical Computing
-Platform: i386-w64-mingw32/i386 (32-bit)
+R Under development (unstable) (2025-01-10 r87562 ucrt) -- "Unsuffered Consequences"
+Copyright (C) 2025 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,49 +21,34 @@
> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
> options(pager = "console")
-> base::assign(".ExTimings", "distrTEst-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('distrTEst')
Loading required package: setRNG
Loading required package: distrSim
Loading required package: distr
Loading required package: startupmsg
-:startupmsg> Utilities for Start-Up Messages (version 0.9.5)
+:startupmsg> *** Utilities for Start-Up Messages ***
:startupmsg>
-:startupmsg> For more information see ?"startupmsg",
-:startupmsg> NEWS("startupmsg")
-
+:startupmsg> Version information in start-up messages is
+:startupmsg> currently suppressed. To see such information on
+:startupmsg> startup as in versions of this pkg prior to this
+:startupmsg> versionr, set option "StartupBanner" to a value
+:startupmsg> different to {"off", "no-version", "no -
+:startupmsg> version"}, e.g., by options("StartupBanner" =
+:startupmsg> "complete") or by options("StartupBanner" = NULL)
+:startupmsg> or by options("StartupBanner" = "something else").
+:startupmsg>
+:startupmsg> Detailed information about which packages are
+:startupmsg> currently loaded or attached at which version
+:startupmsg> (regardless of whether these have start-up
+:startupmsg> messages managed by this package) can be obtained
+:startupmsg> by "sessionInfo()".
+:startupmsg>
+:startupmsg>
Loading required package: sfsmisc
-:distr> Object Oriented Implementation of Distributions (version
-:distr> 2.8.0)
+:distr> *** Object Oriented Implementation of Distributions ***
:distr>
-:distr> Attention: Arithmetics on distribution objects are
-:distr> understood as operations on corresponding random variables
-:distr> (r.v.s); see distrARITH().
:distr>
-:distr> Some functions from package 'stats' are intentionally masked
-:distr> ---see distrMASK().
-:distr>
-:distr> Note that global options are controlled by distroptions()
-:distr> ---c.f. ?"distroptions".
-:distr>
-:distr> For more information see ?"distr", NEWS("distr"), as well as
-:distr> http://distr.r-forge.r-project.org/
-:distr> Package "distrDoc" provides a vignette to this package as
-:distr> well as to several extension packages; try
-:distr> vignette("distr").
-
Attaching package: 'distr'
The following objects are masked from 'package:stats':
@@ -70,21 +55,10 @@
df, qqplot, sd
-:distrSim> Simulation Classes Based on Package 'distr' (version
-:distrSim> 2.7.0)
+:distrSim> *** Simulation Classes Based on Package 'distr' ***
:distrSim>
-:distrSim> Some functions from package 'stats' are intentionally
-:distrSim> masked ---see distrSimMASK().
:distrSim>
-:distrSim>
-:distrSim> For more information see ?"distrSim",
-:distrSim> NEWS("distrSim"), as well as
-:distrSim> http://distr.r-forge.r-project.org/
-:distrSim> Package "distrDoc" provides a vignette to this package
-:distrSim> as well as to several related packages; try
-:distrSim> vignette("distr").
-
Attaching package: 'distrSim'
The following object is masked from 'package:stats':
@@ -95,16 +69,10 @@
rbind
-:distrTEst> Estimation and Testing Classes Based on Package
-:distrTEst> 'distr' (version 2.7.0)
+:distrTEst> *** Estimation and Testing Classes Based on Package
+:distrTEst> 'distr' ***
:distrTEst>
-:distrTEst> For more information see ?"distrTEst",
-:distrTEst> NEWS("distrTEst"), as well as
-:distrTEst> http://distr.r-forge.r-project.org/
-:distrTEst> Package "distrDoc" provides a vignette to this
-:distrTEst> package as well as to several related packages; try
-:distrTEst> vignette("distr").
-
+:distrTEst>
>
> base::assign(".oldSearch", base::search(), pos = 'CheckExEnv')
> base::assign(".old_wd", base::getwd(), pos = 'CheckExEnv')
@@ -114,7 +82,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Evaluation-class
> ### Title: Class "Evaluation"
> ### Aliases: Evaluation-class initialize,Evaluation-method
@@ -236,6 +203,10 @@
$ mean.re: num -0.0508 -0.0379 0.4138 -0.1625 -0.0137
> plot(ev1)
> #
+> #clean up
+> unlink("csim.mean")
+> unlink("csim.mean.comment")
+> #
> #another function to be evaluated:
> severalThings<- function(x) {list("mean"=mean(x),"sd"=sd(as.vector(x)), "mad"=mad(x))}
> ev3 <- evaluate(cs, severalThings, resname="several")
@@ -244,8 +215,6 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("Evaluation-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("EvaluationList-class")
> ### * EvaluationList-class
@@ -252,7 +221,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: EvaluationList-class
> ### Title: Class "EvaluationList"
> ### Aliases: Elist EvaluationList EvaluationList-class
@@ -431,11 +399,12 @@
Mean :-0.01646 Mean :-0.01515
3rd Qu.: 0.01899 3rd Qu.: 0.02496
Max. : 0.08584 Max. : 0.07802
+> #clean up
+> unlink("csim.mean")
+> unlink("csim.mean.comment")
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("EvaluationList-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("distrTEstoptions")
> ### * distrTEstoptions
@@ -442,7 +411,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distrTEstoptions
> ### Title: functions to change the global variables of the package
> ### 'distrTEst'
@@ -477,14 +445,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("distrTEstoptions", 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: 2.64 0.22 2.92 NA NA
+Time elapsed: 9.08 0.25 9.36 NA NA
> grDevices::dev.off()
null device
1
More information about the Distr-commits
mailing list