[Distr-commits] r314 - in pkg/distrMod: . R

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

Author: stamats
Date: 2008-10-24 06:29:02 +0200 (Fri, 24 Oct 2008)
New Revision: 314

Modified:
   pkg/distrMod/DESCRIPTION
   pkg/distrMod/R/modifyModel.R
Log:
small modifications to modifyModel ... modification of model a crucial step ... find a better way to do this???

Modified: pkg/distrMod/DESCRIPTION
===================================================================
--- pkg/distrMod/DESCRIPTION	2008-10-23 15:09:41 UTC (rev 313)
+++ pkg/distrMod/DESCRIPTION	2008-10-24 04:29:02 UTC (rev 314)
@@ -1,6 +1,6 @@
 Package: distrMod
 Version: 2.0.2
-Date: 2008-10-23
+Date: 2008-10-24
 Title: Object orientated implementation of probability models
 Description: Object orientated implementation of probability models
         based on packages 'distr' and 'distrEx'

Modified: pkg/distrMod/R/modifyModel.R
===================================================================
--- pkg/distrMod/R/modifyModel.R	2008-10-23 15:09:41 UTC (rev 313)
+++ pkg/distrMod/R/modifyModel.R	2008-10-24 04:29:02 UTC (rev 314)
@@ -79,6 +79,7 @@
              M <- modifyModel(as(model, "L2ParamFamily"), param = param,
                               .withCall = FALSE)
              loc <- main(param(M))
+             M at L2derivDistr <- L2derivDistr(model)
              M at distrSymm <- SphericalSymmetry(SymmCenter = loc)
              M at L2derivSymm <- FunSymmList(OddSymmetric(SymmCenter = loc))
              M at L2derivDistrSymm <- DistrSymmList(SphericalSymmetry(
@@ -96,6 +97,8 @@
              }
              M at fam.call <- cl
              class(M) <- class(model)
+             M at locscalename <- locscalename(model)
+             M at LogDeriv <- LogDeriv(model)
              return(M)
           })
 
@@ -131,6 +134,8 @@
              }
              M at fam.call <- cl
              class(M) <- class(model)
+             M at locscalename <- locscalename(model)
+             M at LogDeriv <- LogDeriv(model)
              return(M)
           })
 
@@ -182,6 +187,8 @@
              }
              M at fam.call <- cl
              class(M) <- class(model)
+             M at locscalename <- locscalename(model)
+             M at LogDeriv <- LogDeriv(model)
              return(M)
           })
 
@@ -201,8 +208,12 @@
           function(model, param, ...){
              M <- modifyModel(as(model, "L2ParamFamily"), param = param,
                               .withCall = FALSE)
+             scale <- main(param)
+             M at L2derivDistr <- UnivarDistrList((Exp(rate = 1)-1)/scale)
              M at L2derivSymm <- FunSymmList(OddSymmetric(SymmCenter = main(param)))
              class(M) <- class(model)
+             M at locscalename <- locscalename(model)
+             M at LogDeriv <- LogDeriv(model)
              return(M)
           })