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

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

Author: ruckdeschel
Date: 2015-11-06 12:11:22 +0100 (Fri, 06 Nov 2015)
New Revision: 1065

Modified:
   branches/distr-2.6/pkg/distrMod/R/mleCalc-methods.R
   branches/distr-2.6/pkg/distrMod/R/modifyModel.R
   branches/distr-2.6/pkg/distrMod/R/validParameter.R
Log:
distrMod committed

Modified: branches/distr-2.6/pkg/distrMod/R/mleCalc-methods.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/mleCalc-methods.R	2015-11-06 10:46:19 UTC (rev 1064)
+++ branches/distr-2.6/pkg/distrMod/R/mleCalc-methods.R	2015-11-06 11:11:22 UTC (rev 1065)
@@ -128,8 +128,7 @@
                                     paste(round(theta,3),collapse=","),
                                    " threw an error;\n",  "returning starting par;\n",
                                    sep="")
-                      assign("allwarns", envir=parent.env(), 
-                                  value=c(get("allwarns", envir=parent.env()),warn0))
+                      allwarns <<- c(allwarns,warn0)
                       warning(warn0)
                   }else{crit0 <- try(do.call(what = criterionF, args = argList),
                                      silent = TRUE)
@@ -139,8 +138,7 @@
                                     paste(round(theta,3),collapse=","),
                                    " threw an error;\n",  "returning starting par;\n",
                                    sep="")
-                         assign("allwarns", envir=parent.env(), 
-                                  value=c(get("allwarns", envir=parent.env()),warn1))
+                         allwarns <<- c(allwarns,warn1)
                          warning(warn1)
                          }
                   }

Modified: branches/distr-2.6/pkg/distrMod/R/modifyModel.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/modifyModel.R	2015-11-06 10:46:19 UTC (rev 1064)
+++ branches/distr-2.6/pkg/distrMod/R/modifyModel.R	2015-11-06 11:11:22 UTC (rev 1065)
@@ -18,7 +18,7 @@
                               props = props0,
                               startPar = startPar0,
                               makeOKPar = makeOKPar0,
-                              modifyParam = modifyParam0,
+                              modifyParam = modifyParam0
                            ),
                       list(   name0 = M at name,
                               distribution0 = M at distribution,
@@ -27,7 +27,7 @@
                               props0 = M at props,
                               startPar0 = M at startPar,
                               makeOKPar0 = M at startPar,
-                              modifyParam0 = M at modifyParam,
+                              modifyParam0 = M at modifyParam
                           )
                       ))
           else{

Modified: branches/distr-2.6/pkg/distrMod/R/validParameter.R
===================================================================
--- branches/distr-2.6/pkg/distrMod/R/validParameter.R	2015-11-06 10:46:19 UTC (rev 1064)
+++ branches/distr-2.6/pkg/distrMod/R/validParameter.R	2015-11-06 11:11:22 UTC (rev 1065)
@@ -22,7 +22,7 @@
              sc <- NULL
              if(is(try(sc <- param["scale"], silent=TRUE),"try-error"))
                 if(is(object,"L2LocationScaleUnion"))
-                   try(sc <- param[locationscale(object)["scale"]],silent=TRUE)
+                   try(sc <- param[scalename(object)["scale"]],silent=TRUE)
              if(!is.null(sc) && !is.na(sc)) if(sc <= tol) return(FALSE)
              if(!all(is.finite(param))) return(FALSE)
              return(TRUE)})