[Distr-commits] r466 - branches/distr-2.2/pkg/distrEx/R pkg/SweaveListingUtils/chm pkg/distr/chm pkg/distrEx/R pkg/distrEx/chm pkg/startupmsg/chm
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Apr 15 13:27:00 CEST 2009
Author: ruckdeschel
Date: 2009-04-15 13:27:00 +0200 (Wed, 15 Apr 2009)
New Revision: 466
Removed:
branches/distr-2.2/pkg/distrEx/R/Expectation_LebDec.R
pkg/distrEx/R/Expectation_LebDec.R
Modified:
branches/distr-2.2/pkg/distrEx/R/Expectation.R
pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
pkg/distr/chm/Distr.chm
pkg/distrEx/R/Expectation.R
pkg/distrEx/chm/distrEx.chm
pkg/startupmsg/chm/startupmsg.chm
Log:
merged Expectation_LebDec.R into Expectation.R
according to proposal by Kurt Hornik (different Collation order caused
problem in English locale)
Modified: branches/distr-2.2/pkg/distrEx/R/Expectation.R
===================================================================
--- branches/distr-2.2/pkg/distrEx/R/Expectation.R 2009-04-15 09:06:23 UTC (rev 465)
+++ branches/distr-2.2/pkg/distrEx/R/Expectation.R 2009-04-15 11:27:00 UTC (rev 466)
@@ -739,4 +739,117 @@
else
return(E(as(object,"AbscontDistribution"), low=low, upp=upp, ...))
})
-## http://mathworld.wolfram.com/GumbelDistribution.html
\ No newline at end of file
+## http://mathworld.wolfram.com/GumbelDistribution.html
+
+
+############################ Expectation for UnivarLebDecDistribution
+### merged from Expectation_LebDec.R on Apr 15 2009
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "missing",
+ cond = "missing"),
+ function(object, low = NULL, upp = NULL, rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ...){
+ if(is(Symmetry(object),"SphericalSymmetry"))
+ return(SymmCenter(Symmetry(object)))
+ I.ac <- E(acPart(object), low = low, upp = upp, rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), low = low, upp = upp )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "function",
+ cond = "missing"),
+ function(object, fun, useApply = TRUE, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ I.ac <- E(acPart(object), fun = fun, useApply = useApply,
+ low = low, upp = upp, rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), fun = fun, useApply = useApply,
+ low = low, upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "missing",
+ cond = "ANY"),
+ function(object, cond, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ I.ac <- E(acPart(object), cond = cond, low = low, upp = upp,
+ rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), cond = cond, low = low, upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "function",
+ cond = "ANY"),
+ function(object, fun, cond, useApply = TRUE, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ I.ac <- E(acPart(object), fun = fun, cond = cond, useApply = useApply,
+ low = low, upp = upp, rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), fun = fun, cond = cond,
+ useApply = useApply, low = low, upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+
+setMethod("E", signature(object = "AffLinUnivarLebDecDistribution",
+ fun = "missing",
+ cond = "missing"),
+ getMethod("E", signature(object = "AffLinDistribution",
+ fun = "missing",
+ cond = "missing")))
+
+setMethod("E", signature(object = "AcDcLcDistribution",
+ fun = "ANY",
+ cond = "ANY"),
+ function(object, fun, cond, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ object <- distr:::.ULC.cast(object)
+ I.ac <- E(acPart(object), fun = fun, cond = cond, low = low, upp = upp,
+ rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), fun = fun, cond = cond, low = low,
+ upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+
+setMethod("E", signature(object = "CompoundDistribution",
+ fun = "missing",
+ cond = "missing"),
+ function(object, low = NULL, upp = NULL, ...){
+ S <- object at SummandsDistr
+ N <- object at NumbOfSummandsDistr
+ if(!is.null(low)) if(low <= q(object)(0)) low <- NULL
+ if(!is.null(upp)) if(upp >= q(object)(1)) upp <- NULL
+
+ if(is(S,"UnivariateDistribution") && is.null(low) && is.null(upp))
+ return(E(S, ...)*E(N))
+ else{
+ return(E(simplifyD(object), low = low, upp = upp, ...))
+ }
+ })
Deleted: branches/distr-2.2/pkg/distrEx/R/Expectation_LebDec.R
===================================================================
--- branches/distr-2.2/pkg/distrEx/R/Expectation_LebDec.R 2009-04-15 09:06:23 UTC (rev 465)
+++ branches/distr-2.2/pkg/distrEx/R/Expectation_LebDec.R 2009-04-15 11:27:00 UTC (rev 466)
@@ -1,111 +0,0 @@
-############################ Expectation
-
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "missing",
- cond = "missing"),
- function(object, low = NULL, upp = NULL, rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ...){
- if(is(Symmetry(object),"SphericalSymmetry"))
- return(SymmCenter(Symmetry(object)))
- I.ac <- E(acPart(object), low = low, upp = upp, rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), low = low, upp = upp )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "function",
- cond = "missing"),
- function(object, fun, useApply = TRUE, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- I.ac <- E(acPart(object), fun = fun, useApply = useApply,
- low = low, upp = upp, rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), fun = fun, useApply = useApply,
- low = low, upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "missing",
- cond = "ANY"),
- function(object, cond, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- I.ac <- E(acPart(object), cond = cond, low = low, upp = upp,
- rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), cond = cond, low = low, upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "function",
- cond = "ANY"),
- function(object, fun, cond, useApply = TRUE, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- I.ac <- E(acPart(object), fun = fun, cond = cond, useApply = useApply,
- low = low, upp = upp, rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), fun = fun, cond = cond,
- useApply = useApply, low = low, upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-
-setMethod("E", signature(object = "AffLinUnivarLebDecDistribution",
- fun = "missing",
- cond = "missing"),
- getMethod("E", signature(object = "AffLinDistribution",
- fun = "missing",
- cond = "missing")))
-
-setMethod("E", signature(object = "AcDcLcDistribution",
- fun = "ANY",
- cond = "ANY"),
- function(object, fun, cond, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- object <- distr:::.ULC.cast(object)
- I.ac <- E(acPart(object), fun = fun, cond = cond, low = low, upp = upp,
- rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), fun = fun, cond = cond, low = low,
- upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-
-setMethod("E", signature(object = "CompoundDistribution",
- fun = "missing",
- cond = "missing"),
- function(object, low = NULL, upp = NULL, ...){
- S <- object at SummandsDistr
- N <- object at NumbOfSummandsDistr
- if(!is.null(low)) if(low <= q(object)(0)) low <- NULL
- if(!is.null(upp)) if(upp >= q(object)(1)) upp <- NULL
-
- if(is(S,"UnivariateDistribution") && is.null(low) && is.null(upp))
- return(E(S, ...)*E(N))
- else{
- return(E(simplifyD(object), low = low, upp = upp, ...))
- }
- })
Modified: pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)
Modified: pkg/distr/chm/Distr.chm
===================================================================
(Binary files differ)
Modified: pkg/distrEx/R/Expectation.R
===================================================================
--- pkg/distrEx/R/Expectation.R 2009-04-15 09:06:23 UTC (rev 465)
+++ pkg/distrEx/R/Expectation.R 2009-04-15 11:27:00 UTC (rev 466)
@@ -705,4 +705,117 @@
else
return(E(as(object,"AbscontDistribution"), low=low, upp=upp, ...))
})
-## http://mathworld.wolfram.com/GumbelDistribution.html
\ No newline at end of file
+## http://mathworld.wolfram.com/GumbelDistribution.html
+
+
+
+############################ Expectation for UnivarLebDecDistribution
+### merged from Expectation_LebDec.R on Apr 15 2009
+
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "missing",
+ cond = "missing"),
+ function(object, low = NULL, upp = NULL, rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ...){
+ I.ac <- E(acPart(object), low = low, upp = upp, rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), low = low, upp = upp )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "function",
+ cond = "missing"),
+ function(object, fun, useApply = TRUE, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ I.ac <- E(acPart(object), fun = fun, useApply = useApply,
+ low = low, upp = upp, rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), fun = fun, useApply = useApply,
+ low = low, upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "missing",
+ cond = "ANY"),
+ function(object, cond, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ I.ac <- E(acPart(object), cond = cond, low = low, upp = upp,
+ rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), cond = cond, low = low, upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+
+setMethod("E", signature(object = "UnivarLebDecDistribution",
+ fun = "function",
+ cond = "ANY"),
+ function(object, fun, cond, useApply = TRUE, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ I.ac <- E(acPart(object), fun = fun, cond = cond, useApply = useApply,
+ low = low, upp = upp, rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), fun = fun, cond = cond,
+ useApply = useApply, low = low, upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+
+setMethod("E", signature(object = "AffLinUnivarLebDecDistribution",
+ fun = "missing",
+ cond = "missing"),
+ getMethod("E", signature(object = "AffLinDistribution",
+ fun = "missing",
+ cond = "missing")))
+
+setMethod("E", signature(object = "AcDcLcDistribution",
+ fun = "ANY",
+ cond = "ANY"),
+ function(object, fun, cond, low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
+ lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
+ upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
+ IQR.fac = getdistrExOption("IQR.fac"), ... ){
+ object <- distr:::.ULC.cast(object)
+ I.ac <- E(acPart(object), fun = fun, cond = cond, low = low, upp = upp,
+ rel.tol = rel.tol,
+ lowerTruncQuantile = lowerTruncQuantile,
+ upperTruncQuantile = upperTruncQuantile,
+ IQR.fac = IQR.fac, ... )
+ I.dc <- E(discretePart(object), fun = fun, cond = cond, low = low,
+ upp = upp, ... )
+ as.vector(object at mixCoeff %*% c(I.ac, I.dc))
+ })
+
+setMethod("E", signature(object = "CompoundDistribution",
+ fun = "missing",
+ cond = "missing"),
+ function(object, low = NULL, upp = NULL, ...){
+ S <- object at SummandsDistr
+ N <- object at NumbOfSummandsDistr
+ if(!is.null(low)) if(low <= q(object)(0)) low <- NULL
+ if(!is.null(upp)) if(upp >= q(object)(1)) upp <- NULL
+
+ if(is(S,"UnivariateDistribution") && is.null(low) && is.null(upp))
+ return(E(S, ...)*E(N))
+ else{
+ return(E(simplifyD(object), low = low, upp = upp, ...))
+ }
+ })
Deleted: pkg/distrEx/R/Expectation_LebDec.R
===================================================================
--- pkg/distrEx/R/Expectation_LebDec.R 2009-04-15 09:06:23 UTC (rev 465)
+++ pkg/distrEx/R/Expectation_LebDec.R 2009-04-15 11:27:00 UTC (rev 466)
@@ -1,109 +0,0 @@
-############################ Expectation
-
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "missing",
- cond = "missing"),
- function(object, low = NULL, upp = NULL, rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ...){
- I.ac <- E(acPart(object), low = low, upp = upp, rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), low = low, upp = upp )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "function",
- cond = "missing"),
- function(object, fun, useApply = TRUE, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- I.ac <- E(acPart(object), fun = fun, useApply = useApply,
- low = low, upp = upp, rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), fun = fun, useApply = useApply,
- low = low, upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "missing",
- cond = "ANY"),
- function(object, cond, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- I.ac <- E(acPart(object), cond = cond, low = low, upp = upp,
- rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), cond = cond, low = low, upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-
-setMethod("E", signature(object = "UnivarLebDecDistribution",
- fun = "function",
- cond = "ANY"),
- function(object, fun, cond, useApply = TRUE, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- I.ac <- E(acPart(object), fun = fun, cond = cond, useApply = useApply,
- low = low, upp = upp, rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), fun = fun, cond = cond,
- useApply = useApply, low = low, upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-
-setMethod("E", signature(object = "AffLinUnivarLebDecDistribution",
- fun = "missing",
- cond = "missing"),
- getMethod("E", signature(object = "AffLinDistribution",
- fun = "missing",
- cond = "missing")))
-
-setMethod("E", signature(object = "AcDcLcDistribution",
- fun = "ANY",
- cond = "ANY"),
- function(object, fun, cond, low = NULL, upp = NULL,
- rel.tol= getdistrExOption("ErelativeTolerance"),
- lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
- upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ... ){
- object <- distr:::.ULC.cast(object)
- I.ac <- E(acPart(object), fun = fun, cond = cond, low = low, upp = upp,
- rel.tol = rel.tol,
- lowerTruncQuantile = lowerTruncQuantile,
- upperTruncQuantile = upperTruncQuantile,
- IQR.fac = IQR.fac, ... )
- I.dc <- E(discretePart(object), fun = fun, cond = cond, low = low,
- upp = upp, ... )
- as.vector(object at mixCoeff %*% c(I.ac, I.dc))
- })
-
-setMethod("E", signature(object = "CompoundDistribution",
- fun = "missing",
- cond = "missing"),
- function(object, low = NULL, upp = NULL, ...){
- S <- object at SummandsDistr
- N <- object at NumbOfSummandsDistr
- if(!is.null(low)) if(low <= q(object)(0)) low <- NULL
- if(!is.null(upp)) if(upp >= q(object)(1)) upp <- NULL
-
- if(is(S,"UnivariateDistribution") && is.null(low) && is.null(upp))
- return(E(S, ...)*E(N))
- else{
- return(E(simplifyD(object), low = low, upp = upp, ...))
- }
- })
Modified: pkg/distrEx/chm/distrEx.chm
===================================================================
(Binary files differ)
Modified: pkg/startupmsg/chm/startupmsg.chm
===================================================================
(Binary files differ)
More information about the Distr-commits
mailing list