[Distr-commits] r274 - branches/distr-2.0/pkg/distrMod/R pkg/utils

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

Author: ruckdeschel
Date: 2008-08-27 21:49:11 +0200 (Wed, 27 Aug 2008)
New Revision: 274

Modified:
   branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R
   pkg/utils/finde.r
Log:
fixed some bugs in naming...

Modified: branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R
===================================================================
--- branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R	2008-08-27 16:45:29 UTC (rev 273)
+++ branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R	2008-08-27 19:49:11 UTC (rev 274)
@@ -161,7 +161,7 @@
         FisherInfo.fct = FisherInfo.fct, FisherInfo = FisherInfo,
         startPar = startPar, makeOKPar = makeOKPar, 
         .returnClsName = "GammaFamily")
-    f.call <- substitute(GammFamily(scale = s1, shape = s2,
+    f.call <- substitute(GammaFamily(scale = s1, shape = s2,
   	                           trafo = matrix(Tr, ncol = 2, dimnames = DN)),
   	                     list(s1 = scale, s2 = shape, Tr = trafo,
   	                          DN = dimnames(trafo)))
@@ -286,7 +286,7 @@
                   trafo = trafo, .returnClsName = "NormScaleFamily")
     f.call <- substitute(NormScaleFamily(sd = s, mean = m,
                             trafo = matrix(Tr, dimnames=list("sd","sd"))),
-                         list(s = sd, m = mean, trafo))
+                         list(s = sd, m = mean, Tr = trafo))
     res at fam.call <- f.call
     return(res)
 }

Modified: pkg/utils/finde.r
===================================================================
--- pkg/utils/finde.r	2008-08-27 16:45:29 UTC (rev 273)
+++ pkg/utils/finde.r	2008-08-27 19:49:11 UTC (rev 274)
@@ -14,4 +14,6 @@
 setwd(ow)
 }
 finde(x=".makeQNew", dir ="C:/rtest/distr/pkg/distr/R")
+finde(x="\\.oKT", dir ="C:/rtest/distr/branches/distr-2.0/pkg/distr/R")
+finde(x="setMethod\\(\"trafo", dir ="C:/rtest/distr/branches/distr-2.0/pkg/distrMod/R")