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

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

Author: ruckdeschel
Date: 2013-01-19 01:25:50 +0100 (Sat, 19 Jan 2013)
New Revision: 864

Modified:
   branches/distr-2.5/pkg/distrMod/R/Estimator.R
   pkg/distrMod/R/Estimator.R
Log:
distrMod: 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-18 23:22:02 UTC (rev 863)
+++ branches/distr-2.5/pkg/distrMod/R/Estimator.R	2013-01-19 00:25:50 UTC (rev 864)
@@ -35,7 +35,6 @@
     name.est <- paste(name.est,idm, sep="")     
 
     res <- new("Estimate")
-
     res at samplesize <- samplesize
     res at untransformed.estimate <- estimate
     res at estimate.call <- es.call
@@ -53,10 +52,10 @@
     if(is.null(names(estimate))) names(estimate) <- name.est
     
     param <- ParamFamParameter(name = names(estimate), 
-                               main = res at estimate[idm],
-                               nuisance = res at estimate[idx],
+                               main = estimate[idm],
+                               nuisance = estimate[idx],
                                fixed = fixed)
-    
+
     if(missing(trafo)||is.null(trafo)) 
        res at trafo <- list(fct = function(x) 
                                list(fval = x, mat = mat), 

Modified: pkg/distrMod/R/Estimator.R
===================================================================
--- pkg/distrMod/R/Estimator.R	2013-01-18 23:22:02 UTC (rev 863)
+++ pkg/distrMod/R/Estimator.R	2013-01-19 00:25:50 UTC (rev 864)
@@ -35,7 +35,6 @@
     name.est <- paste(name.est,idm, sep="")     
 
     res <- new("Estimate")
-
     res at samplesize <- samplesize
     res at untransformed.estimate <- estimate
     res at estimate.call <- es.call
@@ -53,10 +52,10 @@
     if(is.null(names(estimate))) names(estimate) <- name.est
     
     param <- ParamFamParameter(name = names(estimate), 
-                               main = res at estimate[idm],
-                               nuisance = res at estimate[idx],
+                               main = estimate[idm],
+                               nuisance = estimate[idx],
                                fixed = fixed)
-    
+
     if(missing(trafo)||is.null(trafo)) 
        res at trafo <- list(fct = function(x) 
                                list(fval = x, mat = mat),