[Distr-commits] r863 - branches/distr-2.5/pkg/distrMod/R pkg/distrMod/R

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

Author: ruckdeschel
Date: 2013-01-19 00:22:02 +0100 (Sat, 19 Jan 2013)
New Revision: 863

Modified:
   branches/distr-2.5/pkg/distrMod/R/Estimator.R
   pkg/distrMod/R/Estimator.R
Log:
distrMod: for asvar calculation, Estimator moves the parameter in the param Family to the just computed parameter value by modifyModel

Modified: branches/distr-2.5/pkg/distrMod/R/Estimator.R
===================================================================
--- branches/distr-2.5/pkg/distrMod/R/Estimator.R	2013-01-18 22:47:52 UTC (rev 862)
+++ branches/distr-2.5/pkg/distrMod/R/Estimator.R	2013-01-18 23:22:02 UTC (rev 863)
@@ -73,7 +73,9 @@
     
     asvar <- NULL
     if(!missing(asvar.fct)){
-       asvar.try <- try(asvar.fct(L2Fam = ParamFamily, param = param, ...),
+       PFam <- NULL
+       if(!is.null(ParamFamily)) PFam <- modifyModel(ParamFamily, param)
+       asvar.try <- try(asvar.fct(L2Fam = PFam, param = param, ...),
                          silent=TRUE)
        if(!is(asvar.try,"try-error")) asvar <- asvar.try
     }

Modified: pkg/distrMod/R/Estimator.R
===================================================================
--- pkg/distrMod/R/Estimator.R	2013-01-18 22:47:52 UTC (rev 862)
+++ pkg/distrMod/R/Estimator.R	2013-01-18 23:22:02 UTC (rev 863)
@@ -73,7 +73,9 @@
     
     asvar <- NULL
     if(!missing(asvar.fct)){
-       asvar.try <- try(asvar.fct(L2Fam = ParamFamily, param = param, ...),
+       PFam <- NULL
+       if(!is.null(ParamFamily)) PFam <- modifyModel(ParamFamily, param)
+       asvar.try <- try(asvar.fct(L2Fam = PFam, param = param, ...),
                          silent=TRUE)
        if(!is(asvar.try,"try-error")) asvar <- asvar.try
     }