[Distr-commits] r1104 - in branches/distr-2.7/pkg: SweaveListingUtils distr/R distr/inst distr/man distrDoc/vignettes distrEllipse distrEllipse/R distrEllipse/inst distrEllipse/man distrEllipse/tests/Examples startupmsg utils
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Apr 23 19:09:34 CEST 2016
Author: ruckdeschel
Date: 2016-04-23 19:09:34 +0200 (Sat, 23 Apr 2016)
New Revision: 1104
Modified:
branches/distr-2.7/pkg/SweaveListingUtils/DESCRIPTION
branches/distr-2.7/pkg/distr/R/qqplot.R
branches/distr-2.7/pkg/distr/inst/NEWS
branches/distr-2.7/pkg/distr/man/qqplot.Rd
branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw
branches/distr-2.7/pkg/distrEllipse/DESCRIPTION
branches/distr-2.7/pkg/distrEllipse/NAMESPACE
branches/distr-2.7/pkg/distrEllipse/R/AllGenerics.R
branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R
branches/distr-2.7/pkg/distrEllipse/inst/NEWS
branches/distr-2.7/pkg/distrEllipse/man/0distrEllipse-package.Rd
branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd
branches/distr-2.7/pkg/distrEllipse/tests/Examples/distrEllipse-Ex.Rout.save
branches/distr-2.7/pkg/startupmsg/DESCRIPTION
branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R
branches/distr-2.7/pkg/utils/RCRAN.bat
branches/distr-2.7/pkg/utils/RCheck.bat
branches/distr-2.7/pkg/utils/getRevNr.R
branches/distr-2.7/pkg/utils/showsvnlog.R
Log:
updated some packages in branch 2.7
Modified: branches/distr-2.7/pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- branches/distr-2.7/pkg/SweaveListingUtils/DESCRIPTION 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/SweaveListingUtils/DESCRIPTION 2016-04-23 17:09:34 UTC (rev 1104)
@@ -1,11 +1,11 @@
Package: SweaveListingUtils
Title: Utilities for Sweave Together with TeX 'listings' Package
-Description: Provides utilities for defining R / Rd as Tex-package-listings "language" and
- including R / Rd source file (sniplets) copied from R-forge in its most recent version
- (or another url) thereby avoiding inconsistencies between vignette and documented
- source code.
+Description: Provides utilities for defining R / Rd as "language" for TeX-package "listings"
+ and for including R / Rd source file (snippets) copied from R-forge in its most
+ recent version (or another URL) thereby avoiding inconsistencies between vignette
+ and documented source code.
Encoding: latin1
-Version: 0.7.1
+Version: 0.7.4
Depends: R(>= 2.14.0), startupmsg
Suggests: distr, MASS, survival, distrEx, Matrix, splines
Imports: methods
@@ -13,7 +13,7 @@
Authors at R: person("Peter", "Ruckdeschel", role=c("cre", "cph"),
email="peter.ruckdeschel at uni-oldenburg.de")
License: LGPL-3
-Date: 2015-11-07
+Date: 2016-04-23
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
SVNRevision: 1080
Modified: branches/distr-2.7/pkg/distr/R/qqplot.R
===================================================================
--- branches/distr-2.7/pkg/distr/R/qqplot.R 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distr/R/qqplot.R 2016-04-23 17:09:34 UTC (rev 1104)
@@ -118,6 +118,24 @@
xy <- sort(c(xy,xy0,xy1))
}
}
+ qqplotInfo <- list(xy.0=xy, y.0=y,
+ withConf.pw=withConf.pw,
+ withConf.sim=withConf.sim,
+ alpha.CI=alpha.CI ,
+ col.pCI = col.pCI , lty.pCI = lty.pCI ,
+ lwd.pCI = lwd.pCI , pch.pCI = pch.pCI,
+ cex.pCI = cex.pCI ,
+ col.sCI = col.sCI , lty.sCI = lty.sCI ,
+ lwd.sCI = lwd.sCI , pch.sCI = pch.sCI,
+ cex.sCI = cex.sCI ,
+ n = n ,
+ exact.sCI = exact.sCI, exact.pCI = exact.pCI,
+ nosym.pCI = nosym.pCI, with.legend = with.legend,
+ legend.bg = legend.bg, legend.pos = legend.pos,
+ legend.cex = legend.cex, legend.pref = legend.pref,
+ legend.postf = legend.postf, legend.alpha = legend.alpha, debug = debug,
+ args.stats.qqplot = mcl
+ )
if(plot.it){
qqb <- .confqq(xy, y, datax=TRUE, withConf.pw, withConf.sim, alpha.CI,
col.pCI, lty.pCI, lwd.pCI, pch.pCI, cex.pCI,
@@ -134,6 +152,8 @@
}
}
}
- return(invisible(c(ret,qqb)))
+ qqplotInfo <- c(ret, qqplotInfo, qqb)
+ class(qqplotInfo) <- c("qqplotInfo","DiagnInfo")
+ return(invisible(qqplotInfo))
})
Modified: branches/distr-2.7/pkg/distr/inst/NEWS
===================================================================
--- branches/distr-2.7/pkg/distr/inst/NEWS 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distr/inst/NEWS 2016-04-23 17:09:34 UTC (rev 1104)
@@ -8,6 +8,10 @@
information)
##############
+v 2.7
+##############
+
+##############
v 2.6
##############
@@ -37,6 +41,9 @@
argument has now been enhanced in the sense that now more detailed
information about which helper function was the culprit and where
(uniroot/optimize) this happens
+ + now returns an object of S3-classes "qqplotInfo","DiagnInfo"
+ to be able to recover all information used to produce the plot
+ for later use in enhanced graphics (e.g. with ggplot)
-qqbounds:
+ the respective helper functions .BinomCI.nosym, .BinomCI,
.q2kolmogorov capsulate their calls to uniroot / optimize in
Modified: branches/distr-2.7/pkg/distr/man/qqplot.Rd
===================================================================
--- branches/distr-2.7/pkg/distr/man/qqplot.Rd 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distr/man/qqplot.Rd 2016-04-23 17:09:34 UTC (rev 1104)
@@ -110,8 +110,12 @@
}
}
\value{
- As for function \code{\link[stats:qqnorm]{qqplot}} from package \pkg{stats}: a
- list with components
+ A list of elements containing the information needed to compute the
+ respective QQ plot, in particular it extends the elements of the
+ return value of function \code{\link[stats:qqnorm]{qqplot}}
+ from package \pkg{stats}, i.e., a
+ list with components \code{x} and \code{y} for x and y coordinates
+ of the plotted points; more specifically it contains
\item{x}{The x coordinates of the points that were/would be plotted}
\item{y}{The corresponding quantiles of the second distribution,
\emph{including \code{\link{NA}}s}.}
@@ -120,6 +124,8 @@
\item{err}{logical vector of length 2.}
(elements \code{crit} and \code{err} are taken from the return
value(s) of \code{qqbounds}).
+ The return value allows to recover all information used to produce the plot
+ for later use in enhanced graphics (e.g. with ggplot).
}
\references{
Becker, R. A., Chambers, J. M. and Wilks, A. R. (1988)
Modified: branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw
===================================================================
--- branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw 2016-04-23 17:09:34 UTC (rev 1104)
@@ -83,8 +83,8 @@
@
%
% -------------------------------------------------------------------------------
-\renewcommand{\pkgversion}{{\tt 2.5}}
-\newcommand{\pkgExversion}{{\tt 2.5}}
+\renewcommand{\pkgversion}{{\tt 2.7}}
+\newcommand{\pkgExversion}{{\tt 2.7}}
\newcommand{\Reals}{\mathbb{R}}
\newcommand{\R}{\mathbb{R}}
\newcommand{\N}{\mathbb{N}}
@@ -105,7 +105,7 @@
\pkg{distrTEst}, \pkg{distrTeach},
version \pkgversion}
%,version \pkgExversion}
-\author{\small Peter Ruckdeschel\thanks{Fraunhofer ITWM, Kaiserslautern}
+\author{\small Peter Ruckdeschel\thanks{Carl von Ossietzky Universit\"at Oldenburg}
\\[-.5ex]
\small Matthias Kohl\thanks{FH Furtwangen}
\\[-.5ex]
@@ -113,9 +113,10 @@
\\[-.5ex]
\small Florian Camphausen\thanks{West-LB, London}
\smallskip\\
-\small Fraunhofer ITWM\\[-.5ex]
-\small Fraunhofer Platz 1\\[-.5ex]
-\small 67663 Kaiserslautern\\[-.5ex]
+\small Institute for Mathematics\\[-.5ex]
+\small School of Mathematics and Science\\[-.5ex]
+\small PO box 25 03\\[-.5ex]
+\small 26111 Oldenburg (Oldb.)\\[-.5ex]
\small Germany\\
\small e-Mail: {\small \tt peter.ruckdeschel at uni-oldenburg.de}\medskip\\
\parbox[t]{5cm}{
@@ -248,6 +249,16 @@
@
\par
\begin{small}
+Due to a non-conformal implementation of function \code{q} in \texttt{RStudio},
+our approach to overload function \code{q} by method dispatch does not work
+from an \texttt{RStudio} console (it does work, though within a function
+environment). To overcome this, from version 2.6 on, we have aliases
+\code{p.r} and \code{q.l} for functions \code{p} and \code{q}, alluding to
+the right (resp. left) continous form of the cdf and the quantile function.
+these two aliases (in particular \code{q.l}) do work in \texttt{RStudio}.
+\end{small}
+\par
+\begin{small}
\noindent{\bf Comment:}\\
Let \code{N} an object of class \code{"Norm"} with parameters \code{mean=2},
\code{sd=1.3} and let \code{P} an object of class \code{"Pois"} with parameter
Modified: branches/distr-2.7/pkg/distrEllipse/DESCRIPTION
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/DESCRIPTION 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/DESCRIPTION 2016-04-23 17:09:34 UTC (rev 1104)
@@ -1,6 +1,6 @@
Package: distrEllipse
Version: 2.7
-Date: 2015-11-07
+Date: 2016-04-23
Title: S4 Classes for Elliptically Contoured Distributions
Description: Distribution (S4-)classes for elliptically contoured distributions (based on
package 'distr').
@@ -16,4 +16,4 @@
Encoding: latin1
LastChangedDate: {$LastChangedDate: 2009-03-31 15:31:30 +0200 (Di, 31 Mrz 2009) $}
LastChangedRevision: {$LastChangedRevision: 447 $}
-SVNRevision: 1080
+SVNRevision: 1096
Modified: branches/distr-2.7/pkg/distrEllipse/NAMESPACE
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/NAMESPACE 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/NAMESPACE 2016-04-23 17:09:34 UTC (rev 1104)
@@ -21,6 +21,7 @@
exportMethods("dimension", "radDistr", "scale", "location", "dim",
"radDistr<-", "scale<-", "location<-",
"plot.rd", "r.rd", "d.rd", "p.rd", "q.rd",
+ "plotRd", "rRd", "dRd", "pRd", "qRd",
"E", "var", "mean", "sigma","mixCoeff", "mixDistr")
exportMethods("plot", "show", "showobj", "Symmetry")
exportMethods("+", "*", "%*%")
Modified: branches/distr-2.7/pkg/distrEllipse/R/AllGenerics.R
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/R/AllGenerics.R 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/R/AllGenerics.R 2016-04-23 17:09:34 UTC (rev 1104)
@@ -24,3 +24,14 @@
setGeneric("plot.rd", function(x, ...) standardGeneric("plot.rd"))
+if(!isGeneric("rRd"))
+ setGeneric("rRd", function(object) standardGeneric("rRd"))
+if(!isGeneric("dRd"))
+ setGeneric("dRd", function(object) standardGeneric("dRd"))
+if(!isGeneric("pRd"))
+ setGeneric("pRd", function(object) standardGeneric("pRd"))
+if(!isGeneric("qRd"))
+ setGeneric("qRd", function(object) standardGeneric("qRd"))
+if(!isGeneric("plotRd"))
+ setGeneric("plotRd", function(x, ...) standardGeneric("plotRd"))
+
Modified: branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R 2016-04-23 17:09:34 UTC (rev 1104)
@@ -49,6 +49,13 @@
setMethod("p.rd", "SphericalDistribution", function(object) p(object at radDistr))
setMethod("q.rd", "SphericalDistribution", function(object) q(object at radDistr))
+setMethod("plotRd", "SphericalDistribution",
+ function(x, ... ) plot(x at radDistr,...))
+setMethod("rRd", "SphericalDistribution", function(object) r(object at radDistr))
+setMethod("dRd", "SphericalDistribution", function(object) d(object at radDistr))
+setMethod("pRd", "SphericalDistribution", function(object) p(object at radDistr))
+setMethod("qRd", "SphericalDistribution", function(object) q(object at radDistr))
+
## functionals:
setMethod("E", signature(object = "SphericalDistribution",
Modified: branches/distr-2.7/pkg/distrEllipse/inst/NEWS
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/inst/NEWS 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/inst/NEWS 2016-04-23 17:09:34 UTC (rev 1104)
@@ -13,6 +13,8 @@
user-visible CHANGES:
+ title changed to title style / capitalization
++ new synonyma plotRd, rRd, dRd, pRd, and qRd for plot.rd, r.rd, d.rd, p.rd, and q.rd
+ to substitute the old ones on the long run (to avoid clashes with S3 inheritance)
under the hood:
Modified: branches/distr-2.7/pkg/distrEllipse/man/0distrEllipse-package.Rd
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/man/0distrEllipse-package.Rd 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/man/0distrEllipse-package.Rd 2016-04-23 17:09:34 UTC (rev 1104)
@@ -12,8 +12,8 @@
\details{
\tabular{ll}{
Package: \tab distrEllipse \cr
-Version: \tab 2.7 \cr
-Date: \tab 2015-11-07 \cr
+Version: \tab 2.6 \cr
+Date: \tab 2016-04-23 \cr
Depends: \tab R(>= 2.8.0), methods, graphics, mvtnorm, setRNG(>= 2006.2-1), distr(>= 2.2),
distrEx(>= 2.2), distrSim(>= 2.2)\cr
Suggests: \tab distrMod(>= 2.2), distrTEst(>= 2.2)\cr
@@ -21,7 +21,7 @@
ByteCompile: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 1080 \cr
+SVNRevision: \tab 1096 \cr
}
}
\section{Classes}{
Modified: branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd 2016-04-23 17:09:34 UTC (rev 1104)
@@ -7,6 +7,11 @@
\alias{dim,SphericalDistribution-method}
\alias{radDistr,SphericalDistribution-method}
\alias{radDistr<-,SphericalDistribution-method}
+\alias{plotRd,SphericalDistribution-method}
+\alias{rRd,SphericalDistribution-method}
+\alias{dRd,SphericalDistribution-method}
+\alias{pRd,SphericalDistribution-method}
+\alias{qRd,SphericalDistribution-method}
\alias{plot.rd,SphericalDistribution-method}
\alias{r.rd,SphericalDistribution-method}
\alias{d.rd,SphericalDistribution-method}
@@ -19,6 +24,11 @@
\alias{d.rd}
\alias{p.rd}
\alias{q.rd}
+\alias{plotRd}
+\alias{rRd}
+\alias{dRd}
+\alias{pRd}
+\alias{qRd}
\alias{E,SphericalDistribution,missing,missing-method}
\alias{var,SphericalDistribution-method}
\alias{coerce,SphericalDistribution,EllipticalDistribution-method}
@@ -103,18 +113,26 @@
\item{radDistr}{\code{signature(object = "SphericalDistribution")}: access method for
slot \code{radDistr}. }
\item{r.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{r} of slot \code{radDistr}. }
+ slot \code{r} of slot \code{radDistr}. From version 2.6 on, an alias \code{rRd} is
+ introduced to replace \code{r.rd} on the long run in order to avoid clashes with
+ S3-method inheritance. }
\item{d.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{d} of slot \code{radDistr}. }
+ slot \code{d} of slot \code{radDistr}. From version 2.6 on, an alias \code{dRd} is
+ introduced to replace \code{d.rd} on the long run in order to avoid clashes with
+ S3-method inheritance. }
\item{p.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{p} of slot \code{radDistr}. }
+ slot \code{p} of slot \code{radDistr}. From version 2.6 on, an alias \code{pRd} is
+ introduced to replace \code{p.rd} on the long run in order to avoid clashes with
+ S3-method inheritance. }
\item{q.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{q} of slot \code{radDistr}. }
+ slot \code{q} of slot \code{radDistr}. From version 2.6 on, an alias \code{qRd} is
+ introduced to replace \code{q.rd} on the long run in order to avoid clashes with
+ S3-method inheritance. }
\item{plot.rd}{\code{signature(x = "SphericalDistribution")}: utility; calls \code{plot}
- for slot \code{radDistr}. }
+ for slot \code{radDistr}. From version 2.6 on, an alias \code{plotRd} is introduced
+ to replace \code{plot.rd} on the long run in order to avoid clashes with S3-method inheritance.}
\item{plot}{\code{signature(x = "SphericalDistribution", y = "missing")}:
- plot for an spherically symmetric distribution; see \code{\link{plot-methods}}.
- }
+ plot for an spherically symmetric distribution; see \code{\link{plot-methods}}. }
\item{show}{\code{signature(object = "SphericalDistribution")}:
\code{show} method for spherically symmetric distributions.
}
Modified: branches/distr-2.7/pkg/distrEllipse/tests/Examples/distrEllipse-Ex.Rout.save
===================================================================
--- branches/distr-2.7/pkg/distrEllipse/tests/Examples/distrEllipse-Ex.Rout.save 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/distrEllipse/tests/Examples/distrEllipse-Ex.Rout.save 2016-04-23 17:09:34 UTC (rev 1104)
@@ -1,7 +1,7 @@
-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 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 is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -20,12 +20,13 @@
> pkgname <- "distrEllipse"
> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
+> options(pager = "console")
> library('distrEllipse')
Loading required package: mvtnorm
Loading required package: setRNG
Loading required package: distr
Loading required package: startupmsg
-:startupmsg> Utilities for Start-Up Messages (version 0.9.1)
+:startupmsg> Utilities for Start-Up Messages (version 0.9.3)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
@@ -34,7 +35,7 @@
Loading required package: SweaveListingUtils
:SweaveListingUtils> Utilities for Sweave Together with
:SweaveListingUtils> TeX 'listings' Package (version
-:SweaveListingUtils> 0.7)
+:SweaveListingUtils> 0.7.3)
:SweaveListingUtils>
:SweaveListingUtils> NOTE: Support for this package
:SweaveListingUtils> will stop soon.
@@ -60,9 +61,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
@@ -86,9 +87,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
@@ -110,9 +111,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
@@ -132,18 +133,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
:distrEllipse> S4 Classes for Elliptically Contoured
-:distrEllipse> Distributions (version 2.6)
+:distrEllipse> Distributions (version 2.6.1)
:distrEllipse>
:distrEllipse> Some functions from package 'stats' are
:distrEllipse> intentionally masked ---see
@@ -595,8 +596,18 @@
>
> mylist <- MultivarMixingDistribution(Binom(3,.3), Dirac(2), Norm(),
+ mixCoeff=c(1/4,1/5,11/20))
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
> mylist2 <- MultivarMixingDistribution(Binom(3,.3), mylist,
+ mixCoeff=c(.3,.7))
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
> mylist2
An object of class "UnivarLebDecDistribution"
--- a Lebesgue decomposed distribution:
@@ -775,6 +786,12 @@
>
> mylist <- MultivarMixingDistribution(Binom(3,.3), Dirac(2), Norm(),
+ mixCoeff=c(1/4,1/5,11/20))
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
+Warning in `[<-`(`*tmp*`, i, value = as(mixDistr[[i]], "UnivarLebDecDistribution")) :
+ implicit list embedding of S4 objects is deprecated
>
>
>
@@ -792,11 +809,13 @@
> ### dim,SphericalDistribution-method
> ### radDistr,SphericalDistribution-method
> ### radDistr<-,SphericalDistribution-method
-> ### plot.rd,SphericalDistribution-method
+> ### plotRd,SphericalDistribution-method rRd,SphericalDistribution-method
+> ### dRd,SphericalDistribution-method pRd,SphericalDistribution-method
+> ### qRd,SphericalDistribution-method plot.rd,SphericalDistribution-method
> ### r.rd,SphericalDistribution-method d.rd,SphericalDistribution-method
> ### p.rd,SphericalDistribution-method q.rd,SphericalDistribution-method
-> ### radDistr radDistr<- plot.rd r.rd d.rd p.rd q.rd
-> ### E,SphericalDistribution,missing,missing-method
+> ### radDistr radDistr<- plot.rd r.rd d.rd p.rd q.rd plotRd rRd dRd pRd
+> ### qRd E,SphericalDistribution,missing,missing-method
> ### var,SphericalDistribution-method
> ### coerce,SphericalDistribution,EllipticalDistribution-method
> ### show,SphericalDistribution-method
@@ -869,7 +888,6 @@
*** intentional masking: ***
-
>
>
>
@@ -937,7 +955,7 @@
> ###
> options(digits = 7L)
> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 4.3 0.024 4.327 0 0.006
+Time elapsed: 4.68 0.13 4.8 NA NA
> grDevices::dev.off()
null device
1
Modified: branches/distr-2.7/pkg/startupmsg/DESCRIPTION
===================================================================
--- branches/distr-2.7/pkg/startupmsg/DESCRIPTION 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/startupmsg/DESCRIPTION 2016-04-23 17:09:34 UTC (rev 1104)
@@ -1,7 +1,7 @@
Package: startupmsg
Encoding: latin1
-Version: 0.9.2
-Date: 2015-11-07
+Version: 0.9.4
+Date: 2016-04-23
Title: Utilities for Start-Up Messages
Description: Provides utilities to create or suppress start-up messages.
Authors at R: person("Peter", "Ruckdeschel", role=c("cre", "cph"),
Modified: branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R
===================================================================
--- branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R 2016-04-23 17:09:34 UTC (rev 1104)
@@ -41,7 +41,7 @@
inRforge = TRUE, ### shall we use r-forge as repository
## (otherwise need full URL as arg pathRepo
withlogin = TRUE, ### do we need option --login (yes in cygwin, don't know in Linux)
- PathToBash = "C:/cygwin/bin/bash", ## path to bash
+ PathToBash = "C:/cygwin64/bin/bash", ## path to bash
PathToreadsvnlog.sh="C:/rtest/distr/branches/distr-2.4/pkg/utils",
### path to shell script readsvnlog.sh
tmpfile = "C:/rtest/tmp-svnlog5.txt", ### some tmpfile to which we write the
@@ -98,10 +98,15 @@
FN <- file.path("pkg",x,"DESCRIPTION")
xx <- read.dcf(FN)
if(verbose){
+ cat("\nxx:\n---\n")
print(xx)
+ cat("\nvalues:\n-------\n")
print(values)
+ cat("\nnames:\n------\n")
print(names)
+ cat("\nvalues[names,x]:\n-----------------\n")
print(values[names,x])
+ cat("\nxx[names,x]:\n-------------\n")
print(xx[,names])
}
xx[,names] <- values[names,x]
Modified: branches/distr-2.7/pkg/utils/RCRAN.bat
===================================================================
--- branches/distr-2.7/pkg/utils/RCRAN.bat 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/utils/RCRAN.bat 2016-04-23 17:09:34 UTC (rev 1104)
@@ -1,6 +1,6 @@
@echo off
if not "%2"=="" (
-call R CMD check --as-cran --outdir=%2 %1
+call R CMD check --as-cran --output=%2 %1
) else (
call R CMD check --as-cran %1
)
Modified: branches/distr-2.7/pkg/utils/RCheck.bat
===================================================================
--- branches/distr-2.7/pkg/utils/RCheck.bat 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/utils/RCheck.bat 2016-04-23 17:09:34 UTC (rev 1104)
@@ -1,7 +1,7 @@
@echo off
if not "%2"=="" (
-call R CMD check --multiarch --outdir=%2 --timings --install-args="--byte-compile --with-keep.source --compact-docs --resave-data --install-tests --example --html --latex --clean --preclean --compile-both" %1
+call R CMD check --multiarch --output=%2 --timings --install-args="--byte-compile --with-keep.source --compact-docs --resave-data --install-tests --example --html --latex --clean --preclean --compile-both --force-biarch" %1
) else (
-call R CMD check --multiarch --timings --install-args="--byte-compile --with-keep.source --compact-docs --resave-data --install-tests --example --html --latex --clean --preclean --compile-both" %1
+call R CMD check --multiarch --timings --install-args="--byte-compile --with-keep.source --compact-docs --resave-data --install-tests --example --html --latex --clean --preclean --compile-both --force-biarch" %1
)
echo on
Modified: branches/distr-2.7/pkg/utils/getRevNr.R
===================================================================
--- branches/distr-2.7/pkg/utils/getRevNr.R 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/utils/getRevNr.R 2016-04-23 17:09:34 UTC (rev 1104)
@@ -3,7 +3,7 @@
inRforge = TRUE, ### shall we use r-forge as repository
## (otherwise need full URL as arg pathRepo
withlogin = TRUE, ### do we need option --login (yes in cygwin, don't know in Linux)
- PathToBash = "C:/cygwin/bin/bash", ## path to bash
+ PathToBash = "C:/cygwin64/bin/bash", ## path to bash
PathToUtils="C:/rtest/distr/branches/distr-2.4/pkg/utils",
### path to shell script readsvnlog.sh
tmpfile = "C:/rtest/tmp-svnlog5.txt", ### some tmpfile to which we write the
Modified: branches/distr-2.7/pkg/utils/showsvnlog.R
===================================================================
--- branches/distr-2.7/pkg/utils/showsvnlog.R 2016-04-23 16:26:35 UTC (rev 1103)
+++ branches/distr-2.7/pkg/utils/showsvnlog.R 2016-04-23 17:09:34 UTC (rev 1104)
@@ -21,7 +21,7 @@
inRforge = TRUE, ### shall we use r-forge as repository
## (otherwise need full URL as arg pathRepo
withlogin = TRUE, ### do we need option --login (yes in cygwin, don't know in Linux)
- PathToBash = "C:/cygwin/bin/bash", ## path to bash
+ PathToBash = "C:/cygwin64/bin/bash", ## path to bash
PathToUtils="C:/rtest/distr/branches/distr-2.4/pkg/utils",
### path to shell script readsvnlog.sh
fromRev = 501, ## arg for svn log --- first log-listed revision
More information about the Distr-commits
mailing list