[Distr-commits] r273 - in branches/distr-2.0/pkg/distrMod: R chm

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

Author: ruckdeschel
Date: 2008-08-27 18:45:29 +0200 (Wed, 27 Aug 2008)
New Revision: 273

Modified:
   branches/distr-2.0/pkg/distrMod/R/MCEstimator.R
   branches/distr-2.0/pkg/distrMod/R/MDEstimator.R
   branches/distr-2.0/pkg/distrMod/R/MLEstimator.R
   branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R
   branches/distr-2.0/pkg/distrMod/chm/0distrMod-package.html
   branches/distr-2.0/pkg/distrMod/chm/distrMod.chm
Log:
some minor bugs...

Modified: branches/distr-2.0/pkg/distrMod/R/MCEstimator.R
===================================================================
--- branches/distr-2.0/pkg/distrMod/R/MCEstimator.R	2008-08-27 16:12:07 UTC (rev 272)
+++ branches/distr-2.0/pkg/distrMod/R/MCEstimator.R	2008-08-27 16:45:29 UTC (rev 273)
@@ -8,8 +8,7 @@
 
     ## preparation: getting the matched call
     es.call <- match.call()
-    dots <- match.call(call = sys.call(sys.parent(1)),
-                       expand.dots = FALSE)$"..."
+    dots <- match.call(expand.dots = FALSE)$"..."
 
 
     ## some checking

Modified: branches/distr-2.0/pkg/distrMod/R/MDEstimator.R
===================================================================
--- branches/distr-2.0/pkg/distrMod/R/MDEstimator.R	2008-08-27 16:12:07 UTC (rev 272)
+++ branches/distr-2.0/pkg/distrMod/R/MDEstimator.R	2008-08-27 16:45:29 UTC (rev 273)
@@ -7,8 +7,7 @@
 
     ## preparation: getting the matched call
     es.call <- match.call()
-    dots <- match.call(call = sys.call(sys.parent(1)),
-                       expand.dots = FALSE)$"..."
+    dots <- match.call(expand.dots = FALSE)$"..."
 
 
     ## some checking

Modified: branches/distr-2.0/pkg/distrMod/R/MLEstimator.R
===================================================================
--- branches/distr-2.0/pkg/distrMod/R/MLEstimator.R	2008-08-27 16:12:07 UTC (rev 272)
+++ branches/distr-2.0/pkg/distrMod/R/MLEstimator.R	2008-08-27 16:45:29 UTC (rev 273)
@@ -9,8 +9,7 @@
 
     ## preparation: getting the matched call
     es.call <- match.call()
-    dots <- match.call(call = sys.call(sys.parent(1)),
-                       expand.dots = FALSE)$"..."
+    dots <- match.call(expand.dots = FALSE)$"..."
 
 
     ## some checking

Modified: branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R
===================================================================
--- branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R	2008-08-27 16:12:07 UTC (rev 272)
+++ branches/distr-2.0/pkg/distrMod/R/SimpleL2ParamFamilies.R	2008-08-27 16:45:29 UTC (rev 273)
@@ -10,10 +10,12 @@
         distrSymm <- NoSymmetry()
     param0 <- prob
     names(param0) <- "prob"
+    param1 <- size
+    names(param1) <- "size"
     if(missing(trafo)) trafo <- matrix(1, dimnames = list("prob","prob"))
     param <- ParamFamParameter(name = "probability of success",  
-                               main = c("prob" = param0), 
-                               fixed = c("size" = size), 
+                               main = param0, 
+                               fixed = param1, 
                                trafo = trafo)
     modifyParam <- function(theta){ Binom(size = size, prob = theta) }
     body(modifyParam) <- substitute({ Binom(size = size, prob = theta) }, list(size = size))
@@ -67,7 +69,7 @@
     names(param0) <- "lambda"
     if(missing(trafo)) trafo <- matrix(1, dimnames = list("lambda","lambda"))
     param <- ParamFamParameter(name = "positive mean",
-                               main = c("lambda" = param0), 
+                               main = param0, 
                                trafo = trafo)
     modifyParam <- function(theta){ Pois(lambda = theta) }
     props <- character(0)

Modified: branches/distr-2.0/pkg/distrMod/chm/0distrMod-package.html
===================================================================
--- branches/distr-2.0/pkg/distrMod/chm/0distrMod-package.html	2008-08-27 16:12:07 UTC (rev 272)
+++ branches/distr-2.0/pkg/distrMod/chm/0distrMod-package.html	2008-08-27 16:45:29 UTC (rev 273)
@@ -104,7 +104,8 @@
 ##########################
 "ParamFamParameter" [*] is subclass of class "Parameter" of package "distr".
 Additional slots:
-main(numeric), nuisance(OptionalNumeric), trafo(MatrixorFunction)
+main(numeric), nuisance(OptionalNumeric), fixed(OptionalNumeric),
+trafo(MatrixorFunction)
 
 ##########################
 Class unions
@@ -221,6 +222,7 @@
 name(character), estimate(ANY),
 samplesize(numeric), asvar(OptionalMatrix),
 Infos(matrix), nuis.idx(OptionalNumeric)
+fixed.estimate(OptionalNumeric), 
 estimate.call(call), trafo(list[of function, matrix]),
 untransformed.estimate(ANY), 
 untransformed.asvar(OptionalMatrix)

Modified: branches/distr-2.0/pkg/distrMod/chm/distrMod.chm
===================================================================
(Binary files differ)