From noreply at r-forge.r-project.org Thu Sep 1 10:56:43 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 1 Sep 2016 10:56:43 +0200 (CEST) Subject: [Distr-commits] r1115 - branches/distr-2.7/pkg/distr/man Message-ID: <20160901085643.5009E187E56@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-01 10:56:42 +0200 (Thu, 01 Sep 2016) New Revision: 1115 Modified: branches/distr-2.7/pkg/distr/man/Arcsine-class.Rd Log: bug report ... Modified: branches/distr-2.7/pkg/distr/man/Arcsine-class.Rd =================================================================== --- branches/distr-2.7/pkg/distr/man/Arcsine-class.Rd 2016-08-04 13:24:00 UTC (rev 1114) +++ branches/distr-2.7/pkg/distr/man/Arcsine-class.Rd 2016-09-01 08:56:42 UTC (rev 1115) @@ -6,9 +6,9 @@ \title{Class "Arcsine"} \description{ The Arcsine distribution has density - \deqn{f(x)=\frac{1}{\pi \sqrt{1-x^2)}% + \deqn{f(x)=\frac{1}{\pi \sqrt{1-x^2}% }}{1/sqrt(1+x^2)/pi} - for \eqn{-1 \le x \le 1}{-1 <= x <= 1}. + for \eqn{-1 < x < 1}{-1 < x < 1}. } \section{Objects from the Class}{ From noreply at r-forge.r-project.org Sun Sep 4 10:37:13 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 10:37:13 +0200 (CEST) Subject: [Distr-commits] r1116 - in pkg/distrEllipse: . R man Message-ID: <20160904083713.D1DA7183B2F@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 10:37:13 +0200 (Sun, 04 Sep 2016) New Revision: 1116 Added: pkg/distrEllipse/man/distrEllipse-deprecated.Rd Modified: pkg/distrEllipse/DESCRIPTION pkg/distrEllipse/R/SphericalDistribution.R pkg/distrEllipse/man/SphericalDistribution-class.Rd Log: distrEllipse Deprecated message inserted Modified: pkg/distrEllipse/DESCRIPTION =================================================================== --- pkg/distrEllipse/DESCRIPTION 2016-09-01 08:56:42 UTC (rev 1115) +++ pkg/distrEllipse/DESCRIPTION 2016-09-04 08:37:13 UTC (rev 1116) @@ -1,6 +1,6 @@ Package: distrEllipse -Version: 2.6.1 -Date: 2016-04-23 +Version: 2.6.2 +Date: 2016-09-04 Title: S4 Classes for Elliptically Contoured Distributions Description: Distribution (S4-)classes for elliptically contoured distributions (based on package 'distr'). Modified: pkg/distrEllipse/R/SphericalDistribution.R =================================================================== --- pkg/distrEllipse/R/SphericalDistribution.R 2016-09-01 08:56:42 UTC (rev 1115) +++ pkg/distrEllipse/R/SphericalDistribution.R 2016-09-04 08:37:13 UTC (rev 1116) @@ -43,11 +43,20 @@ ## wrappers: setMethod("plot.rd", "SphericalDistribution", - function(x, ... ) plot(x at radDistr,...)) -setMethod("r.rd", "SphericalDistribution", function(object) r(object at radDistr)) -setMethod("d.rd", "SphericalDistribution", function(object) d(object at radDistr)) -setMethod("p.rd", "SphericalDistribution", function(object) p(object at radDistr)) -setMethod("q.rd", "SphericalDistribution", function(object) q(object at radDistr)) + 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)} setMethod("plotRd", "SphericalDistribution", function(x, ... ) plot(x at radDistr,...)) Modified: pkg/distrEllipse/man/SphericalDistribution-class.Rd =================================================================== --- pkg/distrEllipse/man/SphericalDistribution-class.Rd 2016-09-01 08:56:42 UTC (rev 1115) +++ pkg/distrEllipse/man/SphericalDistribution-class.Rd 2016-09-04 08:37:13 UTC (rev 1116) @@ -19,11 +19,6 @@ \alias{q.rd,SphericalDistribution-method} \alias{radDistr} \alias{radDistr<-} -\alias{plot.rd} -\alias{r.rd} -\alias{d.rd} -\alias{p.rd} -\alias{q.rd} \alias{plotRd} \alias{rRd} \alias{dRd} @@ -112,25 +107,21 @@ always returns the unit matrix (in the respective dimension). } \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}. 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}. 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}. 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}. 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}. 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{rRd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{r} of slot \code{radDistr}. From version 2.6 on, replaces deprecated + \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 + \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 + \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 + \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 + \code{plot.Rd} 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}}. } \item{show}{\code{signature(object = "SphericalDistribution")}: Added: pkg/distrEllipse/man/distrEllipse-deprecated.Rd =================================================================== --- pkg/distrEllipse/man/distrEllipse-deprecated.Rd (rev 0) +++ pkg/distrEllipse/man/distrEllipse-deprecated.Rd 2016-09-04 08:37:13 UTC (rev 1116) @@ -0,0 +1,35 @@ +\name{distrEllipse-deprecated} +\alias{distrEllipse-deprecated} +\alias{plot.rd} +\alias{r.rd} +\alias{d.rd} +\alias{p.rd} +\alias{q.rd} +\title{Deprecated Functions in Package \pkg{distrEllipse}} +\description{ + These functions are provided for compatibility with older versions of + \pkg{distrEllipse} only, and may be defunct as soon as the next release. +} +\section{Methods}{ + From version 2.6 on, we deprecate former versions of S4-methods + \code{rRd}, \code{dRd}, \code{pRd}, \code{qRd}, and \code{plotRd} of style + .rd due to clashes with S3-method inheritance. + More specifically, this concerns the following methods: + \describe{ + \item{r.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{r} of slot \code{radDistr}.} + \item{d.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{d} of slot \code{radDistr}. } + \item{p.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{p} of slot \code{radDistr}. } + \item{q.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{q} of slot \code{radDistr}. } + \item{plot.rd}{\code{signature(x = "SphericalDistribution")}: utility; calls \code{plot} + for slot \code{radDistr}. } + } +} + +\seealso{ + \code{\link{Deprecated}} +} +\keyword{misc} From noreply at r-forge.r-project.org Sun Sep 4 10:38:02 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 10:38:02 +0200 (CEST) Subject: [Distr-commits] r1117 - in branches/distr-2.7/pkg/distrEllipse: R man Message-ID: <20160904083802.6CA641811C9@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 10:38:02 +0200 (Sun, 04 Sep 2016) New Revision: 1117 Added: branches/distr-2.7/pkg/distrEllipse/man/distrEllipse-deprecated.Rd Modified: branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd Log: ported Deprecated message in distrEllipse from trunk to branch 2.7 Modified: branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R =================================================================== --- branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R 2016-09-04 08:37:13 UTC (rev 1116) +++ branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R 2016-09-04 08:38:02 UTC (rev 1117) @@ -43,30 +43,20 @@ ## wrappers: setMethod("plot.rd", "SphericalDistribution", - function(x, ... ){ .Deprecated("plotRd", package="distrEllipse", - msg = gettext("To avoid clashes with S3 method dispatch, - this function will soon be replaced by 'plotRd'")) + function(x, ... ){ .Deprecated("plotRd") plot(x at radDistr,...)}) -setMethod("r.rd", "SphericalDistribution", function(object){ -.Deprecated("rRd", package="distrEllipse", - msg = gettext("To avoid clashes with S3 method dispatch, - this function will soon be replaced by 'rRd'")) - r(object at radDistr)}) -setMethod("d.rd", "SphericalDistribution", function(object){ -.Deprecated("dRd", package="distrEllipse", - msg = gettext("To avoid clashes with S3 method dispatch, - this function will soon be replaced by 'dRd'")) -d(object at radDistr)}) -setMethod("p.rd", "SphericalDistribution", function(object){ -.Deprecated("pRd", package="distrEllipse", - msg = gettext("To avoid clashes with S3 method dispatch, - this function will soon be replaced by 'pRd'")) - p(object at radDistr)}) -setMethod("q.rd", "SphericalDistribution", function(object){ -.Deprecated("qRd", package="distrEllipse", - msg = gettext("To avoid clashes with S3 method dispatch, - this function will soon be replaced by 'qRd'")) - q(object 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)} setMethod("plotRd", "SphericalDistribution", function(x, ... ) plot(x at radDistr,...)) Modified: branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd =================================================================== --- branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd 2016-09-04 08:37:13 UTC (rev 1116) +++ branches/distr-2.7/pkg/distrEllipse/man/SphericalDistribution-class.Rd 2016-09-04 08:38:02 UTC (rev 1117) @@ -19,11 +19,6 @@ \alias{q.rd,SphericalDistribution-method} \alias{radDistr} \alias{radDistr<-} -\alias{plot.rd} -\alias{r.rd} -\alias{d.rd} -\alias{p.rd} -\alias{q.rd} \alias{plotRd} \alias{rRd} \alias{dRd} @@ -112,25 +107,21 @@ always returns the unit matrix (in the respective dimension). } \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}. 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}. 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}. 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}. 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}. 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{rRd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{r} of slot \code{radDistr}. From version 2.6 on, replaces deprecated + \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 + \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 + \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 + \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 + \code{plot.Rd} 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}}. } \item{show}{\code{signature(object = "SphericalDistribution")}: Added: branches/distr-2.7/pkg/distrEllipse/man/distrEllipse-deprecated.Rd =================================================================== --- branches/distr-2.7/pkg/distrEllipse/man/distrEllipse-deprecated.Rd (rev 0) +++ branches/distr-2.7/pkg/distrEllipse/man/distrEllipse-deprecated.Rd 2016-09-04 08:38:02 UTC (rev 1117) @@ -0,0 +1,35 @@ +\name{distrEllipse-deprecated} +\alias{distrEllipse-deprecated} +\alias{plot.rd} +\alias{r.rd} +\alias{d.rd} +\alias{p.rd} +\alias{q.rd} +\title{Deprecated Functions in Package \pkg{distrEllipse}} +\description{ + These functions are provided for compatibility with older versions of + \pkg{distrEllipse} only, and may be defunct as soon as the next release. +} +\section{Methods}{ + From version 2.6 on, we deprecate former versions of S4-methods + \code{rRd}, \code{dRd}, \code{pRd}, \code{qRd}, and \code{plotRd} of style + .rd due to clashes with S3-method inheritance. + More specifically, this concerns the following methods: + \describe{ + \item{r.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{r} of slot \code{radDistr}.} + \item{d.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{d} of slot \code{radDistr}. } + \item{p.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{p} of slot \code{radDistr}. } + \item{q.rd}{\code{signature(object = "SphericalDistribution")}: wrapped access method for + slot \code{q} of slot \code{radDistr}. } + \item{plot.rd}{\code{signature(x = "SphericalDistribution")}: utility; calls \code{plot} + for slot \code{radDistr}. } + } +} + +\seealso{ + \code{\link{Deprecated}} +} +\keyword{misc} From noreply at r-forge.r-project.org Sun Sep 4 13:09:00 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 13:09:00 +0200 (CEST) Subject: [Distr-commits] r1118 - pkg/distrEx/R Message-ID: <20160904110900.38D9618826A@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 13:08:59 +0200 (Sun, 04 Sep 2016) New Revision: 1118 Modified: pkg/distrEx/R/CvMDist.R Log: distrEx: fixed a bug in CvMDist Modified: pkg/distrEx/R/CvMDist.R =================================================================== --- pkg/distrEx/R/CvMDist.R 2016-09-04 08:38:02 UTC (rev 1117) +++ pkg/distrEx/R/CvMDist.R 2016-09-04 11:08:59 UTC (rev 1118) @@ -28,8 +28,9 @@ function(e1, e2, mu = e1, ...) { o.warn <- getOption("warn"); options(warn = -1) on.exit(options(warn=o.warn)) - if(identical(mu,e2)) - return(.newCvMDist(e1,e2)) + if(identical(mu,e2)){ + if(is(e2, "AbscontDistribution")) + return(.newCvMDist(e1,e2)) } e10 <- DiscreteDistribution(e1) if(identical(mu,e1)) mu <- e10 CvMDist(e1 = e10, e2 = e2, mu = mu, ...) From noreply at r-forge.r-project.org Sun Sep 4 13:11:42 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 13:11:42 +0200 (CEST) Subject: [Distr-commits] r1119 - pkg/distrMod/R Message-ID: <20160904111142.75FF2187AC8@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 13:11:42 +0200 (Sun, 04 Sep 2016) New Revision: 1119 Modified: pkg/distrMod/R/MDEstimator.R Log: distrMod: fixed an issue with MDEstimator and validParameter Modified: pkg/distrMod/R/MDEstimator.R =================================================================== --- pkg/distrMod/R/MDEstimator.R 2016-09-04 11:08:59 UTC (rev 1118) +++ pkg/distrMod/R/MDEstimator.R 2016-09-04 11:11:42 UTC (rev 1119) @@ -24,8 +24,9 @@ if(paramDepDist) dots$thetaPar <-NULL + distanceFctWithoutVal <- function(e1,e2,check.validity=NULL,...) distance(e1,e2,...) ## manipulation of the arg list to method mceCalc - argList <- c(list(x = x, PFam = ParamFamily, criterion = distance, + argList <- c(list(x = x, PFam = ParamFamily, criterion = distanceFctWithoutVal, startPar = startPar, penalty = penalty, crit.name = dist.name, withthetaPar = paramDepDist)) From noreply at r-forge.r-project.org Sun Sep 4 13:12:50 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 13:12:50 +0200 (CEST) Subject: [Distr-commits] r1120 - in pkg/distrMod: . inst Message-ID: <20160904111250.4CE48186E7E@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 13:12:50 +0200 (Sun, 04 Sep 2016) New Revision: 1120 Modified: pkg/distrMod/DESCRIPTION pkg/distrMod/inst/NEWS Log: prepared distrMod for release Modified: pkg/distrMod/DESCRIPTION =================================================================== --- pkg/distrMod/DESCRIPTION 2016-09-04 11:11:42 UTC (rev 1119) +++ pkg/distrMod/DESCRIPTION 2016-09-04 11:12:50 UTC (rev 1120) @@ -1,6 +1,6 @@ Package: distrMod -Version: 2.6 -Date: 2016-04-23 +Version: 2.6.1 +Date: 2016-09-04 Title: Object Oriented Implementation of Probability Models Description: Implements S4 classes for probability models based on packages 'distr' and 'distrEx'. Modified: pkg/distrMod/inst/NEWS =================================================================== --- pkg/distrMod/inst/NEWS 2016-09-04 11:11:42 UTC (rev 1119) +++ pkg/distrMod/inst/NEWS 2016-09-04 11:12:50 UTC (rev 1120) @@ -64,6 +64,7 @@ BUGFIXES: ++ fixed an issue with MDEstimator and validParameter + fixed issue with slot withPosRestr in ParamFamParameter.R + fixed issue with check.validity (reported by B.Spangl) + fixed some minor issue in existsPIC (in case we get 0 matrix, and less strict tolerance) From noreply at r-forge.r-project.org Sun Sep 4 13:58:04 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 13:58:04 +0200 (CEST) Subject: [Distr-commits] r1121 - in branches/distr-2.7/pkg: distrEx/R distrMod/R Message-ID: <20160904115804.78552188242@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 13:58:03 +0200 (Sun, 04 Sep 2016) New Revision: 1121 Modified: branches/distr-2.7/pkg/distrEx/R/CvMDist.R branches/distr-2.7/pkg/distrMod/R/MDEstimator.R Log: Ported changes from trunk to branch 2.7 Modified: branches/distr-2.7/pkg/distrEx/R/CvMDist.R =================================================================== --- branches/distr-2.7/pkg/distrEx/R/CvMDist.R 2016-09-04 11:12:50 UTC (rev 1120) +++ branches/distr-2.7/pkg/distrEx/R/CvMDist.R 2016-09-04 11:58:03 UTC (rev 1121) @@ -28,8 +28,9 @@ function(e1, e2, mu = e1, ...) { o.warn <- getOption("warn"); options(warn = -1) on.exit(options(warn=o.warn)) - if(identical(mu,e2)) - return(.newCvMDist(e1,e2)) + if(identical(mu,e2)){ + if(is(e2, "AbscontDistribution")) + return(.newCvMDist(e1,e2)) } e10 <- DiscreteDistribution(e1) if(identical(mu,e1)) mu <- e10 CvMDist(e1 = e10, e2 = e2, mu = mu, ...) Modified: branches/distr-2.7/pkg/distrMod/R/MDEstimator.R =================================================================== --- branches/distr-2.7/pkg/distrMod/R/MDEstimator.R 2016-09-04 11:12:50 UTC (rev 1120) +++ branches/distr-2.7/pkg/distrMod/R/MDEstimator.R 2016-09-04 11:58:03 UTC (rev 1121) @@ -24,8 +24,9 @@ if(paramDepDist) dots$thetaPar <-NULL + distanceFctWithoutVal <- function(e1,e2,check.validity=NULL,...) distance(e1,e2,...) ## manipulation of the arg list to method mceCalc - argList <- c(list(x = x, PFam = ParamFamily, criterion = distance, + argList <- c(list(x = x, PFam = ParamFamily, criterion = distanceFctWithoutVal, startPar = startPar, penalty = penalty, crit.name = dist.name, withthetaPar = paramDepDist)) From noreply at r-forge.r-project.org Sun Sep 4 14:00:45 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 14:00:45 +0200 (CEST) Subject: [Distr-commits] r1122 - in pkg/distrMod: . tests/Examples Message-ID: <20160904120045.4F815185177@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 14:00:44 +0200 (Sun, 04 Sep 2016) New Revision: 1122 Modified: pkg/distrMod/DESCRIPTION pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save Log: prepared distrMod for 2.6.2 (after release of RobExtremes) Modified: pkg/distrMod/DESCRIPTION =================================================================== --- pkg/distrMod/DESCRIPTION 2016-09-04 11:58:03 UTC (rev 1121) +++ pkg/distrMod/DESCRIPTION 2016-09-04 12:00:44 UTC (rev 1122) @@ -1,5 +1,5 @@ Package: distrMod -Version: 2.6.1 +Version: 2.6.2 Date: 2016-09-04 Title: Object Oriented Implementation of Probability Models Description: Implements S4 classes for probability models based on packages 'distr' and Modified: pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save =================================================================== --- pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2016-09-04 11:58:03 UTC (rev 1121) +++ pkg/distrMod/tests/Examples/distrMod-Ex.Rout.save 2016-09-04 12:00:44 UTC (rev 1122) @@ -1,5 +1,5 @@ -R Under development (unstable) (2016-04-22 r70532) -- "Unsuffered Consequences" +R Under development (unstable) (2016-08-31 r71184) -- "Unsuffered Consequences" Copyright (C) 2016 The R Foundation for Statistical Computing Platform: i386-w64-mingw32/i386 (32-bit) @@ -21,6 +21,18 @@ > source(file.path(R.home("share"), "R", "examples-header.R")) > options(warn = 1) > options(pager = "console") +> base::assign(".ExTimings", "distrMod-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') +> +> ### * > library('distrMod') Loading required package: distr Loading required package: startupmsg @@ -33,7 +45,7 @@ Loading required package: SweaveListingUtils :SweaveListingUtils> Utilities for Sweave Together with :SweaveListingUtils> TeX 'listings' Package (version -:SweaveListingUtils> 0.7.3) +:SweaveListingUtils> 0.7.5) :SweaveListingUtils> :SweaveListingUtils> NOTE: Support for this package :SweaveListingUtils> will stop soon. @@ -116,7 +128,7 @@ IQR, mad, median, var Loading required package: RandVar -:RandVar> Implementation of Random Variables (version 0.9.4) +:RandVar> Implementation of Random Variables (version 1.0) :RandVar> :RandVar> For more information see ?"RandVar", NEWS("RandVar"), as :RandVar> well as @@ -127,7 +139,7 @@ Loading required package: MASS Loading required package: stats4 :distrMod> Object Oriented Implementation of Probability Models -:distrMod> (version 2.6) +:distrMod> (version 2.6.1) :distrMod> :distrMod> Some functions from pkg's 'base' and 'stats' are :distrMod> intentionally masked ---see distrModMASK(). @@ -168,6 +180,7 @@ > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: BetaFamily > ### Title: Generating function for Beta families > ### Aliases: BetaFamily @@ -219,12 +232,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("BetaFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("BiasType-class") > ### * BiasType-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: BiasType-class > ### Title: Bias Type > ### Aliases: BiasType-class name,BiasType-method name<-,BiasType-method @@ -238,12 +254,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("BiasType-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("BinomFamily") > ### * BinomFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: BinomFamily > ### Title: Generating function for Binomial families > ### Aliases: BinomFamily @@ -292,12 +311,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("BinomFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("CauchyLocationScaleFamily") > ### * CauchyLocationScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: CauchyLocationScaleFamily > ### Title: Generating function for Cauchy location and scale families > ### Aliases: CauchyLocationScaleFamily @@ -353,12 +375,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("CauchyLocationScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("Confint-class") > ### * Confint-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: Confint-class > ### Title: Confint-class > ### Aliases: Confint-class type,Confint-method call.estimate @@ -432,12 +457,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("Confint-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("Estimate-class") > ### * Estimate-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: Estimate-class > ### Title: Estimate-class. > ### Aliases: Estimate-class name,Estimate-method name<-,Estimate-method @@ -476,12 +504,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("Estimate-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("Estimator") > ### * Estimator > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: Estimator > ### Title: Function to compute estimates > ### Aliases: Estimator @@ -517,12 +548,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("Estimator", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("EvenSymmetric-class") > ### * EvenSymmetric-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: EvenSymmetric-class > ### Title: Class for Even Functions > ### Aliases: EvenSymmetric-class @@ -537,12 +571,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("EvenSymmetric-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("EvenSymmetric") > ### * EvenSymmetric > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: EvenSymmetric > ### Title: Generating function for EvenSymmetric-class > ### Aliases: EvenSymmetric @@ -566,12 +603,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("EvenSymmetric", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("ExpScaleFamily") > ### * ExpScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: ExpScaleFamily > ### Title: Generating function for exponential scale families > ### Aliases: ExpScaleFamily @@ -607,7 +647,7 @@ { ((x - 0)/1 * LogDeriv((x - 0)/1) - 1)/1 } - + > checkL2deriv(E1) precision of centering: -1.51181e-06 @@ -625,12 +665,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("ExpScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("FunSymmList-class") > ### * FunSymmList-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: FunSymmList-class > ### Title: List of Symmetries for a List of Functions > ### Aliases: FunSymmList-class @@ -658,12 +701,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("FunSymmList-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("FunSymmList") > ### * FunSymmList > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: FunSymmList > ### Title: Generating function for FunSymmList-class > ### Aliases: FunSymmList @@ -700,12 +746,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("FunSymmList", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("GammaFamily") > ### * GammaFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: GammaFamily > ### Title: Generating function for Gamma families > ### Aliases: GammaFamily @@ -757,12 +806,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("GammaFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("InfoNorm") > ### * InfoNorm > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: InfoNorm > ### Title: Generating function for InfoNorm-class > ### Aliases: InfoNorm @@ -783,8 +835,8 @@ Slot "fct": function (x) QuadFormNorm(x, A = A) - - + + > > ## The function is currently defined as @@ -796,12 +848,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("InfoNorm", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2GroupFamily-class") > ### * L2GroupFamily-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2GroupParamFamily-class > ### Title: L2 differentiable parametric group family > ### Aliases: L2GroupParamFamily-class LogDeriv @@ -816,12 +871,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2GroupFamily-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2LocationFamily-class") > ### * L2LocationFamily-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2LocationFamily-class > ### Title: L2 differentiable parametric group family > ### Aliases: L2LocationFamily-class @@ -834,12 +892,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2LocationFamily-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2LocationFamily") > ### * L2LocationFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2LocationFamily > ### Title: Generating function for L2LocationFamily-class > ### Aliases: L2LocationFamily @@ -852,12 +913,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2LocationFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2LocationScaleFamily-class") > ### * L2LocationScaleFamily-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2LocationScaleFamily-class > ### Title: L2 differentiable parametric group family > ### Aliases: L2LocationScaleFamily-class @@ -870,12 +934,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2LocationScaleFamily-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2LocationScaleFamily") > ### * L2LocationScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2LocationScaleFamily > ### Title: Generating function for L2LocationScaleFamily-class > ### Aliases: L2LocationScaleFamily @@ -888,12 +955,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2LocationScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2LocationUnknownScaleFamily") > ### * L2LocationUnknownScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2LocationUnknownScaleFamily > ### Title: Generating function for L2LocationScaleFamily-class in nuisance > ### situation @@ -907,12 +977,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2LocationUnknownScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2ParamFamily-class") > ### * L2ParamFamily-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2ParamFamily-class > ### Title: L2 differentiable parametric family > ### Aliases: plot plot-methods L2ParamFamily-class FisherInfo @@ -945,12 +1018,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2ParamFamily-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2ParamFamily") > ### * L2ParamFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2ParamFamily > ### Title: Generating function for L2ParamFamily-class > ### Aliases: L2ParamFamily @@ -963,12 +1039,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2ParamFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2ScaleFamily-class") > ### * L2ScaleFamily-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2ScaleFamily-class > ### Title: L2 differentiable parametric group family > ### Aliases: L2ScaleFamily-class @@ -981,12 +1060,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2ScaleFamily-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2ScaleFamily") > ### * L2ScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2ScaleFamily > ### Title: Generating function for L2ScaleFamily-class > ### Aliases: L2ScaleFamily @@ -999,12 +1081,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2ScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("L2ScaleUnknownLocationFamily") > ### * L2ScaleUnknownLocationFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: L2ScaleUnknownLocationFamily > ### Title: Generating function for L2LocationScaleFamily-class in nuisance > ### situation @@ -1018,12 +1103,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("L2ScaleUnknownLocationFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("LnormScaleFamily") > ### * LnormScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: LnormScaleFamily > ### Title: Generating function for lognormal scale families > ### Aliases: LnormScaleFamily @@ -1062,7 +1150,7 @@ { ((x - 0)/1 * LogDeriv((x - 0)/1) - 1)/1 } - + > checkL2deriv(L1) precision of centering: -0.003003394 @@ -1080,12 +1168,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("LnormScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("MCEstimate-class") > ### * MCEstimate-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: MCEstimate-class > ### Title: MCEstimate-class. > ### Aliases: MCEstimate-class criterion criterion,MCEstimate-method @@ -1113,10 +1204,10 @@ samplesize: 50 estimate: scale shape -0.2983286 4.6547001 +0.3398645 4.2654569 Criterion: Kolmogorov distance - 1e+20 + 0.06350364 > (m <- MLEstimator(x, G)) Evaluations of Maximum likelihood estimate: ------------------------------------------- @@ -1142,6 +1233,8 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("MCEstimate-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > graphics::par(get("par.postscript", pos = 'CheckExEnv')) > cleanEx() > nameEx("MCEstimator") @@ -1149,6 +1242,7 @@ > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: MCEstimator > ### Title: Function to compute minimum criterion estimates > ### Aliases: MCEstimator @@ -1275,12 +1369,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("MCEstimator", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("MDEstimator") > ### * MDEstimator > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: MDEstimator > ### Title: Function to compute minimum distance estimates > ### Aliases: MDEstimator @@ -1304,10 +1401,10 @@ samplesize: 50 estimate: scale shape -0.2983286 4.6547001 +0.3398645 4.2654569 Criterion: Kolmogorov distance - 1e+20 + 0.06350364 > > ## von Mises minimum distance estimator with default mu > MDEstimator(x = x, ParamFamily = G, distance = CvMDist) @@ -1319,10 +1416,10 @@ samplesize: 50 estimate: scale shape -0.2983286 4.6547001 +0.3401751 4.1262425 Criterion: CvM distance - 1e+20 + 0.02931495 > > ## von Mises minimum distance estimator with default mu > MDEstimator(x = x, ParamFamily = G, distance = CvMDist, @@ -1335,15 +1432,15 @@ samplesize: 50 estimate: scale shape - 0.29832855 4.65470009 - (0.07558202) (1.12072166) + 0.34017514 4.12624252 + (0.08644894) (0.98992393) asymptotic (co)variance (multiplied with samplesize): scale shape -scale 0.2856321 -3.958779 -shape -3.9587793 62.800852 +scale 0.3736709 -3.963877 +shape -3.9638774 48.997469 Criterion: CvM distance - 1e+20 + 0.02931495 > ## von Mises minimum distance estimator with mu = N(0,1) > MDEstimator(x = x, ParamFamily = G, distance = CvMDist, mu = Norm()) Evaluations of Minimum CvM distance estimate: @@ -1354,10 +1451,10 @@ samplesize: 50 estimate: scale shape -0.2983286 4.6547001 +0.3543892 4.0587606 Criterion: CvM distance - 1e+20 + 0.01586171 > > ## Total variation minimum distance estimator > ## gamma distributions are discretized @@ -1400,12 +1497,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("MDEstimator", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("MLEstimator") > ### * MLEstimator > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: MLEstimator > ### Title: Function to compute maximum likelihood estimates > ### Aliases: MLEstimator @@ -1648,6 +1748,8 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("MLEstimator", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > graphics::par(get("par.postscript", pos = 'CheckExEnv')) > cleanEx() > nameEx("NBinomFamily") @@ -1655,6 +1757,7 @@ > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NbinomFamily > ### Title: Generating function for Nbinomial families > ### Aliases: NbinomFamily NbinomwithSizeFamily NbinomMeanSizeFamily @@ -1772,12 +1875,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NBinomFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NonSymmetric-class") > ### * NonSymmetric-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NonSymmetric-class > ### Title: Class for Non-symmetric Functions > ### Aliases: NonSymmetric-class @@ -1791,12 +1897,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NonSymmetric-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NonSymmetric") > ### * NonSymmetric > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NonSymmetric > ### Title: Generating function for NonSymmetric-class > ### Aliases: NonSymmetric @@ -1817,12 +1926,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NonSymmetric", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NormLocationFamily") > ### * NormLocationFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NormLocationFamily > ### Title: Generating function for normal location families > ### Aliases: NormLocationFamily @@ -1858,12 +1970,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NormLocationFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NormLocationScaleFamily") > ### * NormLocationScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NormLocationScaleFamily > ### Title: Generating function for normal location and scale families > ### Aliases: NormLocationScaleFamily @@ -1915,12 +2030,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NormLocationScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NormLocationUnknownScaleFamily") > ### * NormLocationUnknownScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NormLocationUnknownScaleFamily > ### Title: Generating function for normal location families with unknown > ### scale as nuisance @@ -1974,12 +2092,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NormLocationUnknownScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NormScaleFamily") > ### * NormScaleFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NormScaleFamily > ### Title: Generating function for normal scale families > ### Aliases: NormScaleFamily @@ -2029,12 +2150,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NormScaleFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NormScaleUnknownLocationFamily") > ### * NormScaleUnknownLocationFamily > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NormScaleUnknownLocationFamily > ### Title: Generating function for normal scale families with unknown > ### location as nuisance @@ -2088,12 +2212,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NormScaleUnknownLocationFamily", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NormType-class") > ### * NormType-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NormType-class > ### Title: Norm Type > ### Aliases: NormType-class name,NormType-method name<-,NormType-method fct @@ -2110,19 +2237,22 @@ return(abs(x)) else return(sqrt(colSums(x^2))) } - + > name(EuclNorm) [1] "EuclideanNorm" > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NormType-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("NormType") > ### * NormType > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: NormType > ### Title: Generating function for NormType-class > ### Aliases: NormType @@ -2142,18 +2272,21 @@ return(abs(x)) else return(sqrt(colSums(x^2))) } - + > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("NormType", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("OddSymmetric-class") > ### * OddSymmetric-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: OddSymmetric-class > ### Title: Class for Odd Functions > ### Aliases: OddSymmetric-class @@ -2168,12 +2301,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("OddSymmetric-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("OddSymmetric") > ### * OddSymmetric > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: OddSymmetric > ### Title: Generating function for OddSymmetric-class > ### Aliases: OddSymmetric @@ -2197,12 +2333,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("OddSymmetric", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("ParamFamParameter-class") > ### * ParamFamParameter-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: ParamFamParameter-class > ### Title: Parameter of a parametric family of probability measures > ### Aliases: ParamFamParameter-class ParamWithScaleFamParameter-class @@ -2231,12 +2370,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("ParamFamParameter-class", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("ParamFamParameter") > ### * ParamFamParameter > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: ParamFamParameter > ### Title: Generating function for ParamFamParameter-class > ### Aliases: ParamFamParameter @@ -2257,12 +2399,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") +> base::cat("ParamFamParameter", base::get(".format_ptime", pos = 'CheckExEnv')(get(".dptime", pos = "CheckExEnv")), "\n", file=base::get(".ExTimings", pos = 'CheckExEnv'), append=TRUE, sep="\t") > cleanEx() > nameEx("ParamFamily-class") > ### * ParamFamily-class > > flush(stderr()); flush(stdout()) > +> base::assign(".ptime", proc.time(), pos = "CheckExEnv") > ### Name: ParamFamily-class > ### Title: Parametric family of probability measures. > ### Aliases: ParamFamily-class main,ParamFamily-method @@ -2280,12 +2425,15 @@ > > > +> base::assign(".dptime", (proc.time() - get(".ptime", pos = "CheckExEnv")), pos = "CheckExEnv") [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/distr -r 1122 From noreply at r-forge.r-project.org Sun Sep 4 14:01:23 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 14:01:23 +0200 (CEST) Subject: [Distr-commits] r1123 - pkg/utils Message-ID: <20160904120123.1967C188242@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 14:01:22 +0200 (Sun, 04 Sep 2016) New Revision: 1123 Modified: pkg/utils/finde.R Log: Some new examples of finde() in utils Modified: pkg/utils/finde.R =================================================================== --- pkg/utils/finde.R 2016-09-04 12:00:44 UTC (rev 1122) +++ pkg/utils/finde.R 2016-09-04 12:01:22 UTC (rev 1123) @@ -23,6 +23,10 @@ #finde(x="Wow6432Node", dir ="C:/R/devel/src/gnuwin32", rec=TRUE, ext="") #finde(x="getPos", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE) + +finde(x="\\.LowerCaseMultivariateTV", dir ="C:/rtest/robast/branches/robast-1.0/pkg/RobAStBase/R") +finde(x="\\.checkEstClassForParamFamily", dir ="C:/rtest/distr/pkg/distrMod/R") +finde(x="\\.cexscale", dir ="C:/rtest/robast/branches/robast-1.1/pkg/RobAStBase", rec=TRUE) finde(x="updatePackageHelp", dir ="C:/rtest/distr/pkg/utils", rec=TRUE) finde(x="roptest\\(", dir ="C:/rtest/robast/branches/robast-0.9/pkg/ROptEst/", rec=TRUE) finde(x="getSlots\\(", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE) From noreply at r-forge.r-project.org Sun Sep 4 14:16:58 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 14:16:58 +0200 (CEST) Subject: [Distr-commits] r1124 - in pkg/distrEllipse: . R Message-ID: <20160904121658.A9B931873D0@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 14:16:58 +0200 (Sun, 04 Sep 2016) New Revision: 1124 Modified: pkg/distrEllipse/DESCRIPTION pkg/distrEllipse/R/SphericalDistribution.R Log: distrEllipse submitted to CRAN again Modified: pkg/distrEllipse/DESCRIPTION =================================================================== --- pkg/distrEllipse/DESCRIPTION 2016-09-04 12:01:22 UTC (rev 1123) +++ pkg/distrEllipse/DESCRIPTION 2016-09-04 12:16:58 UTC (rev 1124) @@ -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", "cph"), +Authors at R: person("Peter", "Ruckdeschel", role=c("cre", "aut", "cph"), email="peter.ruckdeschel at uni-oldenburg.de") ByteCompile: yes License: LGPL-3 Modified: pkg/distrEllipse/R/SphericalDistribution.R =================================================================== --- pkg/distrEllipse/R/SphericalDistribution.R 2016-09-04 12:01:22 UTC (rev 1123) +++ pkg/distrEllipse/R/SphericalDistribution.R 2016-09-04 12:16:58 UTC (rev 1124) @@ -53,10 +53,10 @@ d(object at radDistr)}) setMethod("p.rd", "SphericalDistribution", function(object) { .Deprecated("pRd") - p(object at radDistr)} + p(object at radDistr)}) setMethod("q.rd", "SphericalDistribution", function(object) { .Deprecated("qRd") - q(object at radDistr)} + q(object at radDistr)}) setMethod("plotRd", "SphericalDistribution", function(x, ... ) plot(x at radDistr,...)) From noreply at r-forge.r-project.org Sun Sep 4 14:22:58 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Sun, 4 Sep 2016 14:22:58 +0200 (CEST) Subject: [Distr-commits] r1125 - branches/distr-2.7/pkg/distrEllipse/R Message-ID: <20160904122258.F3728188282@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-04 14:22:58 +0200 (Sun, 04 Sep 2016) New Revision: 1125 Modified: branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R Log: merged back distrEllipse to branch 2.7 Modified: branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R =================================================================== --- branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R 2016-09-04 12:16:58 UTC (rev 1124) +++ branches/distr-2.7/pkg/distrEllipse/R/SphericalDistribution.R 2016-09-04 12:22:58 UTC (rev 1125) @@ -53,10 +53,10 @@ d(object at radDistr)}) setMethod("p.rd", "SphericalDistribution", function(object) { .Deprecated("pRd") - p(object at radDistr)} + p(object at radDistr)}) setMethod("q.rd", "SphericalDistribution", function(object) { .Deprecated("qRd") - q(object at radDistr)} + q(object at radDistr)}) setMethod("plotRd", "SphericalDistribution", function(x, ... ) plot(x at radDistr,...)) From noreply at r-forge.r-project.org Mon Sep 5 10:31:09 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 5 Sep 2016 10:31:09 +0200 (CEST) Subject: [Distr-commits] r1126 - pkg/utils Message-ID: <20160905083109.1667C187603@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-05 10:31:08 +0200 (Mon, 05 Sep 2016) New Revision: 1126 Modified: pkg/utils/finde.R Log: some new items in finde.R Modified: pkg/utils/finde.R =================================================================== --- pkg/utils/finde.R 2016-09-04 12:22:58 UTC (rev 1125) +++ pkg/utils/finde.R 2016-09-05 08:31:08 UTC (rev 1126) @@ -23,7 +23,11 @@ #finde(x="Wow6432Node", dir ="C:/R/devel/src/gnuwin32", rec=TRUE, ext="") #finde(x="getPos", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE) +finde(x="\\.rd", dir ="C:/rtest/distr/pkg/distrEllipse/R") +finde(x="RobExtremes", dir ="C:/rtest/distr/pkg/distrMod/man") +finde(x="getFromNamespace", dir ="C:/rtest/robast/branches/robast-1.0/pkg/RobAStBase/",rec=TRUE) +finde(x="getFiRisk", dir ="C:/rtest/robast/pkg/RobAStBase/",rec=TRUE) finde(x="\\.LowerCaseMultivariateTV", dir ="C:/rtest/robast/branches/robast-1.0/pkg/RobAStBase/R") finde(x="\\.checkEstClassForParamFamily", dir ="C:/rtest/distr/pkg/distrMod/R") finde(x="\\.cexscale", dir ="C:/rtest/robast/branches/robast-1.1/pkg/RobAStBase", rec=TRUE) From noreply at r-forge.r-project.org Mon Sep 5 10:31:56 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 5 Sep 2016 10:31:56 +0200 (CEST) Subject: [Distr-commits] r1127 - branches/distr-2.7/pkg/distrMod Message-ID: <20160905083156.E2DD618719F@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-05 10:31:56 +0200 (Mon, 05 Sep 2016) New Revision: 1127 Modified: branches/distr-2.7/pkg/distrMod/NAMESPACE Log: branch 2.7: export .CvMMDCovariance in distrMod Modified: branches/distr-2.7/pkg/distrMod/NAMESPACE =================================================================== --- branches/distr-2.7/pkg/distrMod/NAMESPACE 2016-09-05 08:31:08 UTC (rev 1126) +++ branches/distr-2.7/pkg/distrMod/NAMESPACE 2016-09-05 08:31:56 UTC (rev 1127) @@ -92,4 +92,4 @@ export("L2LocationUnknownScaleFamily", "L2ScaleUnknownLocationFamily") export("meRes", "get.criterion.fct") export("addAlphTrsp2col") -export(".deleteDim",".isUnitMatrix") +export(".deleteDim",".isUnitMatrix",".CvMMDCovariance") From noreply at r-forge.r-project.org Mon Sep 5 14:14:51 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 5 Sep 2016 14:14:51 +0200 (CEST) Subject: [Distr-commits] r1128 - in pkg: . utils Message-ID: <20160905121451.6409B186E7A@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-05 14:14:51 +0200 (Mon, 05 Sep 2016) New Revision: 1128 Added: pkg/AllCitations.txt pkg/AllCitationsVW.txt pkg/utils/getAllCitations.R Log: utility to generate all Citation files Added: pkg/AllCitations.txt =================================================================== --- pkg/AllCitations.txt (rev 0) +++ pkg/AllCitations.txt 2016-09-05 12:14:51 UTC (rev 1128) @@ -0,0 +1,532 @@ +------------------------------------ +distr +------------------------------------ +Autor(en) in DESCRIPTION + 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\"), person(\"R Core Team\", role = c(\"ctb\", \"cph\"), comment=\"for source file ks.c/ routines 'pKS2' and 'pKolmogorov2x'\"))" + +Autor(en) in CITATION + +To cite package distr in publications use: + + Peter Ruckdeschel, Matthias Kohl, Thomas Stabla, Florian Camphausen (2006). S4 Classes for Distributions. R News, 6(2), 2-6. URL + http://CRAN.R-project.org/doc/Rnews/ + +If you employ convolution, please also cite: + + Peter Ruckdeschel, Matthias Kohl (2014). General Purpose Convolution Algorithm in S4 Classes by Means of FFT. Journal of Statistical Software, 59(4), + 1-25. URL http://www.jstatsoft.org/v59/i04/. + + +------------------------------------ +distrDoc +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Florian\", \"Camphausen\", role=\"ctb\", comment=\"contributed as student to the documented packages 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 to the documented packages in the initial phase --2005\"))" + +Autor(en) in CITATION + +To cite package distr in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006) S4 Classes for Distributions + +If you employ convolution, please also cite: + + Peter Ruckdeschel, Matthias Kohl (2014). General Purpose Convolution Algorithm in S4 Classes by Means of FFT. Journal of Statistical Software, 59(4), + 1-25. URL http://www.jstatsoft.org/v59/i04/. + + +------------------------------------ +distrEllipse +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"aut\", \"cph\"), email=\"peter.ruckdeschel at uni-oldenburg.de\")" + +Autor(en) in CITATION + +To cite package distrEllipse in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006) S4 Classes for Distributions + +A BibTeX entry for LaTeX users is + + @Article{, + title = {S4 Classes for Distributions}, + author = {P. Ruckdeschel and M. Kohl and T. Stabla and F. Camphausen}, + language = {English}, + year = {2006}, + journal = {R News}, + year = {2006}, + volume = {6}, + number = {2}, + pages = {2--6}, + month = {May}, + url = {http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}, + pdf = {http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}, + } + + +------------------------------------ +distrEx +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"cre\", \"cph\"), email=\"Matthias.Kohl at stamats.de\"), person(\"Peter\", \"Ruckdeschel\", role=c(\"aut\", \"cph\")))" + +Autor(en) in CITATION + +To cite package distrEx in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006) S4 Classes for Distributions + +A BibTeX entry for LaTeX users is + + @Article{, + title = {S4 Classes for Distributions}, + author = {P. Ruckdeschel and M. Kohl and T. Stabla and F. Camphausen}, + language = {English}, + year = {2006}, + journal = {R News}, + year = {2006}, + volume = {6}, + number = {2}, + pages = {2--6}, + month = {May}, + pdf = {http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}, + } + + +------------------------------------ +distrMod +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"aut\", \"cph\")), person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"cph\"), email=\"peter.ruckdeschel at uni-oldenburg.de\"), person(\"R Core Team\", role = c(\"ctb\", \"cph\"), comment=\"for source file 'format.perc'\"))" + +Autor(en) in CITATION + +To cite distrMod in publications use: + + Matthias Kohl, Peter Ruckdeschel (2010). R Package distrMod: S4 Classes and Methods for Probability Models. Journal of Statistical Software, 35(10), + 1-27. URL http://www.jstatsoft.org/v35/i10/. + +A BibTeX entry for LaTeX users is + + @Article{, + title = {{R} Package {distrMod}: {S}4 Classes and Methods for Probability Models}, + author = {Matthias Kohl and Peter Ruckdeschel}, + journal = {Journal of Statistical Software}, + year = {2010}, + volume = {35}, + number = {10}, + pages = {1--27}, + url = {http://www.jstatsoft.org/v35/i10/}, + } + + +------------------------------------ +distrRmetrics +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"cph\"), email=\"peter.ruckdeschel at uni-oldenburg.de\")" + +Autor(en) in CITATION + +To cite package distrRmetrics in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006) S4 Classes for Distributions + +A BibTeX entry for LaTeX users is + + @Article{, + title = {S4 Classes for Distributions}, + author = {P. Ruckdeschel and M. Kohl and T. Stabla and F. Camphausen}, + language = {English}, + year = {2006}, + journal = {R News}, + year = {2006}, + volume = {6}, + number = {2}, + pages = {2--6}, + month = {May}, + pdf = {http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}, + } + + +------------------------------------ +distrSim +------------------------------------ +Autor(en) in DESCRIPTION + 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\"))" + +Autor(en) in CITATION + +To cite package distrSim in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006) S4 Classes for Distributions + +A BibTeX entry for LaTeX users is + + @Article{, + title = {S4 Classes for Distributions}, + author = {P. Ruckdeschel and M. Kohl and T. Stabla and F. Camphausen}, + language = {English}, + year = {2006}, + journal = {R News}, + year = {2006}, + volume = {6}, + number = {2}, + pages = {2--6}, + month = {May}, + pdf = {http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}, + } + + +------------------------------------ +distrTeach +------------------------------------ +Autor(en) in DESCRIPTION + 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\"))" + +Autor(en) in CITATION + +To cite package distrTeach in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006): S4 Classes for Distributions---a manual for packages distr, distrSim, distrTEst, + distrEx, distrMod, and distrTeach + +A BibTeX entry for LaTeX users is + + @TechReport{, + author = {P. Ruckdeschel and M. Kohl and T. Stabla and F. Camphausen}, + title = {{S4 Classes for Distributions---a manual for packages distr, distrSim, distrTEst, distrEx, + distrMod, and distrTeach}}, + language = {English}, + institution = {{Fraunhofer ITWM}}, + month = {July}, + year = {2008}, + address = {{Kaiserslautern, Germany}}, + url = {http://cran.r-project.org/web/packages/distrDoc/vignettes/distr.pdf}, + } + + +------------------------------------ +distrTEst +------------------------------------ +Autor(en) in DESCRIPTION + 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\"))" + +Autor(en) in CITATION + +To cite package distrTEst in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006) S4 Classes for Distributions + +A BibTeX entry for LaTeX users is + + @Article{, + title = {S4 Classes for Distributions}, + author = {P. Ruckdeschel and M. Kohl and T. Stabla and F. Camphausen}, + language = {English}, + year = {2006}, + journal = {R News}, + year = {2006}, + volume = {6}, + number = {2}, + pages = {2--6}, + month = {May}, + pdf = {http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}, + } + + +------------------------------------ +setRNG +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Paul Gilbert " + +Autor(en) in CITATION +NULL + +------------------------------------ +startupmsg +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"cph\"), email=\"peter.ruckdeschel at uni-oldenburg.de\")" + +Autor(en) in CITATION +NULL + +------------------------------------ +SweaveListingUtils +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"cph\"), email=\"peter.ruckdeschel at uni-oldenburg.de\")" + +Autor(en) in CITATION +NULL +There were 15 warnings (use warnings() to see them) +> printErg(getAllCitAndDesc("C:/rtest/robast/pkg")) + +------------------------------------ +RandVar +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Matthias Kohl, Peter Ruckdeschel" + +Autor(en) in CITATION + +To cite package RandVar in publications use: + + Kohl, M., and Ruckdeschel, P. RandVar: Implementation of random variables. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RandVar: Implementation of random variables}, + author = {M. Kohl and P. Ruckdeschel}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +RobAStBase +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"cre\", \"cph\"), email=\"Matthias.Kohl at stamats.de\"), person(\"Peter\", \"Ruckdeschel\", role=c(\"aut\", \"cph\")), person(\"Mykhailo\", \"Pupashenko\", role=\"ctb\", comment=\"contributed wrapper functions for diagnostic plots\"), person(\"Gerald\", \"Kroisandt\", role=\"ctb\", comment=\"contributed testing routines\"), person(\"Peter\", \"Ruckdeschel\", role=c(\"aut\", \"cph\")), person(\"R Core Team\", role = c(\"ctb\", \"cph\"), comment=\"for source file 'format.perc'\"))" + +Autor(en) in CITATION + +To cite package RobAStBase in publications use: + + Kohl, M., and Ruckdeschel, P. RobAStBase: Robust Asymptotic Statistics. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RobAStBase: Robust Asymptotic Statistics}, + author = {M. Kohl and P. Ruckdeschel}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +RobAStRDA +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"aut\", \"cph\")), person(\"Bernhard\", \"Spangl\",role=\"ctb\", comment=\"contributed smoothed grid values of the Lagrange multipliers\"), person(\"Sascha\", \"Desmettre\", role=\"ctb\", comment=\"contributed smoothed grid values of the Lagrange multipliers\"), person(\"Eugen\", \"Massini\", role=\"ctb\", comment=\"contributed an interactive smoothing routine for smoothing the Lagrange multipliers and smoothed grid values of the Lagrange multipliers\"), person(\"Mykhailo\", \"Pupashenko\", role=\"ctb\", comment=\"helped with manual smoothing of the interpolators\"), person(\"Daria\", \"Pupashenko\", role=\"ctb\", comment=\"helped with manual smoothing of the interpolators\"), person(\"Gerald\", \"Kroisandt\", role=\"ctb\", comment=\"helped with manual smoothing of the interpolators\"), person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"cph\", \"aut\"), email=\"peter.ruckdeschel at uni-oldenburg.de\"))" + +Autor(en) in CITATION + +To cite package RobAStRDA in publications use: + + Ruckdeschel, P., Kohl, M. RobAStRDA: Interpolation Grids for Packages of the 'RobASt' - Family of Packages Contributions by S. Desmettre, G. + Kroisandt, E. Massini, D. Pupashenko, M. Pupashenko, and B. Spangl; . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RobAStRDA: Interpolation Grids for Packages of the 'RobASt' - Family of Packages}, + author = {P. Ruckdeschel and M. Kohl}, + language = {English}, + note = {Contributions by S. Desmettre, G. Kroisandt, E. Massini, D. Pupashenko, M. Pupashenko, and B. Spangl; }, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +RobAStRDAs +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Peter Ruckdeschel, Matthias Kohl" + +Autor(en) in CITATION +NULL + +------------------------------------ +RobAStRDAt +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Peter Ruckdeschel, Matthias Kohl" + +Autor(en) in CITATION +NULL + +------------------------------------ +RobExtremes +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Nataliya\", \"Horbenko\", role=c(\"aut\",\"cph\")), person(\"Bernhard\", \"Spangl\", role=\"ctb\", comment=\"contributed smoothed grid values of the Lagrange multipliers\"), person(\"Sascha\", \"Desmettre\", role=\"ctb\", comment=\"contributed smoothed grid values of the Lagrange multipliers\"), person(\"Eugen\", \"Massini\", role=\"ctb\", comment=\"contributed an interactive smoothing routine for smoothing the Lagrange multipliers and smoothed grid values of the Lagrange multipliers\"), person(\"Daria\", \"Pupashenko\", role=\"ctb\", comment=\"contributed MDE-estimation for GEV distribution in the framework of her PhD thesis 2011--14\"), person(\"Gerald\", \"Kroisandt\", role=\"ctb\", comment=\"contributed testing routines\"), person(\"Matthias\", \"Kohl\", role=c(\"aut\", \"cph\")), person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"aut\", \"cph\"), email=\"peter.ruckdeschel at uni-oldenburg.de\"))" + +Autor(en) in CITATION + +To cite package RobExtremes in publications use: + + Ruckdeschel, P., Kohl, M., and Horbenko, N. RobExtremes: Optimally robust estimation for extreme value distributions. Contributions by S. Desmettre, + G. Kroisandt, E. Massini, D. Pupashenko and B. Spangl; . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RobExtremes: Optimally robust estimation for extreme value distributions}, + author = {P. Ruckdeschel and M. Kohl and N. Horbenko}, + language = {English}, + note = {Contributions by S. Desmettre, G. Kroisandt, E. Massini, D. Pupashenko and B. Spangl; }, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +RobLox +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Matthias Kohl " + +Autor(en) in CITATION + +To cite package RobLox in publications use: + + Kohl, M. RobLox: Optimally robust influence curves and estimators for location and scale. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RobLox: Optimally robust influence curves and estimators for location and scale}, + author = {M. Kohl}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +RobLoxBioC +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Matthias Kohl " + +Autor(en) in CITATION + +To cite package RobLoxBioC in publications use: + + Kohl, M. and Deigner, H.P. Preprocessing of gene expression data by optimally robust estimators. BMC Bioinformatics 2010, 11:583 URL + http://www.biomedcentral.com/1471-2105/11/583/abstract + +A BibTeX entry for LaTeX users is + + @Article{, + title = {Preprocessing of gene expression data by optimally robust estimators}, + author = {M. Kohl and H.P. Deigner}, + journal = {BMC Bioinformatics}, + language = {English}, + year = {2010}, + volume = {11}, + pages = {583}, + url = {http://www.biomedcentral.com/1471-2105/11/583/abstract}, + } + + +------------------------------------ +RobRex +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Matthias Kohl " + +Autor(en) in CITATION + +To cite package RobRex in publications use: + + Kohl, M. RobRex: Optimally robust influence curves for regression and scale. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RobRex: Optimally robust influence curves for regression and scale}, + author = {M. Kohl}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +ROptEst +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"cre\", \"cph\"), email=\"Matthias.Kohl at stamats.de\"), person(\"Mykhailo\", \"Pupashenko\", role=\"ctb\", comment=\"contributed wrapper functions for diagnostic plots\"), person(\"Gerald\", \"Kroisandt\", role=\"ctb\", comment=\"contributed testing routines\"), person(\"Peter\", \"Ruckdeschel\", role=c(\"aut\", \"cph\")))" + +Autor(en) in CITATION + +To cite package ROptEst in publications use: + + Kohl, M., and Ruckdeschel, P. ROptEst: Optimally robust estimation. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {ROptEst: Optimally robust estimation}, + author = {M. Kohl and P. Ruckdeschel}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +ROptEstOld +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Matthias Kohl" + +Autor(en) in CITATION +NULL + +------------------------------------ +ROptRegTS +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Matthias Kohl , Peter Ruckdeschel" + +Autor(en) in CITATION + +To cite package ROptRegTS in publications use: + + Kohl, M., and Ruckdeschel, P. ROptRegTS: Optimally robust estimation for regression-type models. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {ROptRegTS: Optimally robust estimation for regression-type models}, + author = {M. Kohl and P. Ruckdeschel}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + Added: pkg/AllCitationsVW.txt =================================================================== --- pkg/AllCitationsVW.txt (rev 0) +++ pkg/AllCitationsVW.txt 2016-09-05 12:14:51 UTC (rev 1128) @@ -0,0 +1,233 @@ +------------------------------------ +distr +------------------------------------ +Autor(en) in DESCRIPTION + 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\"), + person(\"R Core Team\", role = c(\"ctb\", \"cph\"), comment=\"for source file ks.c/ routines 'pKS2' and 'pKolmogorov2x'\"))" + +Autor(en) in CITATION + +To cite package distr in publications use: + + Peter Ruckdeschel, Matthias Kohl, Thomas Stabla, Florian Camphausen (2006). S4 Classes for Distributions. R News, 6(2), 2-6. URL + http://CRAN.R-project.org/doc/Rnews/ + +If you employ convolution, please also cite: + + Peter Ruckdeschel, Matthias Kohl (2014). General Purpose Convolution Algorithm in S4 Classes by Means of FFT. Journal of Statistical Software, 59(4), + 1-25. URL http://www.jstatsoft.org/v59/i04/. + + + +------------------------------------ +distrEx +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"cre\", \"cph\"), email=\"Matthias.Kohl at stamats.de\"), + person(\"Peter\", \"Ruckdeschel\", role=c(\"aut\", \"cph\")))" + +Autor(en) in CITATION + +To cite package distrEx in publications use: + + Ruckdeschel, P., Kohl, M., Stabla, T., & Camphausen, F. (2006) S4 Classes for Distributions + +A BibTeX entry for LaTeX users is + + @Article{, + title = {S4 Classes for Distributions}, + author = {P. Ruckdeschel and M. Kohl and T. Stabla and F. Camphausen}, + language = {English}, + year = {2006}, + journal = {R News}, + year = {2006}, + volume = {6}, + number = {2}, + pages = {2--6}, + month = {May}, + pdf = {http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}, + } + + +------------------------------------ +RandVar +------------------------------------ +Autor(en) in DESCRIPTION + Author +"Matthias Kohl, Peter Ruckdeschel" + +Autor(en) in CITATION + +To cite package RandVar in publications use: + + Kohl, M., and Ruckdeschel, P. RandVar: Implementation of random variables. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RandVar: Implementation of random variables}, + author = {M. Kohl and P. Ruckdeschel}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + +------------------------------------ +distrMod +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"aut\", \"cph\")), + person(\"Peter\", \"Ruckdeschel\", role=c(\"cre\", \"cph\"), email=\"peter.ruckdeschel at uni-oldenburg.de\"), + person(\"R Core Team\", role = c(\"ctb\", \"cph\"), comment=\"for source file 'format.perc'\"))" + +Autor(en) in CITATION + +To cite distrMod in publications use: + + Matthias Kohl, Peter Ruckdeschel (2010). R Package distrMod: S4 Classes and Methods for Probability Models. Journal of Statistical Software, 35(10), + 1-27. URL http://www.jstatsoft.org/v35/i10/. + +A BibTeX entry for LaTeX users is + + @Article{, + title = {{R} Package {distrMod}: {S}4 Classes and Methods for Probability Models}, + author = {Matthias Kohl and Peter Ruckdeschel}, + journal = {Journal of Statistical Software}, + year = {2010}, + volume = {35}, + number = {10}, + pages = {1--27}, + url = {http://www.jstatsoft.org/v35/i10/}, + } + + +------------------------------------ +RobAStBase +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"cre\", \"cph\"), email=\"Matthias.Kohl at stamats.de\"), + person(\"Peter\", \"Ruckdeschel\", role=c(\"aut\", \"cph\")), + person(\"Mykhailo\", \"Pupashenko\", role=\"ctb\", comment=\"contributed wrapper functions for diagnostic plots\"), + person(\"Gerald\", \"Kroisandt\", role=\"ctb\", comment=\"contributed testing routines\"), + person(\"Peter\", \"Ruckdeschel\", role=c(\"aut\", \"cph\")), + person(\"R Core Team\", role = c(\"ctb\", \"cph\"), comment=\"for source file 'format.perc'\"))" + +Autor(en) in CITATION + +To cite package RobAStBase in publications use: + + Kohl, M., and Ruckdeschel, P. RobAStBase: Robust Asymptotic Statistics. . URL http://robast.r-forge.r-project.org/ + +A BibTeX entry for LaTeX users is + + @Manual{, + title = {RobAStBase: Robust Asymptotic Statistics}, + author = {M. Kohl and P. Ruckdeschel}, + language = {English}, + type = {R package}, + url = {http://robast.r-forge.r-project.org/}, + } + + + +------------------------------------ +ROptEst +------------------------------------ +Autor(en) in DESCRIPTION + Authors at R +"c(person(\"Matthias\", \"Kohl\", role=c(\"cre\", \"cph\"), email=\"Matthias.Kohl at stamats.de\"), + person(\"Mykhailo\", \"Pupashenko\", role=\"ctb\", comment=\"contributed wrapper functions for diagnostic plots\"), + person(\"Gerald\", \"Kroisandt\", role=\"ctb\", comment=\"contributed testing routines\"), [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/distr -r 1128 From noreply at r-forge.r-project.org Thu Sep 8 08:56:36 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 8 Sep 2016 08:56:36 +0200 (CEST) Subject: [Distr-commits] r1129 - in branches/distr-2.7/pkg/distrEx: R man Message-ID: <20160908065636.1A131187C04@r-forge.r-project.org> Author: ruckdeschel Date: 2016-09-08 08:56:35 +0200 (Thu, 08 Sep 2016) New Revision: 1129 Modified: branches/distr-2.7/pkg/distrEx/R/HellingerDist.R branches/distr-2.7/pkg/distrEx/R/TotalVarDist.R branches/distr-2.7/pkg/distrEx/man/HellingerDist.Rd branches/distr-2.7/pkg/distrEx/man/TotalVarDist.Rd Log: triggered by mail from Peng Rui, larodarchillwind at aliyun.com, implemented Hellinger and TotalVariation distance for DiscreteMVDistributions Modified: branches/distr-2.7/pkg/distrEx/R/HellingerDist.R =================================================================== --- branches/distr-2.7/pkg/distrEx/R/HellingerDist.R 2016-09-05 12:14:51 UTC (rev 1128) +++ branches/distr-2.7/pkg/distrEx/R/HellingerDist.R 2016-09-08 06:56:35 UTC (rev 1129) @@ -39,6 +39,25 @@ return(sqrt(res)) # ^.5 added P.R. 19-12-06 }) + +## new PR 08-09-16 +setMethod("HellingerDist", signature(e1 = "DiscreteMVDistribution", + e2 = "DiscreteMVDistribution"), + function(e1, e2, ...){ + o.warn <- getOption("warn"); options(warn = -1) + on.exit(options(warn=o.warn)) + ## replace univariate line supp <- union(support(e1), support(e2)) by + + supp <- unique(rbind(support(e1), support(e2))) + + + res <- 0.5*sum((sqrt(d(e1)(supp))-sqrt(d(e2)(supp)))^2) + names(res) <- "Hellinger distance" + + return(sqrt(res)) + }) + + setMethod("HellingerDist", signature(e1 = "DiscreteDistribution", e2 = "AbscontDistribution"), function(e1, e2, ...){ Modified: branches/distr-2.7/pkg/distrEx/R/TotalVarDist.R =================================================================== --- branches/distr-2.7/pkg/distrEx/R/TotalVarDist.R 2016-09-05 12:14:51 UTC (rev 1128) +++ branches/distr-2.7/pkg/distrEx/R/TotalVarDist.R 2016-09-08 06:56:35 UTC (rev 1129) @@ -39,6 +39,23 @@ return(res) }) + +## new PR 08-09-16 +setMethod("TotalVarDist", signature(e1 = "DiscreteMVDistribution", + e2 = "DiscreteMVDistribution"), + function(e1, e2, ...){ + o.warn <- getOption("warn"); options(warn = -1) + on.exit(options(warn=o.warn)) + ## replace univariate line supp <- union(support(e1), support(e2)) by + + supp <- unique(rbind(support(e1), support(e2))) + + res <- 0.5*sum(abs(d(e1)(supp)-d(e2)(supp))) + names(res) <- "total variation distance" + + return(res) + }) + setMethod("TotalVarDist", signature(e1 = "DiscreteDistribution", e2 = "AbscontDistribution"), function(e1, e2, ...){ Modified: branches/distr-2.7/pkg/distrEx/man/HellingerDist.Rd =================================================================== --- branches/distr-2.7/pkg/distrEx/man/HellingerDist.Rd 2016-09-05 12:14:51 UTC (rev 1128) +++ branches/distr-2.7/pkg/distrEx/man/HellingerDist.Rd 2016-09-08 06:56:35 UTC (rev 1129) @@ -4,6 +4,7 @@ \alias{HellingerDist,AbscontDistribution,AbscontDistribution-method} \alias{HellingerDist,AbscontDistribution,DiscreteDistribution-method} \alias{HellingerDist,DiscreteDistribution,DiscreteDistribution-method} +\alias{HellingerDist,DiscreteMVDistribution,DiscreteMVDistribution-method} \alias{HellingerDist,DiscreteDistribution,AbscontDistribution-method} \alias{HellingerDist,LatticeDistribution,DiscreteDistribution-method} \alias{HellingerDist,DiscreteDistribution,LatticeDistribution-method} Modified: branches/distr-2.7/pkg/distrEx/man/TotalVarDist.Rd =================================================================== --- branches/distr-2.7/pkg/distrEx/man/TotalVarDist.Rd 2016-09-05 12:14:51 UTC (rev 1128) +++ branches/distr-2.7/pkg/distrEx/man/TotalVarDist.Rd 2016-09-08 06:56:35 UTC (rev 1129) @@ -4,6 +4,7 @@ \alias{TotalVarDist,AbscontDistribution,AbscontDistribution-method} \alias{TotalVarDist,AbscontDistribution,DiscreteDistribution-method} \alias{TotalVarDist,DiscreteDistribution,DiscreteDistribution-method} +\alias{TotalVarDist,DiscreteMVDistribution,DiscreteMVDistribution-method} \alias{TotalVarDist,DiscreteDistribution,AbscontDistribution-method} \alias{TotalVarDist,LatticeDistribution,DiscreteDistribution-method} \alias{TotalVarDist,DiscreteDistribution,LatticeDistribution-method}