[Distr-commits] r1177 - in pkg/distrTeach: . R inst man tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Jul 8 16:22:15 CEST 2018
Author: ruckdeschel
Date: 2018-07-08 16:22:14 +0200 (Sun, 08 Jul 2018)
New Revision: 1177
Modified:
pkg/distrTeach/DESCRIPTION
pkg/distrTeach/R/illustLLN.R
pkg/distrTeach/inst/CITATION
pkg/distrTeach/inst/NEWS
pkg/distrTeach/man/0distrTeach-package.Rd
pkg/distrTeach/man/IllustCLT.Rd
pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save
Log:
[distrTeach] merged branch 2.7 back to trunk
Modified: pkg/distrTeach/DESCRIPTION
===================================================================
--- pkg/distrTeach/DESCRIPTION 2018-07-08 14:21:43 UTC (rev 1176)
+++ pkg/distrTeach/DESCRIPTION 2018-07-08 14:22:14 UTC (rev 1177)
@@ -1,6 +1,6 @@
Package: distrTeach
-Version: 2.6.1
-Date: 2016-04-23
+Version: 2.7
+Date: 2015-11-07
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
school.
@@ -16,6 +16,7 @@
License: LGPL-3
Encoding: latin1
URL: http://distr.r-forge.r-project.org/
+Packaged: Fri Jun 8 00:12:57 2007; Peter
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 1094
+SVNRevision: 1080
Modified: pkg/distrTeach/R/illustLLN.R
===================================================================
--- pkg/distrTeach/R/illustLLN.R 2018-07-08 14:21:43 UTC (rev 1176)
+++ pkg/distrTeach/R/illustLLN.R 2018-07-08 14:22:14 UTC (rev 1177)
@@ -136,7 +136,7 @@
for(j in seq(1, m, by = step))
{LLNin(Distr, n, j, j+step-1)
do.call(matplot, args = c(list(Ns, t(da), pch = pch, col=col,
- axes = FALSE, ylim = q(Distr)(c(0.02,0.98)),
+ axes = FALSE, ylim = q.l(Distr)(c(0.02,0.98)),
xlab = xlab, ylab = "", main = main), dots.for.matplot ))
title(ylab = ylab, line = 1.7)
Modified: pkg/distrTeach/inst/CITATION
===================================================================
--- pkg/distrTeach/inst/CITATION 2018-07-08 14:21:43 UTC (rev 1176)
+++ pkg/distrTeach/inst/CITATION 2018-07-08 14:22:14 UTC (rev 1177)
@@ -12,7 +12,7 @@
month="July",
year="2008",
address="{Kaiserslautern, Germany}",
- URL = "https://cran.r-project.org/web/packages/distrDoc/vignettes/distr.pdf",
+ URL = "https://CRAN.R-project.org/web/packages/distrDoc/vignettes/distr.pdf",
textVersion = paste("Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006): ",
"S4 Classes for Distributions---a manual for packages distr, distrSim, distrTEst, distrEx, ",
"distrMod, and distrTeach")
Modified: pkg/distrTeach/inst/NEWS
===================================================================
--- pkg/distrTeach/inst/NEWS 2018-07-08 14:21:43 UTC (rev 1176)
+++ pkg/distrTeach/inst/NEWS 2018-07-08 14:22:14 UTC (rev 1177)
@@ -8,6 +8,17 @@
information)
##############
+v 2.7
+##############
+
+user-visible CHANGES:
++ fixed some URLs in https style
+
+under the hood:
++ wherever possible also use q.l internally instead of q to
+ provide functionality in IRKernel
+
+##############
v 2.6
##############
Modified: pkg/distrTeach/man/0distrTeach-package.Rd
===================================================================
--- pkg/distrTeach/man/0distrTeach-package.Rd 2018-07-08 14:21:43 UTC (rev 1176)
+++ pkg/distrTeach/man/0distrTeach-package.Rd 2018-07-08 14:22:14 UTC (rev 1177)
@@ -20,15 +20,15 @@
\details{
\tabular{ll}{
Package: \tab distrTeach \cr
-Version: \tab 2.6 \cr
-Date: \tab 2016-04-23 \cr
+Version: \tab 2.7 \cr
+Date: \tab 2015-11-07 \cr
Depends: \tab R(>= 2.2.0), methods, distr(>= 2.2), distrEx(>= 2.2) \cr
Suggests: \tab tcltk\cr
Imports: \tab startupmsg, grDevices, graphics, stats\cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 1091 \cr
+SVNRevision: \tab 1080 \cr
}
}
\section{Classes}{
@@ -117,7 +117,7 @@
M. Kohl (2005): \emph{Numerical Contributions to the Asymptotic
Theory of Robustness.} PhD Thesis. Bayreuth. Available as
-\url{http://www.stamats.de/ThesisMKohl.pdf}
+\url{http://www.stamats.de/wp-content/uploads/2018/04/ThesisMKohl.pdf}
}
\keyword{package}
\concept{LLN}
Modified: pkg/distrTeach/man/IllustCLT.Rd
===================================================================
--- pkg/distrTeach/man/IllustCLT.Rd 2018-07-08 14:21:43 UTC (rev 1176)
+++ pkg/distrTeach/man/IllustCLT.Rd 2018-07-08 14:22:14 UTC (rev 1177)
@@ -36,11 +36,11 @@
Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de}}
\examples{
distroptions("DefaultNrFFTGridPointsExponent" = 13)
-illustrateCLT(Distr = Unif(), len = 20)
+illustrateCLT(Distr = Unif(), len = 10)
distroptions("DefaultNrFFTGridPointsExponent" = 12)
-illustrateCLT(Distr = Pois(lambda = 2), len = 20)
+illustrateCLT(Distr = Pois(lambda = 2), len = 10)
distroptions("DefaultNrFFTGridPointsExponent" = 13)
-illustrateCLT(Distr = Pois(lambda = 2)+Unif(), len = 20)
+illustrateCLT(Distr = Pois(lambda = 2)+Unif(), len = 10)
illustrateCLT.tcl(Distr = Unif(), k = 4, "Unif()")
}
Modified: pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save
===================================================================
--- pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save 2018-07-08 14:21:43 UTC (rev 1176)
+++ pkg/distrTeach/tests/Examples/distrTeach-Ex.Rout.save 2018-07-08 14:22:14 UTC (rev 1177)
@@ -1,7 +1,7 @@
-R Under development (unstable) (2016-04-22 r70532) -- "Unsuffered Consequences"
-Copyright (C) 2016 The R Foundation for Statistical Computing
-Platform: i386-w64-mingw32/i386 (32-bit)
+R Under development (unstable) (2015-05-02 r68310) -- "Unsuffered Consequences"
+Copyright (C) 2015 The R Foundation for Statistical Computing
+Platform: x86_64-unknown-linux-gnu (64-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -20,11 +20,10 @@
> pkgname <- "distrTeach"
> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
-> options(pager = "console")
> library('distrTeach')
Loading required package: distr
Loading required package: startupmsg
-:startupmsg> Utilities for Start-Up Messages (version 0.9.2)
+:startupmsg> Utilities for Start-Up Messages (version 0.9.1)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
@@ -59,9 +58,9 @@
:SweaveListingUtils> vignette("ExampleSweaveListingUtils").
-Attaching package: 'SweaveListingUtils'
+Attaching package: ‘SweaveListingUtils’
-The following objects are masked from 'package:base':
+The following objects are masked from ‘package:base’:
library, require
@@ -85,9 +84,9 @@
:distr> vignette("distr").
-Attaching package: 'distr'
+Attaching package: ‘distr’
-The following objects are masked from 'package:stats':
+The following objects are masked from ‘package:stats’:
df, qqplot, sd
@@ -109,9 +108,9 @@
:distrEx> vignette("distr").
-Attaching package: 'distrEx'
+Attaching package: ‘distrEx’
-The following objects are masked from 'package:stats':
+The following objects are masked from ‘package:stats’:
IQR, mad, median, var
@@ -197,7 +196,7 @@
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 7.78 0.51 8.32 NA NA
+Time elapsed: 5.786 0.084 5.869 0 0
> grDevices::dev.off()
null device
1
More information about the Distr-commits
mailing list