[Distr-commits] r478 - in branches/distr-2.2/pkg/distrEx: . R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Jun 17 06:03:04 CEST 2009
Author: stamats
Date: 2009-06-17 06:03:03 +0200 (Wed, 17 Jun 2009)
New Revision: 478
Modified:
branches/distr-2.2/pkg/distrEx/DESCRIPTION
branches/distr-2.2/pkg/distrEx/R/Expectation.R
branches/distr-2.2/pkg/distrEx/man/0distrEx-package.Rd
branches/distr-2.2/pkg/distrEx/man/E.Rd
Log:
some small bugs corrected - mainly documentation issues
Modified: branches/distr-2.2/pkg/distrEx/DESCRIPTION
===================================================================
--- branches/distr-2.2/pkg/distrEx/DESCRIPTION 2009-06-17 02:22:50 UTC (rev 477)
+++ branches/distr-2.2/pkg/distrEx/DESCRIPTION 2009-06-17 04:03:03 UTC (rev 478)
@@ -1,6 +1,6 @@
Package: distrEx
Version: 2.2
-Date: 2009-03-19
+Date: 2009-06-17
Title: Extensions of package distr
Description: Extensions of package distr and some additional
functionality
Modified: branches/distr-2.2/pkg/distrEx/R/Expectation.R
===================================================================
--- branches/distr-2.2/pkg/distrEx/R/Expectation.R 2009-06-17 02:22:50 UTC (rev 477)
+++ branches/distr-2.2/pkg/distrEx/R/Expectation.R 2009-06-17 04:03:03 UTC (rev 478)
@@ -265,8 +265,7 @@
rel.tol= getdistrExOption("ErelativeTolerance"),
lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), ...
- ){
+ IQR.fac = getdistrExOption("IQR.fac"), ...){
fct <- function(x, dfun, cond){ x * dfun(x, cond) }
if(useApply){
integrand <- function(x, dfun, cond){
@@ -280,7 +279,7 @@
if(is.null(upp)) upp <- Inf
Ib <- .getIntbounds(object, low, upp, lowerTruncQuantile,
- upperTruncQuantile, IQR.fac, cond = cond)
+ upperTruncQuantile, IQR.fac, cond = cond)
low <- Ib["low"]
upp <- Ib["upp"]
@@ -291,7 +290,7 @@
setMethod("E", signature(object = "DiscreteCondDistribution",
fun = "missing",
cond = "numeric"),
- function(object, cond, useApply = TRUE, low = NULL, upp = NULL, ...){
+ function(object, cond, useApply = TRUE, low = NULL, upp = NULL, ...){
if(is.null(low)) low <- -Inf
if(is.null(upp)) upp <- Inf
supp <- support(object)(cond)
@@ -307,7 +306,7 @@
fun = "function",
cond = "numeric"),
function(object, fun, cond, withCond = FALSE, useApply = TRUE,
- Nsim = getdistrExOption("MCIterations"), ...){
+ low = NULL, upp = NULL, Nsim = getdistrExOption("MCIterations"), ...){
xsim <- r(object)(Nsim, cond)
if(is.null(low)) low <- -Inf
if(is.null(upp)) upp <- Inf
@@ -333,8 +332,7 @@
rel.tol= getdistrExOption("ErelativeTolerance"),
lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac")
- , ...){
+ IQR.fac = getdistrExOption("IQR.fac"), ...){
if(withCond)
if(useApply){
integrand <- function(x, dfun, fun, cond, ...){
Modified: branches/distr-2.2/pkg/distrEx/man/0distrEx-package.Rd
===================================================================
--- branches/distr-2.2/pkg/distrEx/man/0distrEx-package.Rd 2009-06-17 02:22:50 UTC (rev 477)
+++ branches/distr-2.2/pkg/distrEx/man/0distrEx-package.Rd 2009-06-17 04:03:03 UTC (rev 478)
@@ -27,7 +27,7 @@
\tabular{ll}{
Package: \tab distrEx\cr
Version: \tab 2.2\cr
-Date: \tab 2009-03-19\cr
+Date: \tab 2009-06-17\cr
Depends: \tab R(>= 2.6.0), methods, distr(>= 2.0), evd, actuar, startupmsg\cr
LazyLoad: \tab yes\cr
License: \tab LGPL-3\cr
Modified: branches/distr-2.2/pkg/distrEx/man/E.Rd
===================================================================
--- branches/distr-2.2/pkg/distrEx/man/E.Rd 2009-06-17 02:22:50 UTC (rev 477)
+++ branches/distr-2.2/pkg/distrEx/man/E.Rd 2009-06-17 04:03:03 UTC (rev 478)
@@ -71,7 +71,7 @@
\S4method{E}{UnivariateDistribution,function,missing}(object, fun,
useApply = TRUE, low = NULL, upp = NULL, Nsim = getdistrExOption("MCIterations"), ...)
-\S4method{E}{AbscontDistribution,function,missing}(object, fun, useApply = TRUE,
+\S4method{E}{AbscontDistribution,function,missing}(object, fun, useApply = TRUE,
low = NULL, upp = NULL,
rel.tol= getdistrExOption("ErelativeTolerance"),
lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
@@ -84,8 +84,9 @@
upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
IQR.fac = getdistrExOption("IQR.fac"), ...)
-\S4method{E}{UnivarMixingDistribution,function,missing}(object, fun, low = NULL,
- upp = NULL, rel.tol= getdistrExOption("ErelativeTolerance"),
+\S4method{E}{UnivarMixingDistribution,function,missing}(object, fun, useApply = TRUE,
+ low = NULL, upp = NULL,
+ rel.tol= getdistrExOption("ErelativeTolerance"),
lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
IQR.fac = getdistrExOption("IQR.fac"), ...)
@@ -96,7 +97,7 @@
upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
IQR.fac = getdistrExOption("IQR.fac"), ...)
-\S4method{E}{UnivarMixingDistribution,function,ANY}(object, fun, cond,
+\S4method{E}{UnivarMixingDistribution,function,ANY}(object, fun, cond, useApply = TRUE,
low = NULL, upp = NULL, rel.tol= getdistrExOption("ErelativeTolerance"),
lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
@@ -114,7 +115,7 @@
\S4method{E}{MultivariateDistribution,function,missing}(object, fun, useApply = TRUE,
Nsim = getdistrExOption("MCIterations"), ...)
-\S4method{E}{DiscreteMVDistribution,missing,missing}(object, useApply = TRUE, ...)
+\S4method{E}{DiscreteMVDistribution,missing,missing}(object, low = NULL, upp = NULL, ...)
\S4method{E}{DiscreteMVDistribution,function,missing}(object, fun,
useApply = TRUE, ...)
@@ -124,10 +125,10 @@
rel.tol= getdistrExOption("ErelativeTolerance"),
lowerTruncQuantile = getdistrExOption("ElowerTruncQuantile"),
upperTruncQuantile = getdistrExOption("EupperTruncQuantile"),
- IQR.fac = getdistrExOption("IQR.fac"), low = NULL, upp = NULL, ...)
+ IQR.fac = getdistrExOption("IQR.fac"), ...)
\S4method{E}{DiscreteCondDistribution,missing,numeric}(object, cond, useApply = TRUE,
- low, upp)
+ low = NULL, upp = NULL, ...)
\S4method{E}{UnivariateCondDistribution,function,numeric}(object, fun, cond,
withCond = FALSE, useApply = TRUE, low = NULL, upp = NULL,
More information about the Distr-commits
mailing list