[Distr-commits] r895 - in branches: distr-2.4/pkg/SweaveListingUtils distr-2.4/pkg/distr distr-2.4/pkg/distrDoc distr-2.4/pkg/distrDoc/vignettes distr-2.4/pkg/distrTEst distr-2.4/pkg/distrTeach distr-2.5/pkg/SweaveListingUtils distr-2.5/pkg/distr distr-2.5/pkg/distr/man distr-2.5/pkg/distrDoc distr-2.5/pkg/distrDoc/vignettes distr-2.5/pkg/distrEllipse distr-2.5/pkg/distrEx distr-2.5/pkg/distrEx/R distr-2.5/pkg/distrEx/man distr-2.5/pkg/distrMod distr-2.5/pkg/distrMod/R distr-2.5/pkg/distrRmetrics distr-2.5/pkg/distrRmetrics/man distr-2.5/pkg/distrSim distr-2.5/pkg/distrTEst distr-2.5/pkg/distrTeach distr-2.5/pkg/startupmsg

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri Sep 6 21:35:15 CEST 2013


Author: ruckdeschel
Date: 2013-09-06 21:35:14 +0200 (Fri, 06 Sep 2013)
New Revision: 895

Added:
   branches/distr-2.5/pkg/distrEllipse/.Rbuildignore
   branches/distr-2.5/pkg/distrEx/.Rbuildignore
   branches/distr-2.5/pkg/distrRmetrics/.Rbuildignore
   branches/distr-2.5/pkg/distrSim/.Rbuildignore
   branches/distr-2.5/pkg/distrTEst/.Rbuildignore
   branches/distr-2.5/pkg/distrTeach/.Rbuildignore
   branches/distr-2.5/pkg/startupmsg/.Rbuildignore
Modified:
   branches/distr-2.4/pkg/SweaveListingUtils/.Rbuildignore
   branches/distr-2.4/pkg/SweaveListingUtils/DESCRIPTION
   branches/distr-2.4/pkg/distr/.Rbuildignore
   branches/distr-2.4/pkg/distrDoc/DESCRIPTION
   branches/distr-2.4/pkg/distrDoc/NAMESPACE
   branches/distr-2.4/pkg/distrDoc/vignettes/distr.Rnw
   branches/distr-2.4/pkg/distrTEst/DESCRIPTION
   branches/distr-2.4/pkg/distrTEst/NAMESPACE
   branches/distr-2.4/pkg/distrTeach/NAMESPACE
   branches/distr-2.5/pkg/SweaveListingUtils/.Rbuildignore
   branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION
   branches/distr-2.5/pkg/distr/.Rbuildignore
   branches/distr-2.5/pkg/distr/DESCRIPTION
   branches/distr-2.5/pkg/distr/man/RtoDPQ.LC.Rd
   branches/distr-2.5/pkg/distr/man/RtoDPQ.Rd
   branches/distr-2.5/pkg/distr/man/plot-methods.Rd
   branches/distr-2.5/pkg/distrDoc/.Rbuildignore
   branches/distr-2.5/pkg/distrDoc/DESCRIPTION
   branches/distr-2.5/pkg/distrDoc/NAMESPACE
   branches/distr-2.5/pkg/distrDoc/vignettes/distr.Rnw
   branches/distr-2.5/pkg/distrEllipse/DESCRIPTION
   branches/distr-2.5/pkg/distrEllipse/NAMESPACE
   branches/distr-2.5/pkg/distrEx/DESCRIPTION
   branches/distr-2.5/pkg/distrEx/NAMESPACE
   branches/distr-2.5/pkg/distrEx/R/AllClass.R
   branches/distr-2.5/pkg/distrEx/R/ClippedMoments.R
   branches/distr-2.5/pkg/distrEx/R/ConvexContamination.R
   branches/distr-2.5/pkg/distrEx/R/Expectation.R
   branches/distr-2.5/pkg/distrEx/R/Functionals.R
   branches/distr-2.5/pkg/distrEx/R/Kurtosis.R
   branches/distr-2.5/pkg/distrEx/man/E.Rd
   branches/distr-2.5/pkg/distrMod/.Rbuildignore
   branches/distr-2.5/pkg/distrMod/DESCRIPTION
   branches/distr-2.5/pkg/distrMod/NAMESPACE
   branches/distr-2.5/pkg/distrMod/R/0distrModUtils.R
   branches/distr-2.5/pkg/distrRmetrics/DESCRIPTION
   branches/distr-2.5/pkg/distrRmetrics/NAMESPACE
   branches/distr-2.5/pkg/distrRmetrics/man/SNorm-class.Rd
   branches/distr-2.5/pkg/distrRmetrics/man/SNorm.Rd
   branches/distr-2.5/pkg/distrRmetrics/man/SSTd-class.Rd
   branches/distr-2.5/pkg/distrRmetrics/man/SSTd.Rd
   branches/distr-2.5/pkg/distrRmetrics/man/STd.Rd
   branches/distr-2.5/pkg/distrSim/DESCRIPTION
   branches/distr-2.5/pkg/distrTEst/DESCRIPTION
   branches/distr-2.5/pkg/distrTEst/NAMESPACE
   branches/distr-2.5/pkg/distrTeach/DESCRIPTION
   branches/distr-2.5/pkg/distrTeach/NAMESPACE
Log:
fixed issues detected with new checks in R CMD check --as-cran R-devel, version r63824

Modified: branches/distr-2.4/pkg/SweaveListingUtils/.Rbuildignore
===================================================================
--- branches/distr-2.4/pkg/SweaveListingUtils/.Rbuildignore	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/SweaveListingUtils/.Rbuildignore	2013-09-06 19:35:14 UTC (rev 895)
@@ -1 +1,2 @@
 ^.*\.svn.+
+.*-Ex\.R
\ No newline at end of file

Modified: branches/distr-2.4/pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- branches/distr-2.4/pkg/SweaveListingUtils/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/SweaveListingUtils/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -4,14 +4,13 @@
 Version: 0.6
 Depends: R(>= 2.10.0), startupmsg
 Suggests: distr, MASS, survival, distrEx, Matrix, splines
-Imports: stats
 ByteCompile: yes
 Author: Peter Ruckdeschel
 Description: provides utilities for defining R / Rd as Tex-package-listings "language" and including R / Rd source file (sniplets) copied from R-forge in its most
              recent version (or another url) thereby avoiding inconsistencies between vignette and documented source code
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
 License: LGPL-3
-Date: 2013-01-10
+Date: 2013-09-06
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
 SVNRevision: 834

Modified: branches/distr-2.4/pkg/distr/.Rbuildignore
===================================================================
--- branches/distr-2.4/pkg/distr/.Rbuildignore	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/distr/.Rbuildignore	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,2 +1,3 @@
 inst/doc/Rplots.pdf
 ^.*\.svn.+
+.*-Ex\.R
\ No newline at end of file

Modified: branches/distr-2.4/pkg/distrDoc/DESCRIPTION
===================================================================
--- branches/distr-2.4/pkg/distrDoc/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/distrDoc/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,11 +1,11 @@
 Package: distrDoc
-Version: 2.4
-Date: 2013-01-09
+Version: 2.4.1
+Date: 2013-09-06
 Title: Documentation for packages distr, distrEx, distrSim, distrTEst, distrTeach, distrMod, and distrEllipse
 Description: provides documentation in form of a common vignette to packages distr, distrEx, distrMod, distrSim, distrTEst, distrTeach, and distrEllipse
 Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.6.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>= 2.2.0), distrTEst(>= 2.2.0), distrTeach(>= 2.2.0), RandVar(>= 0.7),
+Depends: R(>= 2.6.0), tools, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>= 2.2.0), distrTEst(>= 2.2.0), distrTeach(>= 2.2.0), RandVar(>= 0.7),
              distrMod(>= 2.2.0), MASS, methods
 Suggests: Biobase, SweaveListingUtils
 ByteCompile: yes
@@ -14,4 +14,4 @@
 URL: http://distr.r-forge.r-project.org/
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 834
+SVNRevision: 895

Modified: branches/distr-2.4/pkg/distrDoc/NAMESPACE
===================================================================
--- branches/distr-2.4/pkg/distrDoc/NAMESPACE	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/distrDoc/NAMESPACE	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,10 +1,85 @@
 import("methods")
-import("startupmsg")
 import("MASS")
 import("distr")
 import("distrEx")
-import("distrSim")
 import("RandVar")
-import("distrMod")
-import("distrTeach")
-import("distrTEst")
+
+importFrom("stats4","profile")
+exportClasses("MatrixorFunction", "OptionalNumericOrMatrixOrCall",
+              "OptionalDistrListOrCall", "OptionalNumericOrMatrix", 
+			  "ShowDetails",
+              "FunctionSymmetry", "NonSymmetric", "EvenSymmetric", "OddSymmetric",
+              "FunSymmList",
+              "ParamFamParameter",
+              "ProbFamily", "ParamFamily", "L2ParamFamily")
+exportClasses("RiskType", 
+              "asRisk", "asCov", "trAsCov", "asHampel", "asBias", "asGRisk",
+              "asMSE", "asUnOvShoot",
+              "fiRisk", "fiCov", "trFiCov", "fiHampel", "fiMSE", "fiBias",
+              "fiUnOvShoot")
+exportClasses("BiasType", "onesidedBias", "asymmetricBias", "symmetricBias")
+exportClasses("asSemivar", "asRiskwithBias")
+exportClasses("L2GroupParamFamily", "L2LocationFamily", 
+              "L2ScaleFamily", "L2LocationScaleFamily")
+exportClasses("L2LocationScaleUnion")
+exportClasses("L2ScaleShapeUnion", "L2ScaleUnion")
+exportClasses("ParamWithScaleFamParameter", "ParamWithShapeFamParameter", 
+              "ParamWithScaleAndShapeFamParameter")
+exportClasses("BinomFamily","PoisFamily", "NormLocationFamily",
+       "NormScaleFamily", "ExpScaleFamily",
+       "LnormScaleFamily", "GammaFamily", "BetaFamily", "NormLocationScaleFamily",
+       "CauchyLocationScaleFamily")
+exportClasses("NormType", "QFNorm", "InfoNorm", "SelfNorm")
+exportClasses("Estimate", "MCEstimate")
+exportClasses("Confint")
+exportMethods("distrSymm")
+exportMethods("distribution", "props", "props<-", "addProp<-", "main", "main<-",
+              "nuisance", "nuisance<-", "trafo", "trafo<-", "trafo.fct", 
+              "fixed", "fixed<-", "modifyParam",
+              "dimension", "show", "print", "plot", "param", "E", "name",
+              "L2deriv", "L2derivSymm", "L2derivDistr", "L2derivDistrSymm",
+              "FisherInfo", "checkL2deriv", "fam.call")
+exportMethods("completecases")
+exportMethods("bound", "width")
+exportMethods("nu", "name", "sign", "nu<-", "name<-", "sign<-", "biastype", "biastype<-")
+exportMethods("existsPIC")
+exportMethods("modifyModel")
+exportMethods("norm",  "QuadForm<-", "QuadForm", "fct", 
+              "fct<-", "normtype", "normtype<-")
+exportMethods("r", "d", "p", "q", 
+              "estimate", "estimate.call", "samplesize.estimate", "call.estimate",
+              "name.estimate", "trafo.estimate", "nuisance.estimate", 
+              "fixed.estimate", "Infos", "Infos<-", "addInfo<-",
+              "criterion", "criterion<-", "criterion.fct", "method",
+              "samplesize", "asvar", "asvar<-", "optimwarn",
+			  "withPosRestr", "withPosRestr<-")
+exportMethods("untransformed.estimate", "untransformed.asvar")
+exportMethods("confint")
+exportMethods("validParameter")
+exportMethods("startPar", "makeOKPar")
+exportMethods("scaleshapename", "scalename", "LogDeriv")
+exportMethods("coerce", "profile", "locscalename", "scaleshapename<-")
+exportMethods("mleCalc", "mceCalc")
+exportMethods("qqplot")
+export("distrModMASK")
+export("trafoEst")
+export("distrModOptions", "distrModoptions", "getdistrModOption",
+       "Estimator", "MCEstimator", "MLEstimator", "MDEstimator")
+export("NonSymmetric", "EvenSymmetric", "OddSymmetric", "FunSymmList") 
+export("ParamFamParameter", "ParamFamily", "L2ParamFamily",
+       "BinomFamily", "PoisFamily", "NbinomFamily", "NormLocationFamily",
+       "NormScaleFamily", "ExpScaleFamily",
+       "LnormScaleFamily", "GammaFamily", "BetaFamily", "NormLocationScaleFamily",
+       "CauchyLocationScaleFamily", "NbinomwithSizeFamily", "NbinomMeanSizeFamily")
+export("asCov", "trAsCov", "asHampel", "asBias", "asMSE", "asUnOvShoot", 
+       "fiCov", "trFiCov", "fiHampel", "fiMSE", "fiBias", "fiUnOvShoot")
+export("positiveBias", "negativeBias", "symmetricBias", 
+       "asymmetricBias", "asSemivar")
+export("isKerAinKerB")
+export("L2LocationFamily", "L2ScaleFamily", "L2LocationScaleFamily")
+export("EuclideanNorm", "QuadFormNorm")
+export("NormType", "QFNorm", "InfoNorm", "SelfNorm")
+export("NormScaleUnknownLocationFamily", "NormLocationUnknownScaleFamily")
+export("L2LocationUnknownScaleFamily", "L2ScaleUnknownLocationFamily")
+export("meRes", "get.criterion.fct")
+export("addAlphTrsp2col")

Modified: branches/distr-2.4/pkg/distrDoc/vignettes/distr.Rnw
===================================================================
--- branches/distr-2.4/pkg/distrDoc/vignettes/distr.Rnw	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/distrDoc/vignettes/distr.Rnw	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,5 +1,5 @@
 %\VignetteIndexEntry{distr - manual}
-%\VignetteDepends{startupmsg,distr}
+%\VignetteDepends{distr}
 %\VignetteKeyword{probability distribution,simulation,estimation}
 %\VignettePackage{distr}
 %

Modified: branches/distr-2.4/pkg/distrTEst/DESCRIPTION
===================================================================
--- branches/distr-2.4/pkg/distrTEst/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/distrTEst/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -2,9 +2,8 @@
 Version: 2.4
 Date: 2013-01-10
 Title: Estimation and Testing classes based on package distr
-Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distr(>= 2.2), distrSim(>= 2.2), startupmsg
+Depends: R(>= 2.6.0), methods, graphics, setRNG(>= 2006.2-1), distrSim(>= 2.2)
 Suggests: distrEx(>= 2.2)
-Imports: stats
 Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
 Description: Evaluation (S4-)classes based on package distr for evaluating procedures (estimators/tests) at data/simulation in a unified way.
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>

Modified: branches/distr-2.4/pkg/distrTEst/NAMESPACE
===================================================================
--- branches/distr-2.4/pkg/distrTEst/NAMESPACE	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/distrTEst/NAMESPACE	2013-09-06 19:35:14 UTC (rev 895)
@@ -2,6 +2,7 @@
 import("startupmsg")
 import("distr")
 import("distrSim")
+import("setRNG")
 
 export("EvaluationList", "distrTEstoptions", "getdistrTEstOption")
 exportClasses("numericorNULL", "Evaluation", "EvaluationList",

Modified: branches/distr-2.4/pkg/distrTeach/NAMESPACE
===================================================================
--- branches/distr-2.4/pkg/distrTeach/NAMESPACE	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.4/pkg/distrTeach/NAMESPACE	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,6 +1,7 @@
 import("startupmsg")
 import("distr")
 import("distrEx")
+import("methods")
 
 exportMethods("plotCLT") 
 export("illustrateLLN")

Modified: branches/distr-2.5/pkg/SweaveListingUtils/.Rbuildignore
===================================================================
--- branches/distr-2.5/pkg/SweaveListingUtils/.Rbuildignore	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/SweaveListingUtils/.Rbuildignore	2013-09-06 19:35:14 UTC (rev 895)
@@ -1 +1,2 @@
 ^.*\.svn.+
+.*-Ex\.R
\ No newline at end of file

Modified: branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -4,7 +4,6 @@
 Version: 0.7
 Depends: R(>= 2.14.0), startupmsg
 Suggests: distr, MASS, survival, distrEx, Matrix, splines
-Imports: stats
 ByteCompile: yes
 Author: Peter Ruckdeschel
 Description: provides utilities for defining R / Rd as Tex-package-listings "language" and including R / Rd source file (sniplets) copied from R-forge in its most

Modified: branches/distr-2.5/pkg/distr/.Rbuildignore
===================================================================
--- branches/distr-2.5/pkg/distr/.Rbuildignore	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distr/.Rbuildignore	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,2 +1,3 @@
 inst/doc/Rplots.pdf
 ^.*\.svn.+
+.*-Ex\.R
\ No newline at end of file

Modified: branches/distr-2.5/pkg/distr/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/distr/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distr/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -6,7 +6,7 @@
 Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
 Depends: R(>= 2.14.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils
-Suggests: distrEx, SweaveListingUtils
+Suggests: distrEx
 Imports: stats
 ByteCompile: yes
 Encoding: latin1

Modified: branches/distr-2.5/pkg/distr/man/RtoDPQ.LC.Rd
===================================================================
--- branches/distr-2.5/pkg/distr/man/RtoDPQ.LC.Rd	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distr/man/RtoDPQ.LC.Rd	2013-09-06 19:35:14 UTC (rev 895)
@@ -4,7 +4,8 @@
 \description{
   function to do get empirical density, cumulative distribution and quantile function from random numbers}
 \usage{
-RtoDPQ.LC(r, e = getdistrOption("RtoDPQ.e"), n = getdistrOption("DefaultNrGridPoints"), y = NULL)
+RtoDPQ.LC(r, e = getdistrOption("RtoDPQ.e"), 
+          n = getdistrOption("DefaultNrGridPoints"), y = NULL)
 }
 \arguments{
   \item{r}{ the random number generator }

Modified: branches/distr-2.5/pkg/distr/man/RtoDPQ.Rd
===================================================================
--- branches/distr-2.5/pkg/distr/man/RtoDPQ.Rd	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distr/man/RtoDPQ.Rd	2013-09-06 19:35:14 UTC (rev 895)
@@ -4,7 +4,8 @@
 \description{
   function to do get empirical density, cumulative distribution and quantile function from random numbers}
 \usage{
-RtoDPQ(r, e = getdistrOption("RtoDPQ.e"), n = getdistrOption("DefaultNrGridPoints"), y = NULL)
+RtoDPQ(r, e = getdistrOption("RtoDPQ.e"), 
+       n = getdistrOption("DefaultNrGridPoints"), y = NULL)
 }
 \arguments{
   \item{r}{ the random number generator }

Modified: branches/distr-2.5/pkg/distr/man/plot-methods.Rd
===================================================================
--- branches/distr-2.5/pkg/distr/man/plot-methods.Rd	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distr/man/plot-methods.Rd	2013-09-06 19:35:14 UTC (rev 895)
@@ -12,41 +12,41 @@
 \description{plot-methods}
 \usage{plot(x, y, ...)
 \S4method{plot}{AbscontDistribution,missing}(x, width = 10, height = 5.5,
-     withSweave = getdistrOption("withSweave"), xlim = NULL, ylim = NULL, ngrid = 1000,
-     verticals = TRUE, do.points = TRUE, main = FALSE, inner = TRUE,
-     sub = FALSE, bmar = par("mar")[1], tmar = par("mar")[3], ...,
+     withSweave = getdistrOption("withSweave"), xlim = NULL, ylim = NULL,
+     ngrid = 1000, verticals = TRUE, do.points = TRUE, main = FALSE,
+     inner = TRUE, sub = FALSE, bmar = par("mar")[1], tmar = par("mar")[3], ...,
      cex.main = par("cex.main"), cex.inner = 1.2, cex.sub = par("cex.sub"), 
      col.points = par("col"), col.vert = par("col"), col.main = par("col.main"),  
      col.inner = par("col.main"), col.sub = par("col.sub"), cex.points = 2.0, 
      pch.u = 21, pch.a = 16, mfColRow = TRUE,
      to.draw.arg = NULL)
 \S4method{plot}{DiscreteDistribution,missing}(x, width = 10, height = 5.5,
-     withSweave = getdistrOption("withSweave"), xlim = NULL, ylim = NULL, verticals = TRUE,
-     do.points = TRUE, main = FALSE, inner = TRUE, sub = FALSE, 
+     withSweave = getdistrOption("withSweave"), xlim = NULL, ylim = NULL,
+     verticals = TRUE, do.points = TRUE, main = FALSE, inner = TRUE, sub = FALSE,
      bmar = par("mar")[1], tmar = par("mar")[3], ..., 
      cex.main = par("cex.main"), cex.inner = 1.2, cex.sub = par("cex.sub"), 
      col.points = par("col"), col.hor = par("col"), col.vert = par("col"), 
      col.main = par("col.main"), col.inner = par("col.main"), 
-     col.sub = par("col.sub"),  cex.points = 2.0, pch.u = 21, pch.a = 16, mfColRow = TRUE,
-     to.draw.arg = NULL)
+     col.sub = par("col.sub"),  cex.points = 2.0, pch.u = 21, pch.a = 16,
+     mfColRow = TRUE, to.draw.arg = NULL)
 \S4method{plot}{AffLinUnivarLebDecDistribution,missing}(x, width = 10, 
-     height = 5.5, withSweave = getdistrOption("withSweave"), xlim = NULL, ylim = NULL, ngrid = 1000,
-     verticals = TRUE, do.points = TRUE, main = FALSE, inner = TRUE, sub = FALSE,
-     bmar = par("mar")[1], tmar = par("mar")[3], ..., cex.main = par("cex.main"), 
-     cex.inner = 1.2, cex.sub = par("cex.sub"), col.points = par("col"),
-     col.hor = par("col"), col.vert = par("col"), col.main = par("col.main"), 
-     col.inner = par("col.main"), col.sub = par("col.sub"),  cex.points = 2.0,
-     pch.u = 21, pch.a = 16, mfColRow = TRUE,
-     to.draw.arg = NULL)
+     height = 5.5, withSweave = getdistrOption("withSweave"), xlim = NULL,
+     ylim = NULL, ngrid = 1000, verticals = TRUE, do.points = TRUE, main = FALSE,
+     inner = TRUE, sub = FALSE, bmar = par("mar")[1], tmar = par("mar")[3], ...,
+     cex.main = par("cex.main"), cex.inner = 1.2, cex.sub = par("cex.sub"),
+     col.points = par("col"), col.hor = par("col"), col.vert = par("col"),
+     col.main = par("col.main"), col.inner = par("col.main"),
+     col.sub = par("col.sub"),  cex.points = 2.0, pch.u = 21, pch.a = 16,
+     mfColRow = TRUE, to.draw.arg = NULL)
 \S4method{plot}{UnivarLebDecDistribution,missing}(x, width = 10, 
-     height = 14.5, withSweave = getdistrOption("withSweave"), xlim = NULL, ylim = NULL, ngrid = 1000,
-     verticals = TRUE, do.points = TRUE, main = FALSE, inner = TRUE, sub = FALSE,
-     bmar = par("mar")[1], tmar = par("mar")[3], ..., cex.main = par("cex.main"), 
-     cex.inner = 0.9, cex.sub = par("cex.sub"), col.points = par("col"),
-     col.hor = par("col"), col.vert = par("col"), col.main = par("col.main"), 
-     col.inner = par("col.main"), col.sub = par("col.sub"),  cex.points = 2.0,
-     pch.u = 21, pch.a = 16, mfColRow = TRUE,
-     to.draw.arg = NULL)
+     height = 14.5, withSweave = getdistrOption("withSweave"), xlim = NULL,
+     ylim = NULL, ngrid = 1000, verticals = TRUE, do.points = TRUE, main = FALSE,
+     inner = TRUE, sub = FALSE, bmar = par("mar")[1], tmar = par("mar")[3], ...,
+     cex.main = par("cex.main"), cex.inner = 0.9, cex.sub = par("cex.sub"),
+     col.points = par("col"), col.hor = par("col"), col.vert = par("col"),
+     col.main = par("col.main"), col.inner = par("col.main"),
+     col.sub = par("col.sub"),  cex.points = 2.0, pch.u = 21, pch.a = 16,
+     mfColRow = TRUE, to.draw.arg = NULL)
 \S4method{plot}{DistrList,missing}(x, y, ...)
 \S4method{plot}{CompoundDistribution,missing}(x, y, ...)
 }

Modified: branches/distr-2.5/pkg/distrDoc/.Rbuildignore
===================================================================
--- branches/distr-2.5/pkg/distrDoc/.Rbuildignore	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrDoc/.Rbuildignore	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,3 +1,4 @@
 ^.*\.svn.+
 inst/doc/Rplots.pdf
 inst/doc/Rplots.ps
+.*-Ex\.R
\ No newline at end of file

Modified: branches/distr-2.5/pkg/distrDoc/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/distrDoc/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrDoc/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -7,7 +7,7 @@
         distrMod, distrSim, distrTEst, distrTeach, and distrEllipse
 Author: Florian Camphausen, Matthias Kohl, Peter Ruckdeschel, Thomas Stabla
 Maintainer: Peter Ruckdeschel <Peter.Ruckdeschel at itwm.fraunhofer.de>
-Depends: R(>= 2.14.0), tools, startupmsg, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>=
+Depends: R(>= 2.14.0), tools, distr(>= 2.2.0), distrEx(>= 2.2.0), distrSim(>=
         2.2.0), distrTEst(>= 2.2.0), distrTeach(>= 2.2.0), RandVar(>= 0.7), distrMod(>= 2.2.0),
         MASS, methods
 Suggests: Biobase, SweaveListingUtils

Modified: branches/distr-2.5/pkg/distrDoc/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distrDoc/NAMESPACE	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrDoc/NAMESPACE	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,10 +1,62 @@
 import("methods")
-import("startupmsg")
 import("MASS")
 import("distr")
 import("distrEx")
 import("distrSim")
+import("distrTEst")
+import("distrTeach")
 import("RandVar")
-import("distrMod")
-import("distrTeach")
-import("distrTEst")
+importMethodsFrom("distrMod", "addInfo<-","addProp<-","asvar","asvar<-",
+                  "biastype","biastype<-","bound","call.estimate",
+				  "checkL2deriv","coerce","completecases","confint",
+				  "criterion","criterion.fct","criterion<-","d",
+				  "dimension","distrSymm","E","estimate","estimate.call",
+				  "existsPIC","fam.call","fct","fct<-","FisherInfo",
+				  "fixed","fixed.estimate","fixed<-","Infos","Infos<-",
+				  "L2deriv","L2derivDistr","L2derivDistrSymm","L2derivSymm",
+				  "locscalename","LogDeriv",
+				  "main","main<-","makeOKPar","mceCalc","method","mleCalc",
+				  "modifyModel","modifyParam","name","name.estimate","name<-","norm",
+				  "normtype","normtype<-","nu","nu<-","nuisance",
+				  "nuisance.estimate","nuisance<-","optimwarn","p","param",
+				  "plot","print","profile","props",
+				  "props<-","q","qqplot","QuadForm","QuadForm<-","r",
+				  "samplesize.estimate","scalename","scaleshapename",
+				  "scaleshapename<-","show","sign",
+				  "sign<-","startPar","trafo","trafo.estimate",
+				  "trafo.fct","trafo<-","untransformed.asvar",
+				  "untransformed.estimate","validParameter","width",
+				  "withPosRestr","withPosRestr<-")
+importFrom("distrMod","addAlphTrsp2col","asBias","asCov","asHampel","asMSE",
+           "asSemivar","asUnOvShoot","asymmetricBias","BetaFamily","BinomFamily",
+		   "CauchyLocationScaleFamily","distrModMASK",
+		   "distrModoptions","distrModOptions","Estimator","EuclideanNorm",
+		   "EvenSymmetric","ExpScaleFamily","fiBias","fiCov","fiHampel","fiMSE",
+		   "fiUnOvShoot","FunSymmList","GammaFamily","get.criterion.fct",
+		   "getdistrModOption","InfoNorm","isKerAinKerB","L2LocationFamily",
+		   "L2LocationScaleFamily","L2LocationUnknownScaleFamily",
+		   "L2ParamFamily","L2ScaleFamily","L2ScaleUnknownLocationFamily",
+		   "LnormScaleFamily","MCEstimator","MDEstimator","meRes",
+		   "MLEstimator","NbinomFamily","NbinomMeanSizeFamily",
+		   "NbinomwithSizeFamily","negativeBias","NonSymmetric",
+		   "NormLocationFamily","NormLocationScaleFamily",
+		   "NormLocationUnknownScaleFamily","NormScaleFamily",
+		   "NormScaleUnknownLocationFamily","NormType","OddSymmetric",
+		   "ParamFamily","ParamFamParameter","PoisFamily",
+		   "positiveBias","QFNorm",
+		   "QuadFormNorm","SelfNorm","symmetricBias","trafoEst")
+importClassesFrom("distrMod","asBias","asCov","asGRisk","asHampel","asMSE",
+           "asRisk","asRiskwithBias","asSemivar","asUnOvShoot","asymmetricBias",
+		   "BetaFamily","BiasType","BinomFamily","CauchyLocationScaleFamily",
+		   "Confint","Estimate","EvenSymmetric","ExpScaleFamily","fiBias","fiCov",
+		   "fiHampel","fiMSE","fiRisk","fiUnOvShoot","FunctionSymmetry","FunSymmList",
+		   "GammaFamily","InfoNorm","L2GroupParamFamily","L2LocationFamily",
+		   "L2LocationScaleFamily","L2LocationScaleUnion","L2ParamFamily",
+		   "L2ScaleFamily","L2ScaleShapeUnion","L2ScaleUnion","LnormScaleFamily",
+		   "MatrixorFunction","MCEstimate","NonSymmetric","NormLocationFamily",
+		   "NormLocationScaleFamily","NormScaleFamily","NormType","OddSymmetric",
+		   "onesidedBias","OptionalDistrListOrCall","OptionalNumericOrMatrix",
+		   "OptionalNumericOrMatrixOrCall","ParamFamily","ParamFamParameter",
+		   "ParamWithScaleAndShapeFamParameter","ParamWithScaleFamParameter",
+		   "ParamWithShapeFamParameter","PoisFamily","ProbFamily","QFNorm",
+		   "RiskType","SelfNorm","ShowDetails","symmetricBias","trAsCov","trFiCov")
\ No newline at end of file

Modified: branches/distr-2.5/pkg/distrDoc/vignettes/distr.Rnw
===================================================================
--- branches/distr-2.5/pkg/distrDoc/vignettes/distr.Rnw	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrDoc/vignettes/distr.Rnw	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,5 +1,5 @@
 %\VignetteIndexEntry{distr - manual}
-%\VignetteDepends{startupmsg,distr}
+%\VignetteDepends{distr}
 %\VignetteKeyword{probability distribution,simulation,estimation}
 %\VignettePackage{distr}
 %

Added: branches/distr-2.5/pkg/distrEllipse/.Rbuildignore
===================================================================
--- branches/distr-2.5/pkg/distrEllipse/.Rbuildignore	                        (rev 0)
+++ branches/distr-2.5/pkg/distrEllipse/.Rbuildignore	2013-09-06 19:35:14 UTC (rev 895)
@@ -0,0 +1,3 @@
+inst/doc/Rplots.pdf
+^.*\.svn.+
+.*-Ex\.R
\ No newline at end of file

Modified: branches/distr-2.5/pkg/distrEllipse/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/distrEllipse/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEllipse/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -3,7 +3,7 @@
 Date: 2013-01-09
 Title: S4 classes for elliptically contoured distributions
 Depends: R(>= 2.8.0), methods, graphics, mvtnorm, setRNG(>= 2006.2-1), distr(>= 2.2),
-        distrEx(>= 2.2), distrSim(>= 2.2), startupmsg
+        distrEx(>= 2.2), distrSim(>= 2.2)
 Suggests: distrMod(>= 2.2), distrTEst(>= 2.2)
 Author: Peter Ruckdeschel
 Description: Distribution (S4-)classes for elliptically contoured distributions (based on

Modified: branches/distr-2.5/pkg/distrEllipse/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distrEllipse/NAMESPACE	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEllipse/NAMESPACE	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,6 +1,5 @@
 import("methods")
 importFrom("setRNG", "setRNG")
-import("startupmsg")
 import("mvtnorm")
 import("distr")
 import("distrEx")

Added: branches/distr-2.5/pkg/distrEx/.Rbuildignore
===================================================================
--- branches/distr-2.5/pkg/distrEx/.Rbuildignore	                        (rev 0)
+++ branches/distr-2.5/pkg/distrEx/.Rbuildignore	2013-09-06 19:35:14 UTC (rev 895)
@@ -0,0 +1,3 @@
+inst/doc/Rplots.pdf
+^.*\.svn.+
+.*-Ex\.R
\ No newline at end of file

Modified: branches/distr-2.5/pkg/distrEx/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/distrEx/DESCRIPTION	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/DESCRIPTION	2013-09-06 19:35:14 UTC (rev 895)
@@ -3,7 +3,7 @@
 Date: 2013-01-09
 Title: Extensions of package distr
 Description: Extensions of package distr and some additional functionality
-Depends: R(>= 2.6.0), methods, distr(>= 2.2), startupmsg
+Depends: R(>= 2.6.0), methods, distr(>= 2.2)
 Suggests: tcltk
 Author: Matthias Kohl, Peter Ruckdeschel, Nataliya Horbenko
 Maintainer: Matthias Kohl <Matthias.Kohl at stamats.de>

Modified: branches/distr-2.5/pkg/distrEx/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distrEx/NAMESPACE	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/NAMESPACE	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,6 +1,5 @@
 useDynLib("distrEx")
 
-import("startupmsg")
 import("methods")
 import("distr")
 

Modified: branches/distr-2.5/pkg/distrEx/R/AllClass.R
===================================================================
--- branches/distr-2.5/pkg/distrEx/R/AllClass.R	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/R/AllClass.R	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,8 +1,25 @@
-.isEqual01 <- distr:::.isEqual01 ## for faster access due to local caching in package namespace
+.isEqual <- function(p0, p1, tol = min( getdistrOption("TruncQuantile")/2,
+                                          .Machine$double.eps^.7
+                                          ))
+                abs(p0-p1)< tol
+.isEqual01 <- function(x) .isEqual(x,0)|.isEqual(x,1)
+.inArgs <- function(arg, fct)
+          {as.character(arg) %in% names(formals(fct))}
 
+
+
 .onLoad <- function(lib, pkg){
 #    require("methods", character = TRUE, quietly = TRUE)
 }
+.ULC.cast <- function(x){
+         if( is(x,"AbscontDistribution"))
+             x <- as(as(x,"AbscontDistribution"), "UnivarLebDecDistribution")
+         if(is(x,"DiscreteDistribution"))
+             x <- as(as(x,"DiscreteDistribution"), "UnivarLebDecDistribution")
+         if(!is(x,"UnivarLebDecDistribution"))
+            x <- as(x,"UnivarLebDecDistribution")
+         return(x)
+}
 
 
 .onAttach <- function(library, pkg)

Modified: branches/distr-2.5/pkg/distrEx/R/ClippedMoments.R
===================================================================
--- branches/distr-2.5/pkg/distrEx/R/ClippedMoments.R	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/R/ClippedMoments.R	2013-09-06 19:35:14 UTC (rev 895)
@@ -1,8 +1,6 @@
 ###############################################################################
 ## Clipped first and second moments
 ###############################################################################
-.inArgs <- distr:::.inArgs
-
 setMethod("m1df", "UnivariateDistribution",
     function(object, upper, ... ){
         mc <- match.call()

Modified: branches/distr-2.5/pkg/distrEx/R/ConvexContamination.R
===================================================================
--- branches/distr-2.5/pkg/distrEx/R/ConvexContamination.R	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/R/ConvexContamination.R	2013-09-06 19:35:14 UTC (rev 895)
@@ -73,7 +73,7 @@
         Symmetry <- NoSymmetry()
         if(is(e1 at Symmetry,"SphericalSymmetry")&& 
            is(e2 at Symmetry,"SphericalSymmetry"))
-           if(distr:::.isEqual(SymmCenter(e1 at Symmetry),SymmCenter(e2 at Symmetry)))
+           if(.isEqual(SymmCenter(e1 at Symmetry),SymmCenter(e2 at Symmetry)))
               Symmetry <- SphericalSymmetry(SymmCenter(e1 at Symmetry))   
 
         return(new("AbscontDistribution", r = rfun, d = dfun, p = pfun, 
@@ -157,7 +157,7 @@
         Symmetry <- NoSymmetry()
         if(is(e1 at Symmetry,"SphericalSymmetry")&& 
            is(e2 at Symmetry,"SphericalSymmetry"))
-           if(distr:::.isEqual(SymmCenter(e1 at Symmetry),SymmCenter(e2 at Symmetry)))
+           if(.isEqual(SymmCenter(e1 at Symmetry),SymmCenter(e2 at Symmetry)))
               Symmetry <- SphericalSymmetry(SymmCenter(e1 at Symmetry))   
 
         return(new("DiscreteDistribution", r = rfun, d = dfun, p = pfun, q = qfun, 
@@ -230,7 +230,7 @@
         Symmetry <- NoSymmetry()
         if(is(e1 at Symmetry,"SphericalSymmetry")&& 
            is(e2 at Symmetry,"SphericalSymmetry"))
-           if(distr:::.isEqual(SymmCenter(e1 at Symmetry),SymmCenter(e2 at Symmetry)))
+           if(.isEqual(SymmCenter(e1 at Symmetry),SymmCenter(e2 at Symmetry)))
               Symmetry <- SphericalSymmetry(SymmCenter(e1 at Symmetry))   
 
         return(new("UnivariateDistribution", img = img(e1), r = rfun, d = NULL, 

Modified: branches/distr-2.5/pkg/distrEx/R/Expectation.R
===================================================================
--- branches/distr-2.5/pkg/distrEx/R/Expectation.R	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/R/Expectation.R	2013-09-06 19:35:14 UTC (rev 895)
@@ -844,7 +844,7 @@
              lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"), 
              upperTruncQuantile = getdistrExOption("EupperTruncQuantile"), 
              IQR.fac = getdistrExOption("IQR.fac"), ... ){
-        object <- distr:::.ULC.cast(object)
+        object <- .ULC.cast(object)
         I.ac <- E(acPart(object), fun = fun, cond = cond, low = low, upp = upp, 
                   rel.tol = rel.tol, 
                   lowerTruncQuantile = lowerTruncQuantile,

Modified: branches/distr-2.5/pkg/distrEx/R/Functionals.R
===================================================================
--- branches/distr-2.5/pkg/distrEx/R/Functionals.R	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/R/Functionals.R	2013-09-06 19:35:14 UTC (rev 895)
@@ -20,7 +20,7 @@
         }
         
         LowIsUpp <- if(low == -Inf) 
-                    low == -upp else distr:::.isEqual(ztr-low,upp-ztr)
+                    low == -upp else .isEqual(ztr-low,upp-ztr)
         
         if(LowIsUpp && missing(cond)&&missing(fun)){
            if(is(Symmetry(x),"SphericalSymmetry"))

Modified: branches/distr-2.5/pkg/distrEx/R/Kurtosis.R
===================================================================
--- branches/distr-2.5/pkg/distrEx/R/Kurtosis.R	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/R/Kurtosis.R	2013-09-06 19:35:14 UTC (rev 895)
@@ -14,7 +14,7 @@
         if(hasArg(low)) low <- dots$low
         if(hasArg(upp)) upp <- dots$upp
         LowIsUpp <- if(low == -Inf) 
-                    low == -upp else distr:::.isEqual(low,upp)
+                    low == -upp else .isEqual(low,upp)
 
         if(LowIsUpp && missing(cond)&&missing(fun)){
            if(is(Symmetry(x),"SphericalSymmetry")){

Modified: branches/distr-2.5/pkg/distrEx/man/E.Rd
===================================================================
--- branches/distr-2.5/pkg/distrEx/man/E.Rd	2013-04-22 16:21:50 UTC (rev 894)
+++ branches/distr-2.5/pkg/distrEx/man/E.Rd	2013-09-06 19:35:14 UTC (rev 895)
@@ -73,7 +73,8 @@
              low = NULL, upp = NULL, Nsim = getdistrExOption("MCIterations"), ...)
 
 \S4method{E}{UnivariateDistribution,function,missing}(object, fun, 
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/distr -r 895


More information about the Distr-commits mailing list