[Distr-commits] r1182 - in pkg/distrEllipse: . R inst man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Jul 8 16:24:29 CEST 2018
Author: ruckdeschel
Date: 2018-07-08 16:24:29 +0200 (Sun, 08 Jul 2018)
New Revision: 1182
Modified:
pkg/distrEllipse/DESCRIPTION
pkg/distrEllipse/NAMESPACE
pkg/distrEllipse/R/AllGenerics.R
pkg/distrEllipse/R/SphericalDistribution.R
pkg/distrEllipse/inst/NEWS
pkg/distrEllipse/man/0distrEllipse-package.Rd
pkg/distrEllipse/man/SphericalDistribution-class.Rd
Log:
[distrEllipse] merged branch 2.7 back to trunk
Modified: pkg/distrEllipse/DESCRIPTION
===================================================================
--- pkg/distrEllipse/DESCRIPTION 2018-07-08 14:24:06 UTC (rev 1181)
+++ pkg/distrEllipse/DESCRIPTION 2018-07-08 14:24:29 UTC (rev 1182)
@@ -1,6 +1,6 @@
Package: distrEllipse
-Version: 2.6.3
-Date: 2017-04-23
+Version: 2.7
+Date: 2016-04-23
Title: S4 Classes for Elliptically Contoured Distributions
Description: Distribution (S4-)classes for elliptically contoured distributions (based on
package 'distr').
@@ -8,7 +8,7 @@
distrEx(>= 2.2), distrSim(>= 2.2)
Suggests: distrMod(>= 2.2), distrTEst(>= 2.2)
Imports: startupmsg, stats
-Authors at R: person("Peter", "Ruckdeschel", role=c("cre", "aut", "cph"),
+Authors at R: person("Peter", "Ruckdeschel", role=c("aut", "cre", "cph"),
email="peter.ruckdeschel at uni-oldenburg.de")
ByteCompile: yes
License: LGPL-3
@@ -16,4 +16,4 @@
Encoding: latin1
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 1139
+SVNRevision: 1096
Modified: pkg/distrEllipse/NAMESPACE
===================================================================
--- pkg/distrEllipse/NAMESPACE 2018-07-08 14:24:06 UTC (rev 1181)
+++ pkg/distrEllipse/NAMESPACE 2018-07-08 14:24:29 UTC (rev 1182)
@@ -20,7 +20,6 @@
"MultivarDistrList","MultivarMixingDistribution")
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")
Modified: pkg/distrEllipse/R/AllGenerics.R
===================================================================
--- pkg/distrEllipse/R/AllGenerics.R 2018-07-08 14:24:06 UTC (rev 1181)
+++ pkg/distrEllipse/R/AllGenerics.R 2018-07-08 14:24:29 UTC (rev 1182)
@@ -12,16 +12,17 @@
setGeneric("radDistr<-", function(object,value) standardGeneric("radDistr<-"))
## wrappers
-if(!isGeneric("r.rd"))
- setGeneric("r.rd", function(object) standardGeneric("r.rd"))
-if(!isGeneric("d.rd"))
- setGeneric("d.rd", function(object) standardGeneric("d.rd"))
-if(!isGeneric("p.rd"))
- setGeneric("p.rd", function(object) standardGeneric("p.rd"))
-if(!isGeneric("q.rd"))
- setGeneric("q.rd", function(object) standardGeneric("q.rd"))
-if(!isGeneric("plot.rd"))
- setGeneric("plot.rd", function(x, ...) standardGeneric("plot.rd"))
+### defunct
+# if(!isGeneric("r.rd"))
+# setGeneric("r.rd", function(object) standardGeneric("r.rd"))
+# if(!isGeneric("d.rd"))
+# setGeneric("d.rd", function(object) standardGeneric("d.rd"))
+# if(!isGeneric("p.rd"))
+# setGeneric("p.rd", function(object) standardGeneric("p.rd"))
+# if(!isGeneric("q.rd"))
+# setGeneric("q.rd", function(object) standardGeneric("q.rd"))
+# if(!isGeneric("plot.rd"))
+# setGeneric("plot.rd", function(x, ...) standardGeneric("plot.rd"))
if(!isGeneric("rRd"))
Modified: pkg/distrEllipse/R/SphericalDistribution.R
===================================================================
--- pkg/distrEllipse/R/SphericalDistribution.R 2018-07-08 14:24:06 UTC (rev 1181)
+++ pkg/distrEllipse/R/SphericalDistribution.R 2018-07-08 14:24:29 UTC (rev 1182)
@@ -42,28 +42,29 @@
## wrappers:
-setMethod("plot.rd", "SphericalDistribution",
- function(x, ... ){ .Deprecated("plotRd")
- plot(x at radDistr,...)})
-setMethod("r.rd", "SphericalDistribution", function(object) {
- .Deprecated("rRd")
- r(object at radDistr)})
-setMethod("d.rd", "SphericalDistribution", function(object) {
- .Deprecated("dRd")
- d(object at radDistr)})
-setMethod("p.rd", "SphericalDistribution", function(object) {
- .Deprecated("pRd")
- p(object at radDistr)})
-setMethod("q.rd", "SphericalDistribution", function(object) {
- .Deprecated("qRd")
- q(object at radDistr)})
+## Defunct accessors
+#setMethod("plot.rd", "SphericalDistribution",
+# function(x, ... ){ .Deprecated("plotRd")
+# plot(x at radDistr,...)})
+#setMethod("r.rd", "SphericalDistribution", function(object) {
+# .Deprecated("rRd")
+# r(object at radDistr)})
+#setMethod("d.rd", "SphericalDistribution", function(object) {
+# .Deprecated("dRd")
+# d(object at radDistr)})
+#setMethod("p.rd", "SphericalDistribution", function(object) {
+# .Deprecated("pRd")
+# p(object at radDistr)})
+#setMethod("q.rd", "SphericalDistribution", function(object) {
+# .Deprecated("qRd")
+# q.l(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))
+setMethod("qRd", "SphericalDistribution", function(object) q.l(object at radDistr))
## functionals:
Modified: pkg/distrEllipse/inst/NEWS
===================================================================
--- pkg/distrEllipse/inst/NEWS 2018-07-08 14:24:06 UTC (rev 1181)
+++ pkg/distrEllipse/inst/NEWS 2018-07-08 14:24:29 UTC (rev 1182)
@@ -8,6 +8,20 @@
information)
##############
+v 2.7
+##############
+
+user-visible CHANGES:
+
+defunct:
++ plot.rd, r.rd, d.rd, p.rd, and q.rd are replaced by
+ plotRd, rRd, dRd, pRd, and qRd (to avoid clashes with S3 inheritance)
+
+under the hood:
++ wherever possible also use q.l internally instead of q to
+ provide functionality in IRKernel
+
+##############
v 2.6
##############
@@ -18,7 +32,6 @@
deprecated:
+ plot.rd, r.rd, d.rd, p.rd, and q.rd will soon be replaced by the upper aliases
-
under the hood:
+ removed ::: internal dependencies (within distr-Fam of pkgs) by copying
Modified: pkg/distrEllipse/man/0distrEllipse-package.Rd
===================================================================
--- pkg/distrEllipse/man/0distrEllipse-package.Rd 2018-07-08 14:24:06 UTC (rev 1181)
+++ pkg/distrEllipse/man/0distrEllipse-package.Rd 2018-07-08 14:24:29 UTC (rev 1182)
@@ -12,8 +12,8 @@
\details{
\tabular{ll}{
Package: \tab distrEllipse \cr
-Version: \tab 2.6.3 \cr
-Date: \tab 2017-04-23 \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 1138 \cr
+SVNRevision: \tab 1096 \cr
}
}
\section{Classes}{
Modified: pkg/distrEllipse/man/SphericalDistribution-class.Rd
===================================================================
--- pkg/distrEllipse/man/SphericalDistribution-class.Rd 2018-07-08 14:24:06 UTC (rev 1181)
+++ pkg/distrEllipse/man/SphericalDistribution-class.Rd 2018-07-08 14:24:29 UTC (rev 1182)
@@ -12,11 +12,6 @@
\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}
-\alias{p.rd,SphericalDistribution-method}
-\alias{q.rd,SphericalDistribution-method}
\alias{radDistr}
\alias{radDistr<-}
\alias{plotRd}
@@ -108,16 +103,16 @@
\item{radDistr}{\code{signature(object = "SphericalDistribution")}: access method for
slot \code{radDistr}. }
\item{rRd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{r} of slot \code{radDistr}. From version 2.6 on, replaces deprecated
+ slot \code{r} of slot \code{radDistr}. From version 2.7 on, replaces defunct
\code{r.Rd} to avoid clashes with S3-method inheritance. }
\item{dRd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{d} of slot \code{radDistr}. From version 2.6 on, replaces deprecated
+ slot \code{d} of slot \code{radDistr}. From version 2.7 on, replaces defunct
\code{d.Rd} to avoid clashes with S3-method inheritance. }
\item{pRd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{p} of slot \code{radDistr}. From version 2.6 on, replaces deprecated
+ slot \code{p} of slot \code{radDistr}. From version 2.7 on, replaces defunct
\code{p.Rd} to avoid clashes with S3-method inheritance. }
\item{qRd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for
- slot \code{q} of slot \code{radDistr}. From version 2.6 on, replaces deprecated
+ slot \code{q} of slot \code{radDistr}. From version 2.7 on, replaces defunct
\code{q.Rd} to avoid clashes with S3-method inheritance. }
\item{plotRd}{\code{signature(x = "SphericalDistribution")}: utility; calls \code{plot}
for slot \code{radDistr}. From version 2.6 on, replaces deprecated
More information about the Distr-commits
mailing list