[Distr-commits] r901 - in branches/distr-2.5/pkg: distr distr/R distr/man distrDoc distrMod/R distrSim distrSim/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Sep 10 12:12:54 CEST 2013
Author: ruckdeschel
Date: 2013-09-10 12:12:54 +0200 (Tue, 10 Sep 2013)
New Revision: 901
Added:
branches/distr-2.5/pkg/distr/man/internalGenerics.Rd
Modified:
branches/distr-2.5/pkg/distr/NAMESPACE
branches/distr-2.5/pkg/distr/R/AllGenerics.R
branches/distr-2.5/pkg/distr/man/operators-methods.Rd
branches/distr-2.5/pkg/distr/man/qqplot.Rd
branches/distr-2.5/pkg/distrDoc/NAMESPACE
branches/distr-2.5/pkg/distrMod/R/AllGeneric.R
branches/distr-2.5/pkg/distrSim/NAMESPACE
branches/distr-2.5/pkg/distrSim/R/AllGenerics.R
Log:
[devel-branch] moved the generics of 'distribution' and 'samplesize' from pkgs distrSim and distrMod to pkg distr in order to avoid conflicts in import; in pkg distr inserted some \dontrun{.}'s in examples of qqplot and operators-methods
Modified: branches/distr-2.5/pkg/distr/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distr/NAMESPACE 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distr/NAMESPACE 2013-09-10 10:12:54 UTC (rev 901)
@@ -95,4 +95,5 @@
export("qqbounds","igamma")
exportMethods("qqplot")
export(".isEqual",".isEqual01", ".inArgs", ".fillList",
- ".presubs", ".makeLenAndOrder", ".DistrCollapse")
\ No newline at end of file
+ ".presubs", ".makeLenAndOrder", ".DistrCollapse")
+export("samplesize", "distribution")
\ No newline at end of file
Modified: branches/distr-2.5/pkg/distr/R/AllGenerics.R
===================================================================
--- branches/distr-2.5/pkg/distr/R/AllGenerics.R 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distr/R/AllGenerics.R 2013-09-10 10:12:54 UTC (rev 901)
@@ -443,4 +443,10 @@
}
if(!isGeneric("Symmetry")){
setGeneric("Symmetry", function(object) standardGeneric("Symmetry"))
-}
\ No newline at end of file
+}
+if(!isGeneric("distribution")){
+ setGeneric("distribution", function(object) standardGeneric("distribution"))
+}
+if(!isGeneric("samplesize")){
+ setGeneric("samplesize", function(object, ...) standardGeneric("samplesize"))
+}
Added: branches/distr-2.5/pkg/distr/man/internalGenerics.Rd
===================================================================
--- branches/distr-2.5/pkg/distr/man/internalGenerics.Rd (rev 0)
+++ branches/distr-2.5/pkg/distr/man/internalGenerics.Rd 2013-09-10 10:12:54 UTC (rev 901)
@@ -0,0 +1,23 @@
+\name{internalGenerics}
+\alias{internalGenerics}
+\alias{distribution}
+\alias{samplesize}
+\title{Internal: Common Generics 'distribution' and 'samplesize'}
+\description{
+ In order to be able to use packages \pkg{distrSim} and \pkg{distrMod} independently,
+ it is necessary to import the respective generic from a prior package, i.e.,
+ \pkg{distr}.
+ }
+\usage{
+distribution(object)
+samplesize(object, ...)
+}
+\arguments{
+ \item{object}{ the first argument to dispatch on in the actual methods. }
+ \item{\dots}{ additional arguments for function \code{samplesize}. }
+}
+
+\author{
+ Peter Ruckdeschel \email{Peter.Ruckdeschel at itwm.fraunhofer.de}}
+
+\keyword{internal}
Modified: branches/distr-2.5/pkg/distr/man/operators-methods.Rd
===================================================================
--- branches/distr-2.5/pkg/distr/man/operators-methods.Rd 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distr/man/operators-methods.Rd 2013-09-10 10:12:54 UTC (rev 901)
@@ -328,7 +328,10 @@
N / a + sin( a * P - N)
N * P
N / N
+\dontrun{
+## takes a little time
N ^ P
+}
1.2 ^ N
abs(N) ^ 1.3
}
Modified: branches/distr-2.5/pkg/distr/man/qqplot.Rd
===================================================================
--- branches/distr-2.5/pkg/distr/man/qqplot.Rd 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distr/man/qqplot.Rd 2013-09-10 10:12:54 UTC (rev 901)
@@ -133,6 +133,8 @@
mylist2 <- mylist+0.1
qqplot(mylist,mylist2)
qqplot(mylist,mylist2,exact.pCI=FALSE,exact.sCI=FALSE)
+\dontrun{
+## takes time
qqplot(mylist,mylist2,nosym.pCI=TRUE)
## some ac. distribution with a gap
mylist3 <- UnivarMixingDistribution(Unif(0,0.3),Unif(0.6,1),mixCoeff=c(0.8,0.2))
@@ -141,5 +143,6 @@
qqplot(mylist3,mylist4)
qqplot(mylist3,mylist4,nosym.pCI=TRUE)
}
+}
\keyword{hplot}
\keyword{distribution}
Modified: branches/distr-2.5/pkg/distrDoc/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distrDoc/NAMESPACE 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distrDoc/NAMESPACE 2013-09-10 10:12:54 UTC (rev 901)
@@ -8,57 +8,4 @@
import("distrTEst")
import("distrTeach")
import("RandVar")
-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
+import("distrMod")
Modified: branches/distr-2.5/pkg/distrMod/R/AllGeneric.R
===================================================================
--- branches/distr-2.5/pkg/distrMod/R/AllGeneric.R 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distrMod/R/AllGeneric.R 2013-09-10 10:12:54 UTC (rev 901)
@@ -31,9 +31,6 @@
if(!isGeneric("distrSymm")){
setGeneric("distrSymm", function(object) standardGeneric("distrSymm"))
}
-if(!isGeneric("distribution")){
- setGeneric("distribution", function(object) standardGeneric("distribution"))
-}
if(!isGeneric("props")){
setGeneric("props", function(object) standardGeneric("props"))
}
@@ -202,9 +199,6 @@
if(!isGeneric("completecases")){
setGeneric("completecases", function(object) standardGeneric("completecases"))
}
-if(!isGeneric("samplesize")){
- setGeneric("samplesize", function(object, ...) standardGeneric("samplesize"))
-}
if(!isGeneric("asvar")){
setGeneric("asvar", function(object) standardGeneric("asvar"))
}
Modified: branches/distr-2.5/pkg/distrSim/NAMESPACE
===================================================================
--- branches/distr-2.5/pkg/distrSim/NAMESPACE 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distrSim/NAMESPACE 2013-09-10 10:12:54 UTC (rev 901)
@@ -1,5 +1,4 @@
import("methods")
-import("startupmsg")
importFrom("stats", "simulate")
importFrom("setRNG", "setRNG")
import("distr")
Modified: branches/distr-2.5/pkg/distrSim/R/AllGenerics.R
===================================================================
--- branches/distr-2.5/pkg/distrSim/R/AllGenerics.R 2013-09-07 18:30:57 UTC (rev 900)
+++ branches/distr-2.5/pkg/distrSim/R/AllGenerics.R 2013-09-10 10:12:54 UTC (rev 901)
@@ -12,9 +12,7 @@
setGeneric("Data", function(object) standardGeneric("Data"))
if(!isGeneric("runs"))
setGeneric("runs", function(object) standardGeneric("runs"))
-if(!isGeneric("samplesize"))
- setGeneric("samplesize", function(object) standardGeneric("samplesize"))
-if(!isGeneric("obsDim"))
+if(!isGeneric("obsDim"))
setGeneric("obsDim",
function(object) standardGeneric("obsDim")) ### new v.1.8
if(!isGeneric("name"))
@@ -95,8 +93,6 @@
## Access Methods
if(!isGeneric("seed"))
setGeneric("seed", function(object) standardGeneric("seed"))
-if(!isGeneric("distribution"))
- setGeneric("distribution", function(object) standardGeneric("distribution"))
## Replace Methoden
if(!isGeneric("seed<-"))
More information about the Distr-commits
mailing list