[Distr-commits] r1070 - in pkg: distrSim distrSim/inst distrSim/man distrSim/tests/Examples distrTEst distrTEst/R distrTEst/inst distrTEst/man distrTEst/tests/Examples distrTeach distrTeach/R distrTeach/inst distrTeach/man distrTeach/tests/Examples startupmsg startupmsg/inst
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Nov 6 18:19:01 CET 2015
Author: ruckdeschel
Date: 2015-11-06 18:19:01 +0100 (Fri, 06 Nov 2015)
New Revision: 1070
Modified:
pkg/distrSim/DESCRIPTION
pkg/distrSim/NAMESPACE
pkg/distrSim/inst/CITATION
pkg/distrSim/inst/NEWS
pkg/distrSim/man/0distrSim-package.Rd
pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save
pkg/distrTEst/DESCRIPTION
pkg/distrTEst/NAMESPACE
pkg/distrTEst/R/summary-methods.R
pkg/distrTEst/inst/CITATION
pkg/distrTEst/inst/NEWS
pkg/distrTEst/man/0distrTEst-package.Rd
pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save
pkg/distrTeach/DESCRIPTION
pkg/distrTeach/NAMESPACE
pkg/distrTeach/R/AllGeneric.R
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
pkg/startupmsg/.Rbuildignore
pkg/startupmsg/DESCRIPTION
pkg/startupmsg/inst/NEWS
Log:
branch 2.6 reintegriert
Modified: pkg/distrSim/DESCRIPTION
===================================================================
--- pkg/distrSim/DESCRIPTION 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrSim/DESCRIPTION 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,16 +1,21 @@
Package: distrSim
-Version: 2.5.2
-Date: 2013-09-12
-Title: Simulation classes based on package distr
+Version: 2.6
+Date: 2015-11-06
+Title: Simulation Classes Based on Package 'distr'
+Description: S4-classes for setting up a coherent framework for simulation within the distr
+ family of packages.
Depends: R(>= 2.14.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.5.2)
Suggests: distrEx(>= 2.2)
-Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
-Description: Simulation (S4-)classes based on package distr
-Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
+Imports: startupmsg, stats, grDevices
+Authors at R: c(person("Florian", "Camphausen", role="ctb", comment="contributed as student in the
+ initial phase --2005"), person("Matthias", "Kohl", role=c("aut", "cph")),
+ person("Peter", "Ruckdeschel", role=c("cre", "cph"),
+ email="peter.ruckdeschel at uni-oldenburg.de"), person("Thomas", "Stabla", role="ctb",
+ comment="contributed as student in the initial phase --2005"))
ByteCompile: yes
License: LGPL-3
Encoding: latin1
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 909
+SVNRevision: 1055
Modified: pkg/distrSim/NAMESPACE
===================================================================
--- pkg/distrSim/NAMESPACE 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrSim/NAMESPACE 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,7 +1,10 @@
import("methods")
-importFrom("stats", "simulate")
+importFrom("grDevices", "colors")
+importFrom("graphics", "par")
+importFrom("stats", "rbinom", "simulate")
importFrom("setRNG", "setRNG")
import("distr")
+importFrom("startupmsg", "buildStartupMessage", "infoShow")
export("cload", "Dataclass", "Simulation", "Contsimulation",
"distrSimoptions", "getdistrSimOption", "SeqDataFrames", "distrSimMASK")
Modified: pkg/distrSim/inst/CITATION
===================================================================
--- pkg/distrSim/inst/CITATION 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrSim/inst/CITATION 2015-11-06 17:19:01 UTC (rev 1070)
@@ -14,7 +14,6 @@
number = 2,
pages = "2--6",
month = "May",
- url = "http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
pdf = "http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf",
textVersion = paste("Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006)",
"S4 Classes for Distributions"))
Modified: pkg/distrSim/inst/NEWS
===================================================================
--- pkg/distrSim/inst/NEWS 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrSim/inst/NEWS 2015-11-06 17:19:01 UTC (rev 1070)
@@ -8,6 +8,13 @@
information)
##############
+v 2.6
+##############
+
+user-visible CHANGES:
++ title changed to title style / capitalization
+
+##############
v 2.5
##############
@@ -18,6 +25,7 @@
under the hood:
+ added .Rbuildignore
++ enhanced imports in DESCRIPTION by explicating second order imports
BUGFIXES:
+ moved generics to "distribution" and "samplesize" to pkg distr to avoid
Modified: pkg/distrSim/man/0distrSim-package.Rd
===================================================================
--- pkg/distrSim/man/0distrSim-package.Rd 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrSim/man/0distrSim-package.Rd 2015-11-06 17:19:01 UTC (rev 1070)
@@ -3,7 +3,7 @@
\alias{distrSim}
\docType{package}
\title{
-distrSim -- (S4-) classes for simulations based on package distr
+distrSim -- S4-classes for Simulations Based on Package distr
}
\description{
\pkg{distrSim} is to provide a conceptual treatment of simulations by means of S4 classes.
@@ -13,14 +13,15 @@
\details{
\tabular{ll}{
Package: \tab distrSim \cr
-Version: \tab 2.5 \cr
-Date: \tab 2013-09-11 \cr
-Depends: \tab R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>=
-2.0), startupmsg\cr
+Version: \tab 2.6 \cr
+Date: \tab 2015-11-06 \cr
+Depends: \tab R(>= 2.14.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.5.2) \cr
+Suggests: \tab distrEx(>= 2.2) \cr
+Imports: \tab startupmsg, stats, grDevices \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 904 \cr
+SVNRevision: \tab 1055 \cr
}
}
\section{Classes}{
Modified: pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save
===================================================================
--- pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrSim/tests/Examples/distrSim-Ex.Rout.save 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,7 +1,7 @@
-R version 3.0.1 Patched (2013-09-02 r63805) -- "Good Sport"
-Copyright (C) 2013 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,33 +20,20 @@
> pkgname <- "distrSim"
> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
-> options(pager = "console")
-> base::assign(".ExTimings", "distrSim-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('distrSim')
Loading required package: setRNG
Loading required package: distr
Loading required package: startupmsg
-:startupmsg> Utilities for start-up messages (version 0.8)
+:startupmsg> Utilities for Start-Up Messages (version 0.9.1)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
Loading required package: sfsmisc
Loading required package: SweaveListingUtils
-:SweaveListingUtils> Utilities for Sweave together with
-:SweaveListingUtils> TeX listings package (version
-:SweaveListingUtils> 0.6.1)
+:SweaveListingUtils> Utilities for Sweave Together with
+:SweaveListingUtils> TeX 'listings' Package (version
+:SweaveListingUtils> 0.7)
:SweaveListingUtils>
:SweaveListingUtils> NOTE: Support for this package
:SweaveListingUtils> will stop soon.
@@ -72,14 +59,14 @@
: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
-:distr> Object oriented implementation of distributions (version
-:distr> 2.5)
+:distr> Object Oriented Implementation of Distributions (version
+:distr> 2.6)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -98,14 +85,14 @@
: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
-:distrSim> Simulation classes based on package distr (version
-:distrSim> 2.5)
+:distrSim> Simulation Classes Based on Package distr (version
+:distrSim> 2.6)
:distrSim>
:distrSim> Some functions from package 'stats' are intentionally
:distrSim> masked ---see distrSimMASK().
@@ -119,13 +106,13 @@
:distrSim> vignette("distr").
-Attaching package: 'distrSim'
+Attaching package: ‘distrSim’
-The following object is masked from 'package:stats':
+The following object is masked from ‘package:stats’:
simulate
-The following object is masked from 'package:base':
+The following object is masked from ‘package:base’:
rbind
@@ -137,7 +124,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Contsimulation-class
> ### Title: Class "Contsimulation"
> ### Aliases: Contsimulation-class Contsimulation
@@ -522,15 +508,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("Contsimulation-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("Dataclass-class")
> ### * Dataclass-class
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Dataclass-class
> ### Title: Class "Dataclass"
> ### Aliases: Dataclass-class initialize,Dataclass-method
@@ -545,7 +528,7 @@
number of runs: 1
dimension of the observations: 6
size of sample: 6
-object was generated by version: 2.5
+object was generated by version: 2.6
> #
> D <- Dataclass(Data = array(c(1,2,3,4,5,6),c(samplesize=2,obsdim=3,Runs=1)),
+ filename = "xyz.sav")
@@ -565,7 +548,7 @@
number of runs: 1
dimension of the observations: 3
size of sample: 2
-object was generated by version: 2.5
+object was generated by version: 2.6
> load("xyz.sav") # loads the original object "D"
> Data(D) # the original data: matrix(c(1,2,3,4,5,6),2)
, , 1
@@ -579,15 +562,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("Dataclass-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("Simulation-class")
> ### * Simulation-class
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Simulation-class
> ### Title: Class "Simulation"
> ### Aliases: Simulation-class Simulation initialize,Simulation-method
@@ -822,15 +802,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("Simulation-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("cload")
> ### * cload
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: cload
> ### Title: cload
> ### Aliases: cload
@@ -851,15 +828,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("cload", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("distrSimMASK")
> ### * distrSimMASK
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distrSimMASK
> ### Title: Masking of/by other functions in package "distrSim"
> ### Aliases: distrSimMASK MASKING
@@ -880,18 +854,16 @@
we intentionally mask the base function "rbind"
however "rbind" may still be used in exactly the same way
as before masking.
+
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("distrSimMASK", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("distrSimoptions")
> ### * distrSimoptions
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distrSimoptions
> ### Title: functions to change the global variables of the package
> ### 'distrSim'
@@ -938,15 +910,12 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("distrSimoptions", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> cleanEx()
> nameEx("subsetting-methods")
> ### * subsetting-methods
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Subsetting-methods
> ### Title: Subsetting/Indexing methods for SeqDataFrames objects in Package
> ### 'distrSim'
@@ -966,13 +935,11 @@
>
>
>
-> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv")
-> base::cat("subsetting-methods", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t")
> ### * <FOOTER>
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 2.7 0.12 3.06 NA NA
+Time elapsed: 1.016 0.02 1.039 0 0.003
> grDevices::dev.off()
null device
1
Modified: pkg/distrTEst/DESCRIPTION
===================================================================
--- pkg/distrTEst/DESCRIPTION 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTEst/DESCRIPTION 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,17 +1,21 @@
Package: distrTEst
-Version: 2.5
-Date: 2013-09-12
-Title: Estimation and Testing classes based on package distr
-Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distrSim(>= 2.2), startupmsg
-Suggests: distrEx(>= 2.2)
-Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
+Version: 2.6
+Date: 2015-11-06
+Title: Estimation and Testing Classes Based on Package 'distr'
Description: Evaluation (S4-)classes based on package distr for evaluating procedures
(estimators/tests) at data/simulation in a unified way.
-Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
+Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distrSim(>= 2.2)
+Imports: startupmsg, utils
+Suggests: distrEx(>= 2.2)
+Authors at R: c(person("Florian", "Camphausen", role="ctb", comment="contributed as student in the
+ initial phase --2005"), person("Matthias", "Kohl", role=c("aut", "cph")),
+ person("Peter", "Ruckdeschel", role=c("cre", "cph"),
+ email="peter.ruckdeschel at uni-oldenburg.de"), person("Thomas", "Stabla", role="ctb",
+ comment="contributed as student in the initial phase --2005"))
ByteCompile: yes
Encoding: latin1
License: LGPL-3
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 913
+SVNRevision: 1055
Modified: pkg/distrTEst/NAMESPACE
===================================================================
--- pkg/distrTEst/NAMESPACE 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTEst/NAMESPACE 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,7 +1,9 @@
import("methods")
-import("startupmsg")
+importFrom("graphics", "boxplot", "par")
+importFrom("utils", "str")
import("distrSim")
import("setRNG")
+importFrom("startupmsg", "buildStartupMessage", "infoShow")
export("EvaluationList", "distrTEstoptions", "getdistrTEstOption")
exportClasses("numericorNULL", "Evaluation", "EvaluationList",
Modified: pkg/distrTEst/R/summary-methods.R
===================================================================
--- pkg/distrTEst/R/summary-methods.R 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTEst/R/summary-methods.R 2015-11-06 17:19:01 UTC (rev 1070)
@@ -26,7 +26,7 @@
if(levals0<length(evals0))
warning(gettextf(
"Your evaluation list is too big; only %i% evaluations are printed",
- levals ))
+ levels ))
cat(gettextf("name of Evaluation List: %s\n",name(object)))
if(!is.null(name(Elist(object)[[1]])))
cat(gettextf("name of Dataobject: %s\n",
Modified: pkg/distrTEst/inst/CITATION
===================================================================
--- pkg/distrTEst/inst/CITATION 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTEst/inst/CITATION 2015-11-06 17:19:01 UTC (rev 1070)
@@ -14,7 +14,6 @@
number = 2,
pages = "2--6",
month = "May",
- url = "http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
pdf = "http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf",
textVersion = paste("Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006)",
"S4 Classes for Distributions"))
Modified: pkg/distrTEst/inst/NEWS
===================================================================
--- pkg/distrTEst/inst/NEWS 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTEst/inst/NEWS 2015-11-06 17:19:01 UTC (rev 1070)
@@ -3,6 +3,14 @@
######################################################################
##############
+v 2.6
+##############
+
+user-visible CHANGES:
++ title changed to title style / capitalization
+
+
+##############
v 2.5
##############
@@ -10,6 +18,7 @@
GENERAL ENHANCEMENTS:
+ cleaned DESCRIPTION and NAMESPACE file as to Imports/Depends
++ enhanced imports in DESCRIPTION by explicating second order imports
under the hood:
added .Rbuildignore
Modified: pkg/distrTEst/man/0distrTEst-package.Rd
===================================================================
--- pkg/distrTEst/man/0distrTEst-package.Rd 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTEst/man/0distrTEst-package.Rd 2015-11-06 17:19:01 UTC (rev 1070)
@@ -3,7 +3,7 @@
\alias{distrTEst}
\docType{package}
\title{
-dsitrTEst -- Estimation and Testing classes based on package distr
+distrTEst -- Estimation and Testing Classes Based on Package distr
}
\description{
\pkg{distrTest} provides
@@ -15,14 +15,15 @@
\details{
\tabular{ll}{
Package: \tab distrTEst \cr
-Version: \tab 2.5 \cr
-Date: \tab 2013-09-12 \cr
-Depends: \tab R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>=
-2.0), distrSim(>= 2.0), startupmsg\cr
+Version: \tab 2.6 \cr
+Date: \tab 2015-11-06 \cr
+Depends: \tab R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distrSim(>= 2.2)\cr
+Imports: \tab startupmsg, utils\cr
+Suggests: \tab distrEx(>= 2.2)\cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 913 \cr
+SVNRevision: \tab 1055 \cr
}}
\section{Classes}{
\preformatted{
Modified: pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save
===================================================================
--- pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTEst/tests/Examples/distrTEst-Ex.Rout.save 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,7 +1,7 @@
-R version 3.0.1 Patched (2013-09-02 r63805) -- "Good Sport"
-Copyright (C) 2013 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,34 +20,21 @@
> pkgname <- "distrTEst"
> 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.8)
+:startupmsg> Utilities for Start-Up Messages (version 0.9.1)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
Loading required package: sfsmisc
Loading required package: SweaveListingUtils
-:SweaveListingUtils> Utilities for Sweave together with
-:SweaveListingUtils> TeX listings package (version
-:SweaveListingUtils> 0.6.1)
+:SweaveListingUtils> Utilities for Sweave Together with
+:SweaveListingUtils> TeX 'listings' Package (version
+:SweaveListingUtils> 0.7)
:SweaveListingUtils>
:SweaveListingUtils> NOTE: Support for this package
:SweaveListingUtils> will stop soon.
@@ -73,14 +60,14 @@
: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
-:distr> Object oriented implementation of distributions (version
-:distr> 2.5.2)
+:distr> Object Oriented Implementation of Distributions (version
+:distr> 2.6)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -99,14 +86,14 @@
: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
-:distrSim> Simulation classes based on package distr (version
-:distrSim> 2.5.2)
+:distrSim> Simulation Classes Based on Package 'distr' (version
+:distrSim> 2.6)
:distrSim>
:distrSim> Some functions from package 'stats' are intentionally
:distrSim> masked ---see distrSimMASK().
@@ -120,18 +107,18 @@
:distrSim> vignette("distr").
-Attaching package: 'distrSim'
+Attaching package: ‘distrSim’
-The following object is masked from 'package:stats':
+The following object is masked from ‘package:stats’:
simulate
-The following object is masked from 'package:base':
+The following object is masked from ‘package:base’:
rbind
-:distrTEst> Estimation and Testing classes based on package
-:distrTEst> distr (version 2.5)
+:distrTEst> Estimation and Testing Classes Based on Package
+:distrTEst> 'distr' (version 2.6)
:distrTEst>
:distrTEst> For more information see ?"distrTEst",
:distrTEst> NEWS("distrTEst"), as well as
@@ -148,7 +135,6 @@
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: Evaluation-class
> ### Title: Class "Evaluation"
> ### Aliases: Evaluation-class initialize,Evaluation-method
@@ -278,15 +264,12 @@
>
>
>
-> 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
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: EvaluationList-class
> ### Title: Class "EvaluationList"
> ### Aliases: Elist EvaluationList EvaluationList-class
@@ -468,15 +451,12 @@
>
>
>
-> 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
>
> flush(stderr()); flush(stdout())
>
-> base::assign(".ptime", proc.time(), pos = "CheckExEnv")
> ### Name: distrTEstoptions
> ### Title: functions to change the global variables of the package
> ### 'distrTEst'
@@ -511,13 +491,11 @@
>
>
>
-> 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>
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 4.64 0.13 4.77 NA NA
+Time elapsed: 1.333 0.022 1.356 0 0
> grDevices::dev.off()
null device
1
Modified: pkg/distrTeach/DESCRIPTION
===================================================================
--- pkg/distrTeach/DESCRIPTION 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/DESCRIPTION 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,12 +1,17 @@
Package: distrTeach
-Version: 2.5
-Date: 2013-09-12
-Title: Extensions of package distr for teaching Stochastics/Statistics in secondary school
-Description: Extensions of package distr and some additional functionality
+Version: 2.6
+Date: 2015-11-06
+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.
Depends: R(>= 2.2.0), methods, distr(>= 2.2), distrEx(>= 2.2)
Suggests: tcltk
-Author: Peter Ruckdeschel, Matthias Kohl, Anja Hueller, Eleonara Feist
-Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
+Imports: startupmsg, grDevices, graphics, stats
+Authors at R: c(person("Eleonora", "Feist", role="ctb", comment = "contributed as student in the
+ initial phase --2008"), person("Matthias", "Kohl", role=c("aut", "cph")),
+ person("Peter", "Ruckdeschel", role=c("cre", "cph"),
+ email="peter.ruckdeschel at uni-oldenburg.de"), person("Anja", "Hueller", role="ctb",
+ comment = "contributed as student in the initial phase --2008"))
ByteCompile: yes
License: LGPL-3
Encoding: latin1
@@ -14,4 +19,4 @@
Packaged: Fri Jun 8 00:12:57 2007; Peter
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 913
+SVNRevision: 1055
Modified: pkg/distrTeach/NAMESPACE
===================================================================
--- pkg/distrTeach/NAMESPACE 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/NAMESPACE 2015-11-06 17:19:01 UTC (rev 1070)
@@ -1,6 +1,11 @@
import("distr")
import("distrEx")
import("methods")
+importFrom("grDevices", "graphics.off")
+importFrom("graphics", "abline", "axis", "legend", "lines", "matlines",
+ "matplot", "mtext", "par", "points", "text", "title")
+importFrom("stats", "qnorm", "stepfun")
+importFrom("startupmsg", "buildStartupMessage", "infoShow")
exportMethods("plotCLT")
export("illustrateLLN")
Modified: pkg/distrTeach/R/AllGeneric.R
===================================================================
--- pkg/distrTeach/R/AllGeneric.R 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/R/AllGeneric.R 2015-11-06 17:19:01 UTC (rev 1070)
@@ -6,9 +6,9 @@
setGeneric("plotCLT", function(Tn, ...) standardGeneric("plotCLT"))
#}
-## The original code was not working under R 2.8.0 (r45868)
-## Error in setMethod("plotCLT", "DiscreteDistribution", function(Tn, k, :
-## no existing definition for function "plotCLT"
-## Error: unable to load R code in package 'distrTeach'
-## Execution halted
+## The original code was not working under R 2.8.0 (r45868)
+## Error in setMethod("plotCLT", "DiscreteDistribution", function(Tn, k, :
+## no existing definition for function "plotCLT"
+## Error: unable to load R code in package 'distrTeach'
+## Execution halted
## ERROR: lazy loading failed for package 'distrTeach'
Modified: pkg/distrTeach/R/illustLLN.R
===================================================================
--- pkg/distrTeach/R/illustLLN.R 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/R/illustLLN.R 2015-11-06 17:19:01 UTC (rev 1070)
@@ -90,7 +90,7 @@
.mpresubs <- function(inx)
- distr:::.presubs(inx, c("%C", "%D", "%N", "%P", "%Q", "%A",
+ .presubs(inx, c("%C", "%D", "%N", "%P", "%Q", "%A",
"%X"),
list(as.character(class(Distr)[1]),
as.character(date()),
@@ -169,4 +169,37 @@
}
+#------------------------------------
+#### utility copied from package distr v.2.6 svn-rev 943
+#------------------------------------
+.presubs <- function(inp, frompat, topat){
+### replaces in an expression or a string all frompat patterns to topat patterns
+logic <- FALSE
+inCx <- sapply(inp,
+ function(inpx){
+ inC <- deparse(inpx)
+ l <- length(frompat)
+ for(i in 1:l)
+ { if (is.language(topat[[i]])){
+ totxt <- deparse(topat[[i]])
+ totxt <- gsub("expression\\(", "\", ", gsub("\\)$",", \"",totxt))
+ if (length(grep(frompat[i],inC))) logic <<- TRUE
+ inC <- gsub(frompat[i],totxt,inC)
+ }else inC <- gsub(frompat[i], topat[[i]], inC)
+ }
+ return(inC)
+ })
+if(length(grep("expression",inCx))>0)
+ inCx <- gsub("expression\\(", "", gsub("\\)$","",inCx))
+if (length(inCx) > 1) {
+ inCx <- paste(inCx, c(rep(",", length(inCx)-1), ""),
+ sep = "", collapse = "\"\\n\",")
+ if ( any(as.logical(c(lapply(inp,is.language)))) | logic )
+ inCx <- paste("expression(paste(", gsub("\\\\n"," ", inCx), "))", sep ="")
+ else
+ inCx <- paste("paste(",inCx,")", sep ="")
+}else inCx <- paste("expression(paste(",inCx,"))",sep="")
+outC <- eval(parse(text = eval(inCx)))
+return(outC)
+}
Modified: pkg/distrTeach/inst/CITATION
===================================================================
--- pkg/distrTeach/inst/CITATION 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/inst/CITATION 2015-11-06 17:19:01 UTC (rev 1070)
@@ -12,7 +12,7 @@
month="July",
year="2008",
address="{Kaiserslautern, Germany}",
- URL = "http://r-forge.r-project.org/plugins/scmsvn/viewcvs.php/*checkout*/pkg/distrDoc/inst/doc/distr.pdf?root=distr",
+ URL = "http://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 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/inst/NEWS 2015-11-06 17:19:01 UTC (rev 1070)
@@ -8,6 +8,20 @@
information)
##############
+v 2.6
+##############
+
+user-visible CHANGES:
++ title changed to title style / capitalization
++ added reference to JSS-paper in help to IllustCLT
+
+under the hood:
+
++ removed ::: internal dependencies (within distr-Fam of pkgs) by copying
+ respective routines
++ enhanced imports in DESCRIPTION by explicating second order imports
+
+##############
v 2.5
##############
Modified: pkg/distrTeach/man/0distrTeach-package.Rd
===================================================================
--- pkg/distrTeach/man/0distrTeach-package.Rd 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/man/0distrTeach-package.Rd 2015-11-06 17:19:01 UTC (rev 1070)
@@ -3,7 +3,7 @@
\alias{distrTeach}
\docType{package}
\title{
-distrTeach -- Teaching Extensions of package distr
+distrTeach -- Teaching Extensions of Package distr
}
\description{
\pkg{distrTeach} provides some illustrations based on package \pkg{distr}
@@ -20,14 +20,15 @@
\details{
\tabular{ll}{
Package: \tab distrTeach \cr
-Version: \tab 2.5 \cr
-Date: \tab 2013-09-12 \cr
-Depends: \tab R(>= 2.2.0), methods, distr(>= 2.0), distrEx(>= 2.0),
-startupmsg\cr
+Version: \tab 2.6 \cr
+Date: \tab 2015-11-06 \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 913 \cr
+SVNRevision: \tab 1055 \cr
}
}
\section{Classes}{
Modified: pkg/distrTeach/man/IllustCLT.Rd
===================================================================
--- pkg/distrTeach/man/IllustCLT.Rd 2015-11-06 17:18:16 UTC (rev 1069)
+++ pkg/distrTeach/man/IllustCLT.Rd 2015-11-06 17:19:01 UTC (rev 1070)
@@ -43,6 +43,14 @@
illustrateCLT(Distr = Pois(lambda = 2)+Unif(), len = 20)
illustrateCLT.tcl(Distr = Unif(), k = 4, "Unif()")
}
+
+\references{
+Kohl, M., Ruckdeschel, P., (2014):
+ General purpose convolution algorithm for distributions
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/distr -r 1070
More information about the Distr-commits
mailing list