[Robast-commits] r1129 - in branches/robast-1.2/pkg/RobAStBase: . R inst man

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2018-08-12 07:37:32 +0200 (Sun, 12 Aug 2018)
New Revision: 1129

Modified:
   branches/robast-1.2/pkg/RobAStBase/NAMESPACE
   branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R
   branches/robast-1.2/pkg/RobAStBase/R/getboundedIC.R
   branches/robast-1.2/pkg/RobAStBase/inst/NEWS
   branches/robast-1.2/pkg/RobAStBase/man/internals.Rd
Log:
[RobAStBase] branch 1.2 
+ introduce filter function .filterEargs to filter out relevant argumengs for E() from ...


Modified: branches/robast-1.2/pkg/RobAStBase/NAMESPACE
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/NAMESPACE	2018-08-12 00:07:24 UTC (rev 1128)
+++ branches/robast-1.2/pkg/RobAStBase/NAMESPACE	2018-08-12 05:37:32 UTC (rev 1129)
@@ -89,4 +89,4 @@
 export(".rescalefct",".plotRescaledAxis",".makedotsP",".makedotsLowLevel",".SelectOrderData")
 export(".merge.lists")
 export("InfoPlot", "ComparePlot", "PlotIC")
-export(".fixInLiesInSupport", "..IntegrateArgs")
\ No newline at end of file
+export(".fixInLiesInSupport", "..IntegrateArgs", ".filterEargs")
\ No newline at end of file

Modified: branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R	2018-08-12 00:07:24 UTC (rev 1128)
+++ branches/robast-1.2/pkg/RobAStBase/R/CheckMakeIC.R	2018-08-12 05:37:32 UTC (rev 1129)
@@ -7,10 +7,8 @@
         nrvalues <- nrow(trafo)
         Distr <- L2Fam at distribution
 
-        dots <- list(...)
-        dotsI <- list()
-        for(item in ..IntegrateArgs) dotsI[[item]] <- dots[[item]]
-        if(!is.null(dotsI$useApply)) dotsI$useApply <- FALSE
+        dotsI <- .filterEargs(list(...))
+        if(is.null(dotsI$useApply)) dotsI$useApply <- FALSE
 
 
         IC.v <- as(diag(nrvalues) %*% IC at Curve, "EuclRandVariable")
@@ -176,3 +174,9 @@
 ..IntegrateArgs <- c("lowerTruncQuantile", "upperTruncQuantile",
            "IQR.fac", "subdivisions", "rel.tol", "abs.tol", "stop.on.error",
            "order", "useApply")
+
+.filterEargs <- function(dots){
+        dotsI <- list()
+        for(item in ..IntegrateArgs) dotsI[[item]] <- dots[[item]]
+        return(dotsI)
+}
\ No newline at end of file

Modified: branches/robast-1.2/pkg/RobAStBase/R/getboundedIC.R
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/R/getboundedIC.R	2018-08-12 00:07:24 UTC (rev 1128)
+++ branches/robast-1.2/pkg/RobAStBase/R/getboundedIC.R	2018-08-12 05:37:32 UTC (rev 1129)
@@ -1,9 +1,7 @@
 getBoundedIC <- function(L2Fam, D=trafo(L2Fam at param),...){
 
-        dots <- list(...)
-        dotsI <- list()
-        for(item in ..IntegrateArgs) dotsI[[item]] <- dots[[item]]
-        if(!is.null(dotsI$useApply)) dotsI$useApply <- FALSE
+        dotsI <- .filterEargs(list(...))
+        if(is.null(dotsI$useApply)) dotsI$useApply <- FALSE
 
         FI <- FisherInfo(L2Fam)
         bm <- sum(diag(distr::solve(FI)))

Modified: branches/robast-1.2/pkg/RobAStBase/inst/NEWS
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/inst/NEWS	2018-08-12 00:07:24 UTC (rev 1128)
+++ branches/robast-1.2/pkg/RobAStBase/inst/NEWS	2018-08-12 05:37:32 UTC (rev 1129)
@@ -85,6 +85,7 @@
 + new internal constant ..IntegrateArgs which contains the names of all arguments 
   used for integration, i.e., currently, c("lowerTruncQuantile", "upperTruncQuantile",
   "IQR.fac", "subdivisions", "rel.tol", "abs.tol", "stop.on.error", "order", "useApply")
+  this is used to filter out arguments from dots which are meant for E() 
 + getboundedIC now uses coordinate-wise integration with useApply = FALSE and 
   only computing the upper half of E LL'w 
   

Modified: branches/robast-1.2/pkg/RobAStBase/man/internals.Rd
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/man/internals.Rd	2018-08-12 00:07:24 UTC (rev 1128)
+++ branches/robast-1.2/pkg/RobAStBase/man/internals.Rd	2018-08-12 05:37:32 UTC (rev 1129)
@@ -18,6 +18,7 @@
 .msapply(X, FUN, ..., simplify = TRUE, USE.NAMES = TRUE)
 .fixInLiesInSupport(IC, distr)
 ..IntegrateArgs
+.filterEargs(dots)
 }
 \arguments{
   \item{x}{a (numeric) vector}
@@ -35,6 +36,7 @@
   use \code{X} as names for the result unless it had names already.}
   \item{IC}{an object of class \code{IC}, i.e., it expects a slot \code{Curve} like an IC.}
   \item{distr}{a distribution}
+  \item{dots}{a list, obtained by \code{list(...)}.}
 }
 
 \details{
@@ -50,6 +52,8 @@
 \code{..IntegrateArgs} is an internal constant, containing the names of all arguments
   used for integration, i.e., currently, \code{c("lowerTruncQuantile", "upperTruncQuantile",
   "IQR.fac", "subdivisions", "rel.tol", "abs.tol", "stop.on.error", "order", "useApply")}.
+\code{.filterEargs} filters out of \code{dots} all named arguments which have names
+    contained in \code{..IntegrateArgs} and returns a list with these items.
 }