[Distr-commits] r1121 - in branches/distr-2.7/pkg: distrEx/R distrMod/R

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

Author: ruckdeschel
Date: 2016-09-04 13:58:03 +0200 (Sun, 04 Sep 2016)
New Revision: 1121

Modified:
   branches/distr-2.7/pkg/distrEx/R/CvMDist.R
   branches/distr-2.7/pkg/distrMod/R/MDEstimator.R
Log:
Ported changes from trunk to branch 2.7

Modified: branches/distr-2.7/pkg/distrEx/R/CvMDist.R
===================================================================
--- branches/distr-2.7/pkg/distrEx/R/CvMDist.R	2016-09-04 11:12:50 UTC (rev 1120)
+++ branches/distr-2.7/pkg/distrEx/R/CvMDist.R	2016-09-04 11:58:03 UTC (rev 1121)
@@ -28,8 +28,9 @@
     function(e1, e2, mu = e1, ...)
         { o.warn <- getOption("warn"); options(warn = -1)
           on.exit(options(warn=o.warn))
-          if(identical(mu,e2))
-             return(.newCvMDist(e1,e2))
+          if(identical(mu,e2)){
+             if(is(e2, "AbscontDistribution"))
+             return(.newCvMDist(e1,e2)) }   
           e10 <- DiscreteDistribution(e1)       
           if(identical(mu,e1)) mu <- e10
           CvMDist(e1 = e10, e2 = e2, mu = mu, ...)

Modified: branches/distr-2.7/pkg/distrMod/R/MDEstimator.R
===================================================================
--- branches/distr-2.7/pkg/distrMod/R/MDEstimator.R	2016-09-04 11:12:50 UTC (rev 1120)
+++ branches/distr-2.7/pkg/distrMod/R/MDEstimator.R	2016-09-04 11:58:03 UTC (rev 1121)
@@ -24,8 +24,9 @@
 
     if(paramDepDist) dots$thetaPar <-NULL
 
+    distanceFctWithoutVal <- function(e1,e2,check.validity=NULL,...) distance(e1,e2,...)
     ## manipulation of the arg list to method mceCalc
-    argList <- c(list(x = x, PFam = ParamFamily, criterion = distance,
+    argList <- c(list(x = x, PFam = ParamFamily, criterion = distanceFctWithoutVal,
                    startPar = startPar, penalty = penalty, 
                    crit.name = dist.name, withthetaPar = paramDepDist))