[Distr-commits] r1349 - in branches/distr-2.9/pkg/distrEx: R inst man

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

Author: ruckdeschel
Date: 2019-05-11 10:44:53 +0200 (Sat, 11 May 2019)
New Revision: 1349

Modified:
   branches/distr-2.9/pkg/distrEx/R/KolmogorovDist.R
   branches/distr-2.9/pkg/distrEx/inst/NEWS
   branches/distr-2.9/pkg/distrEx/man/KolmogorovDist.Rd
Log:
[distrEx] branch 2.9 KolmogorovDist methods gain argument "..." in order to enable them to digest argument validity.check in MCEstimator 


Modified: branches/distr-2.9/pkg/distrEx/R/KolmogorovDist.R
===================================================================
--- branches/distr-2.9/pkg/distrEx/R/KolmogorovDist.R	2019-05-02 06:35:59 UTC (rev 1348)
+++ branches/distr-2.9/pkg/distrEx/R/KolmogorovDist.R	2019-05-11 08:44:53 UTC (rev 1349)
@@ -4,7 +4,7 @@
 ###############################################################################
 setMethod("KolmogorovDist", signature(e1 = "AbscontDistribution",
                                       e2 = "AbscontDistribution"),
-    function(e1, e2){
+    function(e1, e2, ...){
         TruncQuantile <- getdistrOption("TruncQuantile")  
         lower1 <- ifelse(!is.finite(q.l(e1)(0)), q.l(e1)(TruncQuantile), q.l(e1)(0))
         upper1 <- ifelse(!is.finite(q.l(e1)(1)),
@@ -36,7 +36,7 @@
 
 setMethod("KolmogorovDist", signature(e1 = "DiscreteDistribution",
                                       e2 = "DiscreteDistribution"),
-    function(e1, e2){
+    function(e1, e2, ...){
         o.warn <- getOption("warn"); options(warn = -1)
         on.exit(options(warn=o.warn))
         supp <- union(support(e1), support(e2))
@@ -49,7 +49,7 @@
 
 setMethod("KolmogorovDist", signature(e1 = "DiscreteDistribution",
                                       e2 = "AbscontDistribution"),
-    function(e1, e2){
+    function(e1, e2, ...){
         o.warn <- getOption("warn"); options(warn = -1)
         on.exit(options(warn=o.warn))
         x <- support(e1)
@@ -61,13 +61,13 @@
 
 setMethod("KolmogorovDist", signature(e1 = "AbscontDistribution",
                                       e2 = "DiscreteDistribution"),
-    function(e1, e2){
-        KolmogorovDist(e2, e1)
+    function(e1, e2, ...){
+        KolmogorovDist(e2, e1, ...)
     })
 ## Kolmogorov distance
 setMethod("KolmogorovDist", signature(e1 = "numeric",
                                       e2 = "UnivariateDistribution"),
-    function(e1, e2){
+    function(e1, e2, ...){
         o.warn <- getOption("warn")
         options(warn = -1)
         emp <- DiscreteDistribution(e1)
@@ -76,14 +76,14 @@
 
 setMethod("KolmogorovDist", signature(e1 = "UnivariateDistribution",
                                       e2 = "numeric"),
-    function(e1, e2){
-        return(KolmogorovDist(e2, e1))
+    function(e1, e2, ...){
+        return(KolmogorovDist(e2, e1, ...))
     })
 
 #### new from version 2.0 on: Distance for Mixing Distributions
 setMethod("KolmogorovDist",  signature(e1 = "AcDcLcDistribution",
                                      e2 = "AcDcLcDistribution"),
-    function(e1, e2){
+    function(e1, e2, ...){
            if( is(e1,"AbscontDistribution"))
                e1 <- as(as(e1,"AbscontDistribution"), "UnivarLebDecDistribution")
            if( is(e2,"AbscontDistribution"))

Modified: branches/distr-2.9/pkg/distrEx/inst/NEWS
===================================================================
--- branches/distr-2.9/pkg/distrEx/inst/NEWS	2019-05-02 06:35:59 UTC (rev 1348)
+++ branches/distr-2.9/pkg/distrEx/inst/NEWS	2019-05-11 08:44:53 UTC (rev 1349)
@@ -20,7 +20,9 @@
    used as default in the functionals 
    
 under the hood:
-
++  KolmogorovDist methods gain argument "..." in order to enable them to
+   digest argument validity.check in MCEstimator 
+   
 ##############
 v 2.8
 ##############

Modified: branches/distr-2.9/pkg/distrEx/man/KolmogorovDist.Rd
===================================================================
--- branches/distr-2.9/pkg/distrEx/man/KolmogorovDist.Rd	2019-05-02 06:35:59 UTC (rev 1348)
+++ branches/distr-2.9/pkg/distrEx/man/KolmogorovDist.Rd	2019-05-11 08:44:53 UTC (rev 1349)
@@ -25,13 +25,13 @@
 }
 \usage{
 KolmogorovDist(e1, e2, ...)
-\S4method{KolmogorovDist}{AbscontDistribution,AbscontDistribution}(e1,e2)
-\S4method{KolmogorovDist}{AbscontDistribution,DiscreteDistribution}(e1,e2)
-\S4method{KolmogorovDist}{DiscreteDistribution,AbscontDistribution}(e1,e2)
-\S4method{KolmogorovDist}{DiscreteDistribution,DiscreteDistribution}(e1,e2)
-\S4method{KolmogorovDist}{numeric,UnivariateDistribution}(e1, e2)
-\S4method{KolmogorovDist}{UnivariateDistribution,numeric}(e1, e2)
-\S4method{KolmogorovDist}{AcDcLcDistribution,AcDcLcDistribution}(e1, e2)
+\S4method{KolmogorovDist}{AbscontDistribution,AbscontDistribution}(e1,e2, ...)
+\S4method{KolmogorovDist}{AbscontDistribution,DiscreteDistribution}(e1,e2, ...)
+\S4method{KolmogorovDist}{DiscreteDistribution,AbscontDistribution}(e1,e2, ...)
+\S4method{KolmogorovDist}{DiscreteDistribution,DiscreteDistribution}(e1,e2, ...)
+\S4method{KolmogorovDist}{numeric,UnivariateDistribution}(e1, e2, ...)
+\S4method{KolmogorovDist}{UnivariateDistribution,numeric}(e1, e2, ...)
+\S4method{KolmogorovDist}{AcDcLcDistribution,AcDcLcDistribution}(e1, e2, ...)
 }
 \arguments{
   \item{e1}{ object of class \code{"Distribution"} or class \code{"numeric"} }