[Distr-commits] r744 - branches/distr-2.4/pkg/distrTEst/R branches/distr-2.4/pkg/distrTEst/man pkg/distrTEst/R pkg/distrTEst/man

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

Author: ruckdeschel
Date: 2011-10-18 18:57:09 +0200 (Tue, 18 Oct 2011)
New Revision: 744

Modified:
   branches/distr-2.4/pkg/distrTEst/R/plot-methods.R
   branches/distr-2.4/pkg/distrTEst/R/print-show-methods.R
   branches/distr-2.4/pkg/distrTEst/man/Evaluation-class.Rd
   pkg/distrTEst/R/plot-methods.R
   pkg/distrTEst/R/print-show-methods.R
   pkg/distrTEst/man/Evaluation-class.Rd
Log:
fixed (new discovered) error in distrTEst (sd no longer applies to matrices).

Modified: branches/distr-2.4/pkg/distrTEst/R/plot-methods.R
===================================================================
--- branches/distr-2.4/pkg/distrTEst/R/plot-methods.R	2011-10-11 02:17:44 UTC (rev 743)
+++ branches/distr-2.4/pkg/distrTEst/R/plot-methods.R	2011-10-18 16:57:09 UTC (rev 744)
@@ -8,7 +8,7 @@
             ldim0 <- min(getdistrTEstOption("MaxNumberofPlottedEvaluationDims"),
                          length(dims0))
             if(ldim0<length(dims0))
-                warning(paste("your evaluation is too big; only ", lobs,
+                warning(paste("your evaluation is too big; only ", ldim0,
                               "evaluation dimensions are plotted"))
             boxplot(result(x)[runs0,dims0[1:ldim0]],...)
           }
@@ -33,7 +33,7 @@
   if((ldim0<length(dims0))||(levals0<length(evals0)))
                 warning(gettextf(
 "your evaluation list is too big; only %i x%i evaluations x dimensions are plotted",
-                        levals, lobs))
+                        levals0, ldim0))
 
   evallist <- Elist(x)
   len <- length(evallist)

Modified: branches/distr-2.4/pkg/distrTEst/R/print-show-methods.R
===================================================================
--- branches/distr-2.4/pkg/distrTEst/R/print-show-methods.R	2011-10-11 02:17:44 UTC (rev 743)
+++ branches/distr-2.4/pkg/distrTEst/R/print-show-methods.R	2011-10-18 16:57:09 UTC (rev 744)
@@ -26,7 +26,7 @@
                            length(evals0))
 
             if(levals0<length(evals0))
-                warning(paste("your evaluation list is too big; only ", levals,
+                warning(paste("your evaluation list is too big; only ", levals0,
                               "evaluations are printed"))
 
             cat(gettextf("An EvaluationList Object\n"))

Modified: branches/distr-2.4/pkg/distrTEst/man/Evaluation-class.Rd
===================================================================
--- branches/distr-2.4/pkg/distrTEst/man/Evaluation-class.Rd	2011-10-11 02:17:44 UTC (rev 743)
+++ branches/distr-2.4/pkg/distrTEst/man/Evaluation-class.Rd	2011-10-18 16:57:09 UTC (rev 744)
@@ -97,7 +97,7 @@
 plot(ev1)
 #
 #another function to be evaluated:
-severalThings<- function(x) {list("mean"=mean(x),"sd"=sd(x), "mad"=mad(x))}
+severalThings<- function(x) {list("mean"=mean(x),"sd"=sd(as.vector(x)), "mad"=mad(x))}
 ev3 <- evaluate(cs, severalThings, resname="several") 
 plot(ev3)
 plot(ev3, ylim=c(0,10), col=c("blue","green", "red"))

Modified: pkg/distrTEst/R/plot-methods.R
===================================================================
--- pkg/distrTEst/R/plot-methods.R	2011-10-11 02:17:44 UTC (rev 743)
+++ pkg/distrTEst/R/plot-methods.R	2011-10-18 16:57:09 UTC (rev 744)
@@ -8,7 +8,7 @@
             ldim0 <- min(getdistrTEstOption("MaxNumberofPlottedEvaluationDims"),
                          length(dims0))
             if(ldim0<length(dims0))
-                warning(paste("your evaluation is too big; only ", lobs,
+                warning(paste("your evaluation is too big; only ", ldim0,
                               "evaluation dimensions are plotted"))
             boxplot(result(x)[runs0,dims0[1:ldim0]],...)
           }
@@ -33,7 +33,7 @@
   if((ldim0<length(dims0))||(levals0<length(evals0)))
                 warning(gettextf(
 "your evaluation list is too big; only %i x%i evaluations x dimensions are plotted",
-                        levals, lobs))
+                        levals0, ldim0))
 
   evallist <- Elist(x)
   len <- length(evallist)

Modified: pkg/distrTEst/R/print-show-methods.R
===================================================================
--- pkg/distrTEst/R/print-show-methods.R	2011-10-11 02:17:44 UTC (rev 743)
+++ pkg/distrTEst/R/print-show-methods.R	2011-10-18 16:57:09 UTC (rev 744)
@@ -26,7 +26,7 @@
                            length(evals0))
 
             if(levals0<length(evals0))
-                warning(paste("your evaluation list is too big; only ", levals,
+                warning(paste("your evaluation list is too big; only ", levals0,
                               "evaluations are printed"))
 
             cat(gettextf("An EvaluationList Object\n"))

Modified: pkg/distrTEst/man/Evaluation-class.Rd
===================================================================
--- pkg/distrTEst/man/Evaluation-class.Rd	2011-10-11 02:17:44 UTC (rev 743)
+++ pkg/distrTEst/man/Evaluation-class.Rd	2011-10-18 16:57:09 UTC (rev 744)
@@ -97,7 +97,7 @@
 plot(ev1)
 #
 #another function to be evaluated:
-severalThings<- function(x) {list("mean"=mean(x),"sd"=sd(x), "mad"=mad(x))}
+severalThings<- function(x) {list("mean"=mean(x),"sd"=sd(as.vector(x)), "mad"=mad(x))}
 ev3 <- evaluate(cs, severalThings, resname="several") 
 plot(ev3)
 plot(ev3, ylim=c(0,10), col=c("blue","green", "red"))