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

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

Author: ruckdeschel
Date: 2014-04-03 00:48:27 +0200 (Thu, 03 Apr 2014)
New Revision: 931

Modified:
   branches/distr-2.6/pkg/distrMod/R/ParamFamParameter.R
Log:
distrMod: fixed issue with slot withPosRestr in ParamFamParameter.R 

Modified: branches/distr-2.6/pkg/distrMod/R/ParamFamParameter.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/ParamFamParameter.R	2014-02-18 18:45:31 UTC (rev 930)
+++ branches/distr-2.6/pkg/distrMod/R/ParamFamParameter.R	2014-04-02 22:48:27 UTC (rev 931)
@@ -2,8 +2,7 @@
 ## generating function
 ParamFamParameter <- function(name, main = numeric(0), nuisance, fixed, trafo,
                   ..., .returnClsName = NULL){
-
-    mc <- as.list(match.call(expand.dots=TRUE))
+    mc <- as.list(match.call(expand.dots=FALSE))
     if(missing(name))
         name <- "parameter of a parametric family of probability measures"
     if(missing(nuisance))
@@ -36,13 +35,13 @@
        mat <- pmatch(nms,"withPosRestr")
        ws <- lS <- TRUE
        if(1 %in% mat){
-          PFP at withPosRestr <- mc$...[[which(mat==1)]]
+          PFP at withPosRestr <- eval(mc$...[[which(mat==1)]],sys.parent(1))
           ws <- FALSE
        }
        nms0 <- which(nms=="")
        if(length(nms0)){
            if(ws){
-              PFP at withPosRestr <- mc$...[[nms0[1]]]
+              PFP at withPosRestr <- eval(mc$...[[nms0[1]]],sys.parent(1))
               ws <- FALSE
               nms0 <- nms0[-1]
            }