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

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

Author: ruckdeschel
Date: 2013-01-19 01:51:29 +0100 (Sat, 19 Jan 2013)
New Revision: 865

Modified:
   branches/distr-2.5/pkg/distrMod/R/Estimator.R
   pkg/distrMod/R/Estimator.R
Log:
distrMod: yet again: Fixed yet another buglet with Estimator.

Modified: branches/distr-2.5/pkg/distrMod/R/Estimator.R
===================================================================
--- branches/distr-2.5/pkg/distrMod/R/Estimator.R	2013-01-19 00:25:50 UTC (rev 864)
+++ branches/distr-2.5/pkg/distrMod/R/Estimator.R	2013-01-19 00:51:29 UTC (rev 865)
@@ -51,7 +51,7 @@
     
     if(is.null(names(estimate))) names(estimate) <- name.est
     
-    param <- ParamFamParameter(name = names(estimate), 
+    param <- ParamFamParameter(name = names(estimate),
                                main = estimate[idm],
                                nuisance = estimate[idx],
                                fixed = fixed)
@@ -71,6 +71,7 @@
     res at estimate <- estimate[idm]
     
     asvar <- NULL
+
     if(!missing(asvar.fct)){
        PFam <- NULL
        if(!is.null(ParamFamily)) PFam <- modifyModel(ParamFamily, param)
@@ -78,6 +79,7 @@
                          silent=TRUE)
        if(!is(asvar.try,"try-error")) asvar <- asvar.try
     }
+    res at asvar <- asvar
     res at untransformed.asvar <- asvar
 
     if(!.isUnitMatrix(res at trafo$mat)){

Modified: pkg/distrMod/R/Estimator.R
===================================================================
--- pkg/distrMod/R/Estimator.R	2013-01-19 00:25:50 UTC (rev 864)
+++ pkg/distrMod/R/Estimator.R	2013-01-19 00:51:29 UTC (rev 865)
@@ -51,7 +51,7 @@
     
     if(is.null(names(estimate))) names(estimate) <- name.est
     
-    param <- ParamFamParameter(name = names(estimate), 
+    param <- ParamFamParameter(name = names(estimate),
                                main = estimate[idm],
                                nuisance = estimate[idx],
                                fixed = fixed)
@@ -71,6 +71,7 @@
     res at estimate <- estimate[idm]
     
     asvar <- NULL
+
     if(!missing(asvar.fct)){
        PFam <- NULL
        if(!is.null(ParamFamily)) PFam <- modifyModel(ParamFamily, param)
@@ -78,6 +79,7 @@
                          silent=TRUE)
        if(!is(asvar.try,"try-error")) asvar <- asvar.try
     }
+    res at asvar <- asvar
     res at untransformed.asvar <- asvar
 
     if(!.isUnitMatrix(res at trafo$mat)){