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

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

Author: ruckdeschel
Date: 2013-02-23 22:45:05 +0100 (Sat, 23 Feb 2013)
New Revision: 891

Modified:
   branches/distr-2.5/pkg/distrMod/R/modifyModel.R
Log:
distrMod: fixed an issue with modifyModel in case of location scale models: in these cases we do neither want to produce a call nor an evaluated call to imageDistr...

Modified: branches/distr-2.5/pkg/distrMod/R/modifyModel.R
===================================================================
--- branches/distr-2.5/pkg/distrMod/R/modifyModel.R	2013-02-23 19:15:18 UTC (rev 890)
+++ branches/distr-2.5/pkg/distrMod/R/modifyModel.R	2013-02-23 21:45:05 UTC (rev 891)
@@ -73,7 +73,10 @@
                                        )
           if(missing(.withL2derivDistr))
                      .withL2derivDistr <- M at .withEvalL2derivDistr
-          M at L2derivDistr <- if(.withL2derivDistr) eval(callIm) else callIm
+          if(.withL2derivDistr && M at .withEvalL2derivDistr)
+                    M at L2derivDistr <- eval(callIm)
+          if(!.withL2derivDistr && !M at .withEvalL2derivDistr)
+                    M at L2derivDistr <- callIm
 
           M1 <- existsPIC(M)