[Distr-commits] r1495 - in branches/distr-2.9/pkg/distrTeach: . inst tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 11 23:17:01 CET 2025
Author: ruckdeschel
Date: 2025-01-11 23:17:01 +0100 (Sat, 11 Jan 2025)
New Revision: 1495
Modified:
branches/distr-2.9/pkg/distrTeach/DESCRIPTION
branches/distr-2.9/pkg/distrTeach/inst/CITATION
branches/distr-2.9/pkg/distrTeach/inst/NEWS
branches/distr-2.9/pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save
Log:
[distrTeach] ported changes from v 2.9.2 to branch 2.9
Modified: branches/distr-2.9/pkg/distrTeach/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrTeach/DESCRIPTION 2025-01-11 22:14:27 UTC (rev 1494)
+++ branches/distr-2.9/pkg/distrTeach/DESCRIPTION 2025-01-11 22:17:01 UTC (rev 1495)
@@ -1,5 +1,5 @@
Package: distrTeach
-Version: 2.9.2
+Version: 2.9.4
Date: 2019-03-13
Title: Extensions of Package 'distr' for Teaching Stochastics/Statistics in Secondary School
Description: Provides flexible examples of LLN and CLT for teaching purposes in secondary
@@ -6,7 +6,7 @@
school.
Depends: R(>= 3.4), methods, distr(>= 2.8.0), distrEx(>= 2.8.0)
Suggests: tcltk
-Imports: startupmsg, grDevices, graphics, stats
+Imports: startupmsg(>= 1.0.0), grDevices, graphics, stats
Authors at R: c(person("Eleonora", "Feist", role="ctb", comment = "contributed as student in the
initial phase --2008"), person("Anja", "Hueller", role="ctb",
comment = "contributed as student in the initial phase --2008"),
Modified: branches/distr-2.9/pkg/distrTeach/inst/CITATION
===================================================================
--- branches/distr-2.9/pkg/distrTeach/inst/CITATION 2025-01-11 22:14:27 UTC (rev 1494)
+++ branches/distr-2.9/pkg/distrTeach/inst/CITATION 2025-01-11 22:17:01 UTC (rev 1495)
@@ -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 distrTeach (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/distrTeach/inst/NEWS
===================================================================
--- branches/distr-2.9/pkg/distrTeach/inst/NEWS 2025-01-11 22:14:27 UTC (rev 1494)
+++ branches/distr-2.9/pkg/distrTeach/inst/NEWS 2025-01-11 22:17:01 UTC (rev 1495)
@@ -8,6 +8,16 @@
information)
##############
+v 2.9.2
+##############
+
+under the hood:
++ adapted reference output for new startupmsg
++ transformed CITATION file to new format, i.e., bibentry() instead of citEntry(),
+ c(as.person( .... ), as.person( .... ), ...), instead of
+ as.personList(....)
+
+##############
v 2.9.0
##############
@@ -20,9 +30,6 @@
under the hood:
+ 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(....)
##############
Modified: branches/distr-2.9/pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save
===================================================================
--- branches/distr-2.9/pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save 2025-01-11 22:14:27 UTC (rev 1494)
+++ branches/distr-2.9/pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save 2025-01-11 22:17:01 UTC (rev 1495)
@@ -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,47 +21,32 @@
> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
> options(pager = "console")
-> base::assign(".ExTimings", "distrTeach-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('distrTeach')
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':
@@ -69,23 +54,10 @@
df, qqplot, sd
Loading required package: distrEx
-:distrEx> Extensions of Package 'distr' (version 2.7.0)
+:distrEx> *** Extensions of Package 'distr' ***
:distrEx>
-:distrEx> Note: Packages "e1071", "moments", "fBasics" should be
-:distrEx> attached /before/ package "distrEx". See
-:distrEx> distrExMASK().Note: Extreme value distribution
-:distrEx> functionality has been moved to
:distrEx>
-:distrEx> package "RobExtremes". See distrExMOVED().
-:distrEx>
-:distrEx> For more information see ?"distrEx", NEWS("distrEx"), as
-:distrEx> well as
-:distrEx> http://distr.r-forge.r-project.org/
-:distrEx> Package "distrDoc" provides a vignette to this package
-:distrEx> as well as to several related packages; try
-:distrEx> vignette("distr").
-
Attaching package: 'distrEx'
The following objects are masked from 'package:stats':
@@ -92,18 +64,11 @@
IQR, mad, median, var
-:distrTeach> Extensions of Package 'distr' for Teaching
+:distrTeach> *** Extensions of Package 'distr' for Teaching
:distrTeach>
-:distrTeach> Stochastics/Statistics in Secondary School
-:distrTeach> (version 2.7.0)
+:distrTeach> Stochastics/Statistics in Secondary School ***
:distrTeach>
-:distrTeach> For more information see ?"distrTeach",
-:distrTeach> NEWS("distrTeach"), as well as
-:distrTeach> http://distr.r-forge.r-project.org/
-:distrTeach> Package "distrDoc" provides a vignette to this
-:distrTeach> package as well as to several related packages;
-:distrTeach> try vignette("distr").
-
+:distrTeach>
>
> base::assign(".oldSearch", base::search(), pos = 'CheckExEnv')
> base::assign(".old_wd", base::getwd(), pos = 'CheckExEnv')
@@ -113,7 +78,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: illustrateCLT
> ### Title: Functions for Illustrating the CLT
> ### Aliases: illustrateCLT illustrateCLT.tcl
@@ -131,8 +95,6 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("IllustCLT", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("IllustLLN")
> ### * IllustLLN
@@ -139,7 +101,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: illustrateLLN
> ### Title: Functions for Illustrating the LLN
> ### Aliases: illustrateLLN
@@ -157,8 +118,6 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("IllustLLN", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("plotCLT")
> ### * plotCLT
@@ -165,11 +124,11 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: plotCLT
> ### Title: Generic Plot Function for Illustrating the CLT
> ### Aliases: plotCLT plotCLT-methods plotCLT,AbscontDistribution-method
> ### plotCLT,DiscreteDistribution-method
+> ### plotCLT,UnivariateDistribution-method
> ### Keywords: internal methods hplot distribution
>
> ### ** Examples
@@ -178,14 +137,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("plotCLT", 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: 10.79 0.7 11.84 NA NA
+Time elapsed: 7.67 0.61 8.32 NA NA
> grDevices::dev.off()
null device
1
More information about the Distr-commits
mailing list