[Distr-commits] r933 - branches/distr-2.6/pkg/distrMod/R

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

Author: ruckdeschel
Date: 2014-04-12 15:07:02 +0200 (Sat, 12 Apr 2014)
New Revision: 933

Modified:
   branches/distr-2.6/pkg/distrMod/R/MCEstimator.R
   branches/distr-2.6/pkg/distrMod/R/MDEstimator.R
Log:
distrMod: fixed issue with check.validity (reported by B.Spangl)

Modified: branches/distr-2.6/pkg/distrMod/R/MCEstimator.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/MCEstimator.R	2014-04-09 21:18:09 UTC (rev 932)
+++ branches/distr-2.6/pkg/distrMod/R/MCEstimator.R	2014-04-12 13:07:02 UTC (rev 933)
@@ -29,10 +29,12 @@
        argList$validity.check <- validity.check
     if(missing(Infos))      Infos <- NULL
     argList <- c(argList, Infos = Infos)
-    if(missing(crit.name)) crit.name <- ""               
+    argList <- c(argList, check.validity = validity.check )
+    if(missing(crit.name)) crit.name <- ""
     argList <- c(argList, crit.name = crit.name)               
     if(!is.null(dots))      argList <- c(argList, dots)
 
+
     ## call to mceCalc
     res0 <- do.call(mceCalc, argList)
     
@@ -46,7 +48,8 @@
                               res.name = paste("Minimum", crit.name, 
                                                "estimate", sep=" ", collapse=""), 
                               call = quote(es.call),
-                              .withEvalAsVar=.withEvalAsVar))
+                              .withEvalAsVar=.withEvalAsVar,
+                              check.validity = validity.check))
 
     if(!is.null(asv))   argList <- c(argList, asvar.fct = asv)
     if(!is.null(dots))  argList <- c(argList, dots)

Modified: branches/distr-2.6/pkg/distrMod/R/MDEstimator.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/MDEstimator.R	2014-04-09 21:18:09 UTC (rev 932)
+++ branches/distr-2.6/pkg/distrMod/R/MDEstimator.R	2014-04-12 13:07:02 UTC (rev 933)
@@ -32,7 +32,7 @@
     if(missing(validity.check)) validity.check <- TRUE
        argList$validity.check <- validity.check
     if(missing(Infos))      Infos <- NULL
-    argList <- c(argList, Infos = Infos)
+    argList <- c(argList, Infos = Infos, check.validity = validity.check )
     if(!is.null(dots))      argList <- c(argList, dots)
     ## call to mceCalc
     res0 <- do.call(mceCalc, argList)
@@ -44,7 +44,8 @@
                               res.name = paste("Minimum", dist.name, 
                                                "estimate", sep = " "), 
                               call = quote(es.call),
-                              .withEvalAsVar = .withEvalAsVar))
+                              .withEvalAsVar = .withEvalAsVar,
+                              check.validity = validity.check))
 
     if(!missing(asvar.fct))   argList <- c(argList, asvar.fct = asvar.fct)
     if(!is.null(dots))  argList <- c(argList, dots)