[rkward-cvs] [rkward] /: Add i18n to distribution plots. Also refactor some of the underlying code.
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Fri Jan 30 12:27:43 UTC 2015
Git commit 9f440e0a863ddf442f9ad60394e50c721872b6c8 by Thomas Friedrichsmeier.
Committed on 30/01/2015 at 12:26.
Pushed by tfry into branch 'master'.
Add i18n to distribution plots. Also refactor some of the underlying code.
M +7 -10 rkward/plugins/distributions/plot_beta_distribution.js
M +6 -9 rkward/plugins/distributions/plot_binomial_distribution.js
M +6 -9 rkward/plugins/distributions/plot_cauchy_distribution.js
M +6 -9 rkward/plugins/distributions/plot_chi_squared_distribution.js
M +23 -29 rkward/plugins/distributions/plot_dist_common.js
M +5 -8 rkward/plugins/distributions/plot_exponential_distribution.js
M +7 -10 rkward/plugins/distributions/plot_f_distribution.js
M +6 -9 rkward/plugins/distributions/plot_gamma_distribution.js
M +5 -8 rkward/plugins/distributions/plot_geometric_distribution.js
M +7 -10 rkward/plugins/distributions/plot_hypergeometric_distribution.js
M +6 -9 rkward/plugins/distributions/plot_logistic_distribution.js
M +6 -9 rkward/plugins/distributions/plot_lognormal_distribution.js
M +10 -29 rkward/plugins/distributions/plot_negbinomial_distribution.js
M +6 -9 rkward/plugins/distributions/plot_normal_distribution.js
M +5 -8 rkward/plugins/distributions/plot_poisson_distribution.js
M +6 -9 rkward/plugins/distributions/plot_t_distribution.js
M +6 -10 rkward/plugins/distributions/plot_tukey_distribution.js
M +2 -3 rkward/plugins/distributions/plot_tukey_distribution.rkh
M +2 -3 rkward/plugins/distributions/plot_tukey_distribution.xml
M +6 -9 rkward/plugins/distributions/plot_uniform_distribution.js
M +6 -9 rkward/plugins/distributions/plot_weibull_distribution.js
M +6 -9 rkward/plugins/distributions/plot_wilcoxon_distribution.js
M +1 -1 tests/distributions.R
M +10 -2 tests/distributions/plot_beta_distribution.rkcommands.R
M +5 -5 tests/distributions/plot_beta_distribution.rkout
M +6 -1 tests/distributions/plot_binomial_distribution.rkcommands.R
M +1 -1 tests/distributions/plot_binomial_distribution.rkout
M +7 -1 tests/distributions/plot_cauchy_distribution.rkcommands.R
M +1 -1 tests/distributions/plot_cauchy_distribution.rkout
M +7 -1 tests/distributions/plot_chi_squared_distribution.rkcommands.R
M +2 -2 tests/distributions/plot_chi_squared_distribution.rkout
M +7 -1 tests/distributions/plot_exponential_distribution.rkcommands.R
M +2 -2 tests/distributions/plot_exponential_distribution.rkout
M +8 -1 tests/distributions/plot_f_distribution.rkcommands.R
M +2 -2 tests/distributions/plot_f_distribution.rkout
M +7 -1 tests/distributions/plot_gamma_distribution.rkcommands.R
M +2 -2 tests/distributions/plot_gamma_distribution.rkout
M +5 -1 tests/distributions/plot_geometric_distribution.rkcommands.R
M +1 -1 tests/distributions/plot_geometric_distribution.rkout
M +8 -1 tests/distributions/plot_hypergeometric_distribution.rkcommands.R
M +6 -6 tests/distributions/plot_hypergeometric_distribution.rkout
M +8 -1 tests/distributions/plot_log_normal_distribution.rkcommands.R
M +3 -3 tests/distributions/plot_log_normal_distribution.rkout
M +7 -1 tests/distributions/plot_logistic_distribution.rkcommands.R
M +1 -1 tests/distributions/plot_logistic_distribution.rkout
M +6 -1 tests/distributions/plot_negbinomial_distribution.rkcommands.R
M +3 -3 tests/distributions/plot_negbinomial_distribution.rkout
M +7 -1 tests/distributions/plot_normal_distribution.rkcommands.R
M +2 -2 tests/distributions/plot_normal_distribution.rkout
M +5 -1 tests/distributions/plot_poisson_distribution.rkcommands.R
M +1 -1 tests/distributions/plot_poisson_distribution.rkout
M +8 -1 tests/distributions/plot_t_distribution.rkcommands.R
M +5 -5 tests/distributions/plot_t_distribution.rkout
M +9 -2 tests/distributions/plot_tukey_distribution.rkcommands.R
M +5 -6 tests/distributions/plot_tukey_distribution.rkout
M +7 -1 tests/distributions/plot_uniform_distribution.rkcommands.R
M +1 -1 tests/distributions/plot_uniform_distribution.rkout
M +7 -1 tests/distributions/plot_weibull_distribution.rkcommands.R
M +1 -1 tests/distributions/plot_weibull_distribution.rkout
M +6 -1 tests/distributions/plot_wilcoxon_distribution.rkcommands.R
M +5 -5 tests/distributions/plot_wilcoxon_distribution.rkout
http://commits.kde.org/rkward/9f440e0a863ddf442f9ad60394e50c721872b6c8
diff --git a/rkward/plugins/distributions/plot_beta_distribution.js b/rkward/plugins/distributions/plot_beta_distribution.js
index 2c8907d..62379d9 100644
--- a/rkward/plugins/distributions/plot_beta_distribution.js
+++ b/rkward/plugins/distributions/plot_beta_distribution.js
@@ -4,11 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['a'] = getValue ("a");
- options['b'] = getValue ("b");
- options['ncp'] = getValue ("ncp");
+ options['args'] = ', shape1=' + getString ('a') + ', shape2=' + getString ('b') + ', ncp=' + getString ('ncp');
getContRangeParameters ();
+ options['distname'] = i18nc ("Beta distribution", noquote ("Beta"));
if (options['is_density']) {
options['fun'] = "dbeta";
} else {
@@ -16,11 +15,9 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Beta ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Shape1", "' + options['a'] + '", "Shape2", "' + options['b'] + '", "Non-centrality parameter", "' + options['ncp'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("a");
+ header.addFromUI ("b");
+ header.addFromUI ("ncp");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, shape1=' + options['a'] + ', shape2=' + options['b'] + ', ncp=' + options['ncp'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_binomial_distribution.js b/rkward/plugins/distributions/plot_binomial_distribution.js
index af367a5..e8edf42 100644
--- a/rkward/plugins/distributions/plot_binomial_distribution.js
+++ b/rkward/plugins/distributions/plot_binomial_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['size'] = getValue ("size");
- options['prob'] = getValue ("prob");
+ options['args'] = ', size=' + getString ('size') + ', prob=' + getString ('prob');
getDiscontRangeParameters();
+ options['distname'] = i18nc ("Binomial distribution", noquote ("Binomial"));
if (options['is_density']) {
options['fun'] = "dbinom";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Binomial ' + options['label'] + ' function", list ("Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Number of trials", "' + options['size'] + '", "Probability of success on each trial", "' + options['prob'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("size");
+ header.addFromUI ("prob");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, size=' + options['size'] + ', prob=' + options['prob'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_cauchy_distribution.js b/rkward/plugins/distributions/plot_cauchy_distribution.js
index b823dbb..3241ed0 100644
--- a/rkward/plugins/distributions/plot_cauchy_distribution.js
+++ b/rkward/plugins/distributions/plot_cauchy_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['loc'] = getValue ("loc");
- options['scale'] = getValue ("scale");
+ options['args'] = ', location=' + getString ("loc") + ', scale=' + getString ("scale");
getContRangeParameters ();
+ options['distname'] = i18nc ("Cauchy distribution", noquote ("Cauchy"));
if (options['is_density']) {
options['fun'] = "dcauchy";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Cauchy ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Location", "' + options['loc'] + '", "Scale", "' + options['scale'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("loc");
+ header.addFromUI ("scale");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, location=' + options['loc'] + ', scale=' + options['scale'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_chi_squared_distribution.js b/rkward/plugins/distributions/plot_chi_squared_distribution.js
index 38297ad..fd72d05 100644
--- a/rkward/plugins/distributions/plot_chi_squared_distribution.js
+++ b/rkward/plugins/distributions/plot_chi_squared_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['df'] = getValue ("df");
- options['ncp'] = getValue ("ncp");
+ options['args'] = ', df=' + getString ("df") + ', ncp=' + getString ("ncp");
getContRangeParameters ();
+ options['distname'] = i18nc ("Chi-square distribution", noquote ("Chi-square"));
if (options['is_density']) {
options['fun'] = "dchisq";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Chisquare ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Degrees of freedom", "' + options['df'] + '", "Non-centrality parameter", "' + options['ncp'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("df");
+ header.addFromUI ("ncp");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, df=' + options['df'] + ', ncp=' + options['ncp'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_dist_common.js b/rkward/plugins/distributions/plot_dist_common.js
index 9d7c2fd..d8c0245 100644
--- a/rkward/plugins/distributions/plot_dist_common.js
+++ b/rkward/plugins/distributions/plot_dist_common.js
@@ -16,6 +16,7 @@ function getContRangeParameters () {
options['n'] = getValue ("n");
options['min'] = getValue ("min");
options['max'] = getValue ("max");
+ options['cont'] = true;
}
// get the range parameters for the discontinuous distributions (it's all the same for these)
@@ -23,51 +24,45 @@ function getDiscontRangeParameters () {
options['min'] = getValue ("min");
options['max'] = getValue ("max");
options['n'] = options['max'] - options['min'] + 1;
+ options['cont'] = false;
}
function doPrintout (full) {
- var fun = getValue ("function");
- var _log = (getValue ("log") == 1);
+ var fun = getString ("function");
+ var _log = getBoolean ("log.state");
- var is_density = "";
- var label = "";
- var tail_option = "";
- var tail_label = "";
- var log_option = "";
+ var is_density = false;
+ var params = "";
if (fun == "d") {
is_density = true;
- label = "density";
- tail_option = "";
- tail_label = "";
- if (_log) log_option = ", log=TRUE";
+ if (_log) params += ", log=TRUE";
} else {
- is_density = false;
label = "distribution";
- if (getValue("lower") == "1") {
- tail_option = ", lower.tail = TRUE";
- tail_label = ", \"Tail\",\"Lower\"";
+ if (getBoolean ("lower.state")) {
+ params += ", lower.tail = TRUE";
} else {
- tail_option = ", lower.tail = FALSE";
- tail_label = ", \"Tail\",\"Upper\"";
+ params += ", lower.tail = FALSE";
}
- if (_log) log_option = ", log.p=TRUE";
+ if (_log) params += ", log.p=TRUE";
}
- var log_label = ', "Scale", "normal"';
- if (_log) log_label = ', "Scale", "logarithmic"';
-
options = new Array();
options['is_density'] = is_density;
- options['label'] = label;
- options['tail_option'] = tail_option;
- options['tail_label'] = tail_label;
- options['log_option'] = log_option;
- options['log_label'] = log_label;
getParameters ();
if (full) {
- doHeader ();
+ var header = new Header (options['is_density'] ? i18nc ("[Some distribution] density function", "%1 density function", options['distname']) : i18nc ("[Some distribution] distribution function", "%1 distribution function", options['distname']));
+ if (options['cont']) header.addFromUI ('n');
+ header.addFromUI ('min');
+ header.addFromUI ('max');
+ header = addParamsToHeader (header);
+ if (!options['is_density']) {
+ header.add (i18nc ("Tail of distribution function: lower / upper", 'Tail'), getBoolean ("lower.state") ? i18n ('Lower tail: P[X ≤ x]') : i18n ('Upper tail: P[X > x]'))
+ }
+ header.addFromUI ("log");
+ header.add (i18n ("Function"), options['fun']);
+ header.print ();
echo ('\n');
echo ('rk.graph.on ()\n');
}
@@ -76,7 +71,7 @@ function doPrintout (full) {
printIndentedUnlessEmpty ("\t", getValue ("plotoptions.code.preprocess"), '', '\n');
echo (' curve (');
- doFunCall ();
+ echo (options['fun'] + '(x' + options['args'] + params + ')');
echo (', from=' + options['min'] + ', to=' + options['max'] + ', n=' + options['n'] + getValue ("plotoptions.code.printout") + ')\n');
printIndentedUnlessEmpty ("\t", getValue ("plotoptions.code.calculate"), '\n', '');
@@ -85,4 +80,3 @@ function doPrintout (full) {
echo ('rk.graph.off ()\n');
}
}
-
diff --git a/rkward/plugins/distributions/plot_exponential_distribution.js b/rkward/plugins/distributions/plot_exponential_distribution.js
index 02c30a0..8db2217 100644
--- a/rkward/plugins/distributions/plot_exponential_distribution.js
+++ b/rkward/plugins/distributions/plot_exponential_distribution.js
@@ -4,9 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['rate'] = getValue ("rate");
+ options['args'] = ', rate=' + getString ("rate");
getContRangeParameters ();
+ options['distname'] = i18nc ("Exponential distribution", noquote ("Exponential"));
if (options['is_density']) {
options['fun'] = "dexp";
} else {
@@ -14,11 +15,7 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Exponential ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Rate", "' + options['rate'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("rate");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, rate=' + options['rate'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_f_distribution.js b/rkward/plugins/distributions/plot_f_distribution.js
index fc1c055..69e98a3 100644
--- a/rkward/plugins/distributions/plot_f_distribution.js
+++ b/rkward/plugins/distributions/plot_f_distribution.js
@@ -4,11 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['df1'] = getValue ("df1");
- options['df2'] = getValue ("df2");
- options['ncp'] = getValue ("ncp");
+ options['args'] = ', df1=' + getString ("df1") + ', df2=' + getString ("df2") + ', ncp=' + getString ("ncp");
getContRangeParameters ();
+ options['distname'] = i18nc ("F distribution", noquote ("F"));
if (options['is_density']) {
options['fun'] = "df";
} else {
@@ -16,11 +15,9 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("F ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Numerator degrees of freedom", "' + options['df1'] + '", "Denominator degrees of freedom", "' + options['df2'] + '", "Non-centrality", "' + options['ncp'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("df1");
+ header.addFromUI ("df2");
+ header.addFromUI ("ncp");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, df1=' + options['df1'] + ', df2=' + options['df2'] + ', ncp=' + options['ncp'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_gamma_distribution.js b/rkward/plugins/distributions/plot_gamma_distribution.js
index 43e7cc7..a233aaa 100644
--- a/rkward/plugins/distributions/plot_gamma_distribution.js
+++ b/rkward/plugins/distributions/plot_gamma_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['shape'] = getValue ("shape");
- options['rate'] = getValue ("rate");
+ options['args'] = ', shape=' + getString ("shape") + ', rate=' + getString ("rate");
getContRangeParameters ();
+ options['distname'] = i18nc ("Gamma distribution", noquote ("Gamma"));
if (options['is_density']) {
options['fun'] = "dgamma";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Gamma ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Shape", "' + options['shape'] + '", "Rate", "' + options['rate'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("shape");
+ header.addFromUI ("rate");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, shape=' + options['shape'] + ', rate=' + options['rate'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_geometric_distribution.js b/rkward/plugins/distributions/plot_geometric_distribution.js
index d95088e..d9587ac 100644
--- a/rkward/plugins/distributions/plot_geometric_distribution.js
+++ b/rkward/plugins/distributions/plot_geometric_distribution.js
@@ -4,9 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['prob'] = getValue ("prob");
+ options['args'] = ', prob=' + getString ("prob");
getDiscontRangeParameters();
+ options['distname'] = i18nc ("Geometric distribution", noquote ("Geometric"));
if (options['is_density']) {
options['fun'] = "dgeom";
} else {
@@ -14,11 +15,7 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Geometric ' + options['label'] + ' function", list ("Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Probability of success on each trial", "' + options['prob'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("prob");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, prob=' + options['prob'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_hypergeometric_distribution.js b/rkward/plugins/distributions/plot_hypergeometric_distribution.js
index 215242e..d1bd4d5 100644
--- a/rkward/plugins/distributions/plot_hypergeometric_distribution.js
+++ b/rkward/plugins/distributions/plot_hypergeometric_distribution.js
@@ -4,11 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['n_val'] = getValue ("n_val");
- options['m'] = getValue ("m");
- options['k'] = getValue ("k");
+ options['args'] = ', m=' + getString ("m") + ', n=' + getString ("n_val") + ', k=' + getString ("k");
getDiscontRangeParameters();
+ options['distname'] = i18nc ("Hypergeometric distribution", noquote ("Hypergeometric"));
if (options['is_density']) {
options['fun'] = "dhyper";
} else {
@@ -16,11 +15,9 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Hypergeometric ' + options['label'] + ' function", list ("Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Number of white balls", "' + options['m'] + '", "Number of black balls", "' + options['n_val'] + '", "Number of balls drawn", "' + options['k'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("m");
+ header.addFromUI ("n_val");
+ header.addFromUI ("k");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, m=' + options['m'] + ', n=' + options['n_val'] + ', k=' + options['k'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_logistic_distribution.js b/rkward/plugins/distributions/plot_logistic_distribution.js
index 5e932c1..dae57b4 100644
--- a/rkward/plugins/distributions/plot_logistic_distribution.js
+++ b/rkward/plugins/distributions/plot_logistic_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['loc'] = getValue ("loc");
- options['scale'] = getValue ("scale");
+ options['args'] = ', location=' + getString ("loc") + ', scale=' + getString ("scale");
getContRangeParameters ();
+ options['distname'] = i18nc ("Logistic distribution", noquote ("Logistic"));
if (options['is_density']) {
options['fun'] = "dlogis";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Logistic ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Location", "' + options['loc'] + '", "Scale", "' + options['scale'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("loc");
+ header.addFromUI ("scale");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, location=' + options['loc'] + ', scale=' + options['scale'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_lognormal_distribution.js b/rkward/plugins/distributions/plot_lognormal_distribution.js
index 63eebee..fe9496f 100644
--- a/rkward/plugins/distributions/plot_lognormal_distribution.js
+++ b/rkward/plugins/distributions/plot_lognormal_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['sd'] = getValue ("sd");
- options['mean'] = getValue ("mean");
+ options['args'] = ', meanlog=' + getString ("mean") + ', sdlog=' + getString ("sd");
getContRangeParameters ();
+ options['distname'] = i18nc ("Log-Normal distribution", noquote ("Log-Normal"));
if (options['is_density']) {
options['fun'] = "dlnorm";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Lognormal ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Mean", "' + options['mean'] + '", "Standard deviation", "' + options['sd'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("mean");
+ header.addFromUI ("sd");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, meanlog=' + options['mean'] + ', sdlog=' + options['sd'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_negbinomial_distribution.js b/rkward/plugins/distributions/plot_negbinomial_distribution.js
index d4f9670..9919b3a 100644
--- a/rkward/plugins/distributions/plot_negbinomial_distribution.js
+++ b/rkward/plugins/distributions/plot_negbinomial_distribution.js
@@ -4,33 +4,16 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- var size = "";
- var size_label = "";
- var paramTag = "";
- var paramVal = "";
- var paramLabel = "";
if (getValue ("param") == "pprob") {
- size = getValue ("size_trial");
- size_label = "Target for number of successful trials";
- paramTag = ", prob=";
- paramVal = getValue ("prob");
- paramLabel = "Probability of success in each trial";
+ options['args'] = ', size=' + getString ("size_trial") + ', prob=' + getString ("prob");
+ options['header_adds'] = ["size_trial", "prob"];
} else {
- size = getValue ("size_disp");
- size_label = "Dispersion (size)";
- paramTag = ", mu=";
- paramVal = getValue ("mu");
- paramLabel = "Alternative parameter, mu";
+ options['args'] = ', size=' + getString ("size_disp") + ', mu=' + getString ("mu");
+ options['header_adds'] = ["size_disp", "mu"];
}
-
- options['size'] = size;
- options['size_label'] = size_label;
- options['param_tag'] = paramTag;
- options['param_val'] = paramVal;
- options['param_label'] = paramLabel;
- options['prob'] = getValue ("prob");
getDiscontRangeParameters();
+ options['distname'] = i18nc ("Negative Binomial distribution", noquote ("Negative Binomial"));
if (options['is_density']) {
options['fun'] = "dnbinom";
} else {
@@ -38,11 +21,9 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Negative Binomial ' + options['label'] + ' function", list ("Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "' + options['size_label'] + '", "' + options['size'] + '", "' + options['param_label'] + '", "' + options['param_val'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
-}
-
-function doFunCall () {
- echo (options['fun'] + '(x, size=' + options['size'] + options['param_tag'] + options['param_val'] + options['log_option'] + options['tail_option'] + ')');
+function addParamsToHeader (header) {
+ for (var i = 0; i < options['header_adds'].length; ++i) {
+ header.addFromUI (options['header_adds'][i]);
+ }
+ return header;
}
-
diff --git a/rkward/plugins/distributions/plot_normal_distribution.js b/rkward/plugins/distributions/plot_normal_distribution.js
index 0f59628..d6f0baf 100644
--- a/rkward/plugins/distributions/plot_normal_distribution.js
+++ b/rkward/plugins/distributions/plot_normal_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['mean'] = getValue ("mean");
- options['sd'] = getValue ("sd");
+ options['args'] = ', mean=' + getString ("mean") + ', sd=' + getString ("sd");
getContRangeParameters ();
+ options['distname'] = i18nc ("Normal distribution", noquote ("Normal"));
if (options['is_density']) {
options['fun'] = "dnorm";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Normal ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Mean", "' + options['mean'] + '", "Standard Deviation", "' + options['sd'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("mean");
+ header.addFromUI ("sd");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, mean=' + options['mean'] + ', sd=' + options['sd'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_poisson_distribution.js b/rkward/plugins/distributions/plot_poisson_distribution.js
index 846be62..a7efb18 100644
--- a/rkward/plugins/distributions/plot_poisson_distribution.js
+++ b/rkward/plugins/distributions/plot_poisson_distribution.js
@@ -4,9 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['mean'] = getValue ("mean");
+ options['args'] = ', lambda=' + getString ("mean");
getDiscontRangeParameters();
+ options['distname'] = i18nc ("Poisson distribution", noquote ("Poisson"));
if (options['is_density']) {
options['fun'] = "dpois";
} else {
@@ -14,11 +15,7 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Poisson ' + options['label'] + ' function", list ("Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Mean", "' + options['mean'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("mean");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, lambda=' + options['mean'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_t_distribution.js b/rkward/plugins/distributions/plot_t_distribution.js
index 9756cdd..e16ddac 100644
--- a/rkward/plugins/distributions/plot_t_distribution.js
+++ b/rkward/plugins/distributions/plot_t_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['ncp'] = getValue ("ncp");
- options['df'] = getValue ("df");
+ options['args'] = ', df=' + getString ("df") + ', ncp=' + getString ("ncp");
getContRangeParameters ();
+ options['distname'] = i18nc ("t distribution", noquote ("Student t"));
if (options['is_density']) {
options['fun'] = "dt";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Student t ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Minimum", "' + options['min'] + '", "Maximum", "' + options['max'] + '", "Degrees of freedom", "' + options['df'] + '", "Non-centrality", "' + options['ncp'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("df");
+ header.addFromUI ("ncp");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, df=' + options['df'] + ', ncp=' + options['ncp'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_tukey_distribution.js b/rkward/plugins/distributions/plot_tukey_distribution.js
index 4063eba..9a2abe6 100644
--- a/rkward/plugins/distributions/plot_tukey_distribution.js
+++ b/rkward/plugins/distributions/plot_tukey_distribution.js
@@ -4,11 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['df'] = getValue ("df");
- options['nmeans'] = getValue ("nmeans");
- options['nranges'] = getValue ("nranges");
+ options['args'] = ', nmeans=' + getString ("nmeans") + ', df=' + getString ("df");
getContRangeParameters ();
+ options['distname'] = i18nc ("Tukey distribution", noquote ("Studentized Range (Tukey)"));
if (options['is_density']) {
// actually, this can never happen in this case, but we add it here, for consistency with the other plugins
options['fun'] = "dtukey";
@@ -17,11 +16,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Tukey ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Sample size for range", "' + options['nmeans'] + '", "Degreed of freedom for s", "' + options['df'] + '", "Number of groups", "' + options['nranges'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("nmeans");
+ header.addFromUI ("df");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, nmeans=' + options['nmeans'] + ', df=' + options['df'] + ', nranges=' + options['nranges'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_tukey_distribution.rkh b/rkward/plugins/distributions/plot_tukey_distribution.rkh
index 6c58dbd..e1ec55c 100644
--- a/rkward/plugins/distributions/plot_tukey_distribution.rkh
+++ b/rkward/plugins/distributions/plot_tukey_distribution.rkh
@@ -13,9 +13,8 @@ Distribution function plot for the Studentized Range (Tukey) distribution.
<settings>
<setting id="function">Only the distribution function can be plotted for the Tukey distribution.</setting>
<insert snippet="cont_range_help"/>
- <setting id="nmeans">See R reference on Tukey distribution.</setting>
- <setting id="df">See R reference on Tukey distribution.</setting>
- <setting id="nranges">See R reference on Tukey distribution.</setting>
+ <setting id="nmeans">Number of independent observations whose range to consider.</setting>
+ <setting id="df">Degrees of freedom for the (independent sample) estimate of standard deviation.</setting>
<insert snippet="common_options_help"/>
</settings>
diff --git a/rkward/plugins/distributions/plot_tukey_distribution.xml b/rkward/plugins/distributions/plot_tukey_distribution.xml
index 13dd945..cdad417 100644
--- a/rkward/plugins/distributions/plot_tukey_distribution.xml
+++ b/rkward/plugins/distributions/plot_tukey_distribution.xml
@@ -18,9 +18,8 @@
</snippet>
<snippet id="dist_options">
<frame label="Parameters">
- <spinbox type="integer" id="nmeans" min="1" initial="6" label="Sample size for range (same for each group)" />
- <spinbox default_precision="2" type="real" id="df" initial="5" min="0" label="Degrees of freedom for s" />
- <spinbox type="integer" id="nranges" min="1" initial="1" label="Number of groups whose maximum range is considered" />
+ <spinbox type="integer" id="nmeans" min="1" initial="6" label="Number of observations" />
+ <spinbox default_precision="1" type="real" id="df" initial="5" min="0" label="Degrees of freedom for standard deviation estimate" />
</frame>
</snippet>
<include file="plot_dist_common_snippets.xml"/>
diff --git a/rkward/plugins/distributions/plot_uniform_distribution.js b/rkward/plugins/distributions/plot_uniform_distribution.js
index 29f5a4d..3ce4226 100644
--- a/rkward/plugins/distributions/plot_uniform_distribution.js
+++ b/rkward/plugins/distributions/plot_uniform_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['llim'] = getValue ("llim");
- options['ulim'] = getValue ("ulim");
+ options['args'] = ', min=' + getString ("llim") + ', max=' + getString ("ulim");
getContRangeParameters ();
+ options['distname'] = i18nc ("Uniform distribution", noquote ("Uniform"));
if (options['is_density']) {
options['fun'] = "dunif";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Uniform ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Minimum", "' + options['llim'] + '", "Maximum", "' + options['ulim'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("llim");
+ header.addFromUI ("ulim");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, min=' + options['llim'] + ', max=' + options['ulim'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_weibull_distribution.js b/rkward/plugins/distributions/plot_weibull_distribution.js
index 2e2fa71..5eec1cc 100644
--- a/rkward/plugins/distributions/plot_weibull_distribution.js
+++ b/rkward/plugins/distributions/plot_weibull_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['scale'] = getValue ("scale");
- options['shape'] = getValue ("shape");
+ options['args'] = ', shape=' + getString ("shape") + ', scale=' + getString ("scale");
getContRangeParameters ();
+ options['distname'] = i18nc ("Weibull distribution", noquote ("Weibull"));
if (options['is_density']) {
options['fun'] = "dweibull";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Weibull ' + options['label'] + ' function", list ("Number of Observations", "' + options['n'] + '", "Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "Shape", "' + options['shape'] + '", "Scale", "' + options['scale'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("shape");
+ header.addFromUI ("scale");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, shape=' + options['shape'] + ', scale=' + options['scale'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/rkward/plugins/distributions/plot_wilcoxon_distribution.js b/rkward/plugins/distributions/plot_wilcoxon_distribution.js
index 725acc8..64d70d5 100644
--- a/rkward/plugins/distributions/plot_wilcoxon_distribution.js
+++ b/rkward/plugins/distributions/plot_wilcoxon_distribution.js
@@ -4,10 +4,10 @@ var options;
include ('plot_dist_common.js');
function getParameters () {
- options['nm'] = getValue ("nm");
- options['nn'] = getValue ("nn");
+ options['args'] = ', m=' + getString ("nm") + ', n=' + getString ("nn");
getDiscontRangeParameters();
+ options['distname'] = i18nc ("Wilcoxon Rank Sum distribution", noquote ("Wilcoxon Rank Sum"));
if (options['is_density']) {
options['fun'] = "dwilcox";
} else {
@@ -15,11 +15,8 @@ function getParameters () {
}
}
-function doHeader () {
- echo ('rk.header ("Binomial ' + options['label'] + ' function", list ("Lower quantile", "' + options['min'] + '", "Upper quantile", "' + options['max'] + '", "First sample size", "' + options['nm'] + '", "Second sample size", "' + options['nn'] + '"' + options['log_label'] + options['tail_label'] + ', "Function", "' + options['fun'] + '"));' + "\n");
+function addParamsToHeader (header) {
+ header.addFromUI ("nm");
+ header.addFromUI ("nn");
+ return header;
}
-
-function doFunCall () {
- echo (options['fun'] + '(x, m=' + options['nm'] + ', n=' + options['nn'] + options['log_option'] + options['tail_option'] + ')');
-}
-
diff --git a/tests/distributions.R b/tests/distributions.R
index 2ea6537..29b3cd5 100644
--- a/tests/distributions.R
+++ b/tests/distributions.R
@@ -135,7 +135,7 @@ suite <- new ("RKTestSuite", id="distributions",
rk.call.plugin ("rkward::tukey_probabilities", df.real="5.0", logp.state="0", lower.state="1", mode.string="p", nmeans.real="5.00", q.tsv="", submit.mode="submit")
}),
new ("RKTest", id="plot_tukey_distribution", call=function () {
- rk.call.plugin ("rkward::plot_tukey_distribution", df.real="5.00", log.state="0", lower.state="1", max.real="8.00", min.real="-1.00", n.real="101.00", nmeans.real="6.00", nranges.real="1.00", plotoptions.add_grid.state="0", plotoptions.asp.real="0.00", plotoptions.main.text="", plotoptions.pointcolor.color.string="", plotoptions.pointtype.string="", plotoptions.sub.text="", plotoptions.xaxt.state="", plotoptions.xlab.text="", plotoptions.xlog.state="", plotoptions.xmaxvalue.text="", plotoptions.xminvalue.text="", plotoptions.yaxt.state="", plotoptions.ylab.text="", plotoptions.ylog.state="", plotoptions.ymaxvalue.text="", plotoptions.yminvalue.text="", submit.mode="submit")
+ rk.call.plugin ("rkward::plot_tukey_distribution", df.real="5.00", log.state="0", lower.state="1", max.real="8.00", min.real="-1.00", n.real="101.00", nmeans.real="6.00", plotoptions.add_grid.state="0", plotoptions.asp.real="0.00", plotoptions.main.text="", plotoptions.pointcolor.color.string="", plotoptions.pointtype.string="", plotoptions.sub.text="", plotoptions.xaxt.state="", plotoptions.xlab.text="", plotoptions.xlog.state="", plotoptions.xmaxvalue.text="", plotoptions.xminvalue.text="", plotoptions.yaxt.state="", plotoptions.ylab.text="", plotoptions.ylog.state="", plotoptions.ymaxvalue.text="", plotoptions.yminvalue.text="", submit.mode="submit")
}),
new ("RKTest", id="uniform_probabilities", call=function () {
rk.call.plugin ("rkward::uniform_probabilities", logp.state="0", lower.state="1", max.real="1.00", min.real="0.00", mode.string="p", q.tsv="", submit.mode="submit")
diff --git a/tests/distributions/plot_beta_distribution.rkcommands.R b/tests/distributions/plot_beta_distribution.rkcommands.R
index 511df35..5479d42 100644
--- a/tests/distributions/plot_beta_distribution.rkcommands.R
+++ b/tests/distributions/plot_beta_distribution.rkcommands.R
@@ -1,10 +1,18 @@
local({
## Print result
-rk.header ("Beta distribution function", list ("Number of Observations", "100", "Lower quantile", "0.00", "Upper quantile", "1.00", "Shape1", "2.00", "Shape2", "2.00", "Non-centrality parameter", "0.00", "Scale", "logarithmic", "Tail","Lower", "Function", "pbeta"));
+rk.header ("Beta distribution function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="0.00",
+ "Upper quantile"="1.00",
+ "Shape1 (a)"="2.00",
+ "Shape2 (b)"="2.00",
+ "Non-centrality parameter (ncp)"="0.00",
+ "Tail"="Lower tail: P[X ≤ x]",
+ "Logarithmic"="yes",
+ "Function"="pbeta"))
rk.graph.on ()
try ({
- curve (pbeta(x, shape1=2.00, shape2=2.00, ncp=0.00, log.p=TRUE, lower.tail = TRUE), from=0.00, to=1.00, n=100)
+ curve (pbeta(x, shape1=2.00, shape2=2.00, ncp=0.00, lower.tail = TRUE, log.p=TRUE), from=0.00, to=1.00, n=100)
})
rk.graph.off ()
})
diff --git a/tests/distributions/plot_beta_distribution.rkout b/tests/distributions/plot_beta_distribution.rkout
index 3c72f18..2b8d154 100644
--- a/tests/distributions/plot_beta_distribution.rkout
+++ b/tests/distributions/plot_beta_distribution.rkout
@@ -3,11 +3,11 @@
<ul><li>Number of Observations: 100</li>
<li>Lower quantile: 0.00</li>
<li>Upper quantile: 1.00</li>
-<li>Shape1: 2.00</li>
-<li>Shape2: 2.00</li>
-<li>Non-centrality parameter: 0.00</li>
-<li>Scale: logarithmic</li>
-<li>Tail: Lower</li>
+<li>Shape1 (a): 2.00</li>
+<li>Shape2 (b): 2.00</li>
+<li>Non-centrality parameter (ncp): 0.00</li>
+<li>Tail: Lower tail: P[X ≤ x]</li>
+<li>Logarithmic: yes</li>
<li>Function: pbeta</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_binomial_distribution.rkcommands.R b/tests/distributions/plot_binomial_distribution.rkcommands.R
index 29f91ce..61f7797 100644
--- a/tests/distributions/plot_binomial_distribution.rkcommands.R
+++ b/tests/distributions/plot_binomial_distribution.rkcommands.R
@@ -1,6 +1,11 @@
local({
## Print result
-rk.header ("Binomial density function", list ("Lower quantile", "0", "Upper quantile", "12", "Number of trials", "12", "Probability of success on each trial", "0.50", "Scale", "normal", "Function", "dbinom"));
+rk.header ("Binomial density function", parameters=list("Lower quantile"="0",
+ "Upper quantile"="12",
+ "Number of trials"="12",
+ "Probability of success on each trial"="0.50",
+ "Logarithmic"="no",
+ "Function"="dbinom"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_binomial_distribution.rkout b/tests/distributions/plot_binomial_distribution.rkout
index 2eca2ba..55e8eb2 100644
--- a/tests/distributions/plot_binomial_distribution.rkout
+++ b/tests/distributions/plot_binomial_distribution.rkout
@@ -4,7 +4,7 @@
<li>Upper quantile: 12</li>
<li>Number of trials: 12</li>
<li>Probability of success on each trial: 0.50</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dbinom</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_cauchy_distribution.rkcommands.R b/tests/distributions/plot_cauchy_distribution.rkcommands.R
index 23f9cc0..8533e5b 100644
--- a/tests/distributions/plot_cauchy_distribution.rkcommands.R
+++ b/tests/distributions/plot_cauchy_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Cauchy density function", list ("Number of Observations", "100", "Lower quantile", "-3.29", "Upper quantile", "3.29", "Location", "0.00", "Scale", "1.00", "Scale", "normal", "Function", "dcauchy"));
+rk.header ("Cauchy density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="-3.29",
+ "Upper quantile"="3.29",
+ "Location"="0.00",
+ "Scale"="1.00",
+ "Logarithmic"="no",
+ "Function"="dcauchy"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_cauchy_distribution.rkout b/tests/distributions/plot_cauchy_distribution.rkout
index a175489..6df3d52 100644
--- a/tests/distributions/plot_cauchy_distribution.rkout
+++ b/tests/distributions/plot_cauchy_distribution.rkout
@@ -5,7 +5,7 @@
<li>Upper quantile: 3.29</li>
<li>Location: 0.00</li>
<li>Scale: 1.00</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dcauchy</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_chi_squared_distribution.rkcommands.R b/tests/distributions/plot_chi_squared_distribution.rkcommands.R
index a6ee07b..9136a6f 100644
--- a/tests/distributions/plot_chi_squared_distribution.rkcommands.R
+++ b/tests/distributions/plot_chi_squared_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Chisquare density function", list ("Number of Observations", "100", "Lower quantile", "0.30", "Upper quantile", "24.10", "Degrees of freedom", "4.00", "Non-centrality parameter", "0.00", "Scale", "normal", "Function", "dchisq"));
+rk.header ("Chi-square density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="0.30",
+ "Upper quantile"="24.10",
+ "Degrees of freedom"="4.00",
+ "Non-centrality parameter"="0.00",
+ "Logarithmic"="no",
+ "Function"="dchisq"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_chi_squared_distribution.rkout b/tests/distributions/plot_chi_squared_distribution.rkout
index e11d575..cc56d83 100644
--- a/tests/distributions/plot_chi_squared_distribution.rkout
+++ b/tests/distributions/plot_chi_squared_distribution.rkout
@@ -1,11 +1,11 @@
-<h1>Chisquare density function</h1>
+<h1>Chi-square density function</h1>
<h2>Parameters</h2>
<ul><li>Number of Observations: 100</li>
<li>Lower quantile: 0.30</li>
<li>Upper quantile: 24.10</li>
<li>Degrees of freedom: 4.00</li>
<li>Non-centrality parameter: 0.00</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dchisq</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_exponential_distribution.rkcommands.R b/tests/distributions/plot_exponential_distribution.rkcommands.R
index 9430537..b362a89 100644
--- a/tests/distributions/plot_exponential_distribution.rkcommands.R
+++ b/tests/distributions/plot_exponential_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Exponential distribution function", list ("Number of Observations", "100", "Lower quantile", "0.00", "Upper quantile", "10.00", "Rate", "1.00", "Scale", "normal", "Tail","Upper", "Function", "pexp"));
+rk.header ("Exponential distribution function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="0.00",
+ "Upper quantile"="10.00",
+ "Rate"="1.00",
+ "Tail"="Upper tail: P[X > x]",
+ "Logarithmic"="no",
+ "Function"="pexp"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_exponential_distribution.rkout b/tests/distributions/plot_exponential_distribution.rkout
index 064329a..2829e5f 100644
--- a/tests/distributions/plot_exponential_distribution.rkout
+++ b/tests/distributions/plot_exponential_distribution.rkout
@@ -4,8 +4,8 @@
<li>Lower quantile: 0.00</li>
<li>Upper quantile: 10.00</li>
<li>Rate: 1.00</li>
-<li>Scale: normal</li>
-<li>Tail: Upper</li>
+<li>Tail: Upper tail: P[X > x]</li>
+<li>Logarithmic: no</li>
<li>Function: pexp</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_f_distribution.rkcommands.R b/tests/distributions/plot_f_distribution.rkcommands.R
index f5f2a96..42f3d1f 100644
--- a/tests/distributions/plot_f_distribution.rkcommands.R
+++ b/tests/distributions/plot_f_distribution.rkcommands.R
@@ -1,6 +1,13 @@
local({
## Print result
-rk.header ("F density function", list ("Number of Observations", "100", "Lower quantile", "0.001", "Upper quantile", "25.00", "Numerator degrees of freedom", "5.00", "Denominator degrees of freedom", "5.00", "Non-centrality", "0", "Scale", "logarithmic", "Function", "df"));
+rk.header ("F density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="0.001",
+ "Upper quantile"="25.00",
+ "Numerator degrees of freedom"="5.00",
+ "Denominator degrees of freedom"="5.00",
+ "Non-centrality parameter"="0",
+ "Logarithmic"="yes",
+ "Function"="df"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_f_distribution.rkout b/tests/distributions/plot_f_distribution.rkout
index 01fd75b..089b02a 100644
--- a/tests/distributions/plot_f_distribution.rkout
+++ b/tests/distributions/plot_f_distribution.rkout
@@ -5,8 +5,8 @@
<li>Upper quantile: 25.00</li>
<li>Numerator degrees of freedom: 5.00</li>
<li>Denominator degrees of freedom: 5.00</li>
-<li>Non-centrality: 0</li>
-<li>Scale: logarithmic</li>
+<li>Non-centrality parameter: 0</li>
+<li>Logarithmic: yes</li>
<li>Function: df</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_gamma_distribution.rkcommands.R b/tests/distributions/plot_gamma_distribution.rkcommands.R
index 1f466bd..f069ee7 100644
--- a/tests/distributions/plot_gamma_distribution.rkcommands.R
+++ b/tests/distributions/plot_gamma_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Gamma density function", list ("Number of Observations", "100", "Lower quantile", "0.01", "Upper quantile", "4.60", "Shape", "1.61", "Rate", "0.87", "Scale", "normal", "Function", "dgamma"));
+rk.header ("Gamma density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="0.01",
+ "Upper quantile"="4.60",
+ "Shape"="1.61",
+ "Rate (lambda) or 1/Scale"="0.87",
+ "Logarithmic"="no",
+ "Function"="dgamma"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_gamma_distribution.rkout b/tests/distributions/plot_gamma_distribution.rkout
index 135e9eb..9b64387 100644
--- a/tests/distributions/plot_gamma_distribution.rkout
+++ b/tests/distributions/plot_gamma_distribution.rkout
@@ -4,8 +4,8 @@
<li>Lower quantile: 0.01</li>
<li>Upper quantile: 4.60</li>
<li>Shape: 1.61</li>
-<li>Rate: 0.87</li>
-<li>Scale: normal</li>
+<li>Rate (lambda) or 1/Scale: 0.87</li>
+<li>Logarithmic: no</li>
<li>Function: dgamma</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_geometric_distribution.rkcommands.R b/tests/distributions/plot_geometric_distribution.rkcommands.R
index 4d5865a..aa9fb68 100644
--- a/tests/distributions/plot_geometric_distribution.rkcommands.R
+++ b/tests/distributions/plot_geometric_distribution.rkcommands.R
@@ -1,6 +1,10 @@
local({
## Print result
-rk.header ("Geometric density function", list ("Lower quantile", "0", "Upper quantile", "12", "Probability of success on each trial", "0.50", "Scale", "normal", "Function", "dgeom"));
+rk.header ("Geometric density function", parameters=list("Lower quantile"="0",
+ "Upper quantile"="12",
+ "Probability of success on each trial"="0.50",
+ "Logarithmic"="no",
+ "Function"="dgeom"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_geometric_distribution.rkout b/tests/distributions/plot_geometric_distribution.rkout
index 7d32f2f..21c91cf 100644
--- a/tests/distributions/plot_geometric_distribution.rkout
+++ b/tests/distributions/plot_geometric_distribution.rkout
@@ -3,7 +3,7 @@
<ul><li>Lower quantile: 0</li>
<li>Upper quantile: 12</li>
<li>Probability of success on each trial: 0.50</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dgeom</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_hypergeometric_distribution.rkcommands.R b/tests/distributions/plot_hypergeometric_distribution.rkcommands.R
index fde8219..83a50ca 100644
--- a/tests/distributions/plot_hypergeometric_distribution.rkcommands.R
+++ b/tests/distributions/plot_hypergeometric_distribution.rkcommands.R
@@ -1,6 +1,13 @@
local({
## Print result
-rk.header ("Hypergeometric distribution function", list ("Lower quantile", "0", "Upper quantile", "12", "Number of white balls", "12", "Number of black balls", "12", "Number of balls drawn", "15", "Scale", "normal", "Tail","Lower", "Function", "phyper"));
+rk.header ("Hypergeometric distribution function", parameters=list("Lower quantile"="0",
+ "Upper quantile (at most k)"="12",
+ "Number of white balls (m)"="12",
+ "Number of black balls (n)"="12",
+ "Number of balls drawn (k)"="15",
+ "Tail"="Lower tail: P[X ≤ x]",
+ "Logarithmic"="no",
+ "Function"="phyper"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_hypergeometric_distribution.rkout b/tests/distributions/plot_hypergeometric_distribution.rkout
index 3a2d7bb..c038cda 100644
--- a/tests/distributions/plot_hypergeometric_distribution.rkout
+++ b/tests/distributions/plot_hypergeometric_distribution.rkout
@@ -1,12 +1,12 @@
<h1>Hypergeometric distribution function</h1>
<h2>Parameters</h2>
<ul><li>Lower quantile: 0</li>
-<li>Upper quantile: 12</li>
-<li>Number of white balls: 12</li>
-<li>Number of black balls: 12</li>
-<li>Number of balls drawn: 15</li>
-<li>Scale: normal</li>
-<li>Tail: Lower</li>
+<li>Upper quantile (at most k): 12</li>
+<li>Number of white balls (m): 12</li>
+<li>Number of black balls (n): 12</li>
+<li>Number of balls drawn (k): 15</li>
+<li>Tail: Lower tail: P[X ≤ x]</li>
+<li>Logarithmic: no</li>
<li>Function: phyper</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_log_normal_distribution.rkcommands.R b/tests/distributions/plot_log_normal_distribution.rkcommands.R
index d88d901..849ce1f 100644
--- a/tests/distributions/plot_log_normal_distribution.rkcommands.R
+++ b/tests/distributions/plot_log_normal_distribution.rkcommands.R
@@ -1,6 +1,13 @@
local({
## Print result
-rk.header ("Lognormal distribution function", list ("Number of Observations", "100", "Lower quantile", "0.01", "Upper quantile", "3.29", "Mean", "4.00", "Standard deviation", "1.00", "Scale", "normal", "Tail","Lower", "Function", "plnorm"));
+rk.header ("Log-Normal distribution function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="0.01",
+ "Upper quantile"="3.29",
+ "Mean"="4.00",
+ "Standard deviation"="1.00",
+ "Tail"="Lower tail: P[X ≤ x]",
+ "Logarithmic"="no",
+ "Function"="plnorm"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_log_normal_distribution.rkout b/tests/distributions/plot_log_normal_distribution.rkout
index fc558b0..3cc4882 100644
--- a/tests/distributions/plot_log_normal_distribution.rkout
+++ b/tests/distributions/plot_log_normal_distribution.rkout
@@ -1,12 +1,12 @@
-<h1>Lognormal distribution function</h1>
+<h1>Log-Normal distribution function</h1>
<h2>Parameters</h2>
<ul><li>Number of Observations: 100</li>
<li>Lower quantile: 0.01</li>
<li>Upper quantile: 3.29</li>
<li>Mean: 4.00</li>
<li>Standard deviation: 1.00</li>
-<li>Scale: normal</li>
-<li>Tail: Lower</li>
+<li>Tail: Lower tail: P[X ≤ x]</li>
+<li>Logarithmic: no</li>
<li>Function: plnorm</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_logistic_distribution.rkcommands.R b/tests/distributions/plot_logistic_distribution.rkcommands.R
index 2d0100e..a3b870f 100644
--- a/tests/distributions/plot_logistic_distribution.rkcommands.R
+++ b/tests/distributions/plot_logistic_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Logistic density function", list ("Number of Observations", "100", "Lower quantile", "-3.29", "Upper quantile", "3.29", "Location", "0.00", "Scale", "1.00", "Scale", "normal", "Function", "dlogis"));
+rk.header ("Logistic density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="-3.29",
+ "Upper quantile"="3.29",
+ "Location"="0.00",
+ "Scale"="1.00",
+ "Logarithmic"="no",
+ "Function"="dlogis"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_logistic_distribution.rkout b/tests/distributions/plot_logistic_distribution.rkout
index 75f0151..22e3906 100644
--- a/tests/distributions/plot_logistic_distribution.rkout
+++ b/tests/distributions/plot_logistic_distribution.rkout
@@ -5,7 +5,7 @@
<li>Upper quantile: 3.29</li>
<li>Location: 0.00</li>
<li>Scale: 1.00</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dlogis</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_negbinomial_distribution.rkcommands.R b/tests/distributions/plot_negbinomial_distribution.rkcommands.R
index 8b979fc..a9ac343 100644
--- a/tests/distributions/plot_negbinomial_distribution.rkcommands.R
+++ b/tests/distributions/plot_negbinomial_distribution.rkcommands.R
@@ -1,6 +1,11 @@
local({
## Print result
-rk.header ("Negative Binomial density function", list ("Lower quantile", "0", "Upper quantile", "24", "Target for number of successful trials", "12", "Probability of success in each trial", "0.75", "Scale", "normal", "Function", "dnbinom"));
+rk.header ("Negative Binomial density function", parameters=list("Lower quantile"="0",
+ "Upper quantile"="24",
+ "Target number of successful trials"="12",
+ "Probability of success on each trial"="0.75",
+ "Logarithmic"="no",
+ "Function"="dnbinom"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_negbinomial_distribution.rkout b/tests/distributions/plot_negbinomial_distribution.rkout
index 3637865..4aa462b 100644
--- a/tests/distributions/plot_negbinomial_distribution.rkout
+++ b/tests/distributions/plot_negbinomial_distribution.rkout
@@ -2,9 +2,9 @@
<h2>Parameters</h2>
<ul><li>Lower quantile: 0</li>
<li>Upper quantile: 24</li>
-<li>Target for number of successful trials: 12</li>
-<li>Probability of success in each trial: 0.75</li>
-<li>Scale: normal</li>
+<li>Target number of successful trials: 12</li>
+<li>Probability of success on each trial: 0.75</li>
+<li>Logarithmic: no</li>
<li>Function: dnbinom</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_normal_distribution.rkcommands.R b/tests/distributions/plot_normal_distribution.rkcommands.R
index f6dcd03..a71f64c 100644
--- a/tests/distributions/plot_normal_distribution.rkcommands.R
+++ b/tests/distributions/plot_normal_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Normal density function", list ("Number of Observations", "100", "Lower quantile", "-3.29", "Upper quantile", "3.29", "Mean", "0.00", "Standard Deviation", "1.00", "Scale", "normal", "Function", "dnorm"));
+rk.header ("Normal density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="-3.29",
+ "Upper quantile"="3.29",
+ "Mean"="0.00",
+ "Standard deviation"="1.00",
+ "Logarithmic"="no",
+ "Function"="dnorm"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_normal_distribution.rkout b/tests/distributions/plot_normal_distribution.rkout
index 50bd839..2cd6aa5 100644
--- a/tests/distributions/plot_normal_distribution.rkout
+++ b/tests/distributions/plot_normal_distribution.rkout
@@ -4,8 +4,8 @@
<li>Lower quantile: -3.29</li>
<li>Upper quantile: 3.29</li>
<li>Mean: 0.00</li>
-<li>Standard Deviation: 1.00</li>
-<li>Scale: normal</li>
+<li>Standard deviation: 1.00</li>
+<li>Logarithmic: no</li>
<li>Function: dnorm</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_poisson_distribution.rkcommands.R b/tests/distributions/plot_poisson_distribution.rkcommands.R
index 6f6ae9f..0c0a7c6 100644
--- a/tests/distributions/plot_poisson_distribution.rkcommands.R
+++ b/tests/distributions/plot_poisson_distribution.rkcommands.R
@@ -1,6 +1,10 @@
local({
## Print result
-rk.header ("Poisson density function", list ("Lower quantile", "0", "Upper quantile", "12", "Mean", "5.00", "Scale", "normal", "Function", "dpois"));
+rk.header ("Poisson density function", parameters=list("Lower quantile"="0",
+ "Upper quantile"="12",
+ "Mean"="5.00",
+ "Logarithmic"="no",
+ "Function"="dpois"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_poisson_distribution.rkout b/tests/distributions/plot_poisson_distribution.rkout
index 1d2f371..167e73b 100644
--- a/tests/distributions/plot_poisson_distribution.rkout
+++ b/tests/distributions/plot_poisson_distribution.rkout
@@ -3,7 +3,7 @@
<ul><li>Lower quantile: 0</li>
<li>Upper quantile: 12</li>
<li>Mean: 5.00</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dpois</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_t_distribution.rkcommands.R b/tests/distributions/plot_t_distribution.rkcommands.R
index 2fa396e..e2b1c91 100644
--- a/tests/distributions/plot_t_distribution.rkcommands.R
+++ b/tests/distributions/plot_t_distribution.rkcommands.R
@@ -1,6 +1,13 @@
local({
## Print result
-rk.header ("Student t distribution function", list ("Number of Observations", "100", "Minimum", "-12.924", "Maximum", "12.924", "Degrees of freedom", "1.00", "Non-centrality", "0.00", "Scale", "normal", "Tail","Lower", "Function", "pt"));
+rk.header ("Student t distribution function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="-12.924",
+ "Upper quantile"="12.924",
+ "Degrees of freedom"="1.00",
+ "Non-centrality parameter"="0.00",
+ "Tail"="Lower tail: P[X ≤ x]",
+ "Logarithmic"="no",
+ "Function"="pt"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_t_distribution.rkout b/tests/distributions/plot_t_distribution.rkout
index b13b52e..0317048 100644
--- a/tests/distributions/plot_t_distribution.rkout
+++ b/tests/distributions/plot_t_distribution.rkout
@@ -1,12 +1,12 @@
<h1>Student t distribution function</h1>
<h2>Parameters</h2>
<ul><li>Number of Observations: 100</li>
-<li>Minimum: -12.924</li>
-<li>Maximum: 12.924</li>
+<li>Lower quantile: -12.924</li>
+<li>Upper quantile: 12.924</li>
<li>Degrees of freedom: 1.00</li>
-<li>Non-centrality: 0.00</li>
-<li>Scale: normal</li>
-<li>Tail: Lower</li>
+<li>Non-centrality parameter: 0.00</li>
+<li>Tail: Lower tail: P[X ≤ x]</li>
+<li>Logarithmic: no</li>
<li>Function: pt</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_tukey_distribution.rkcommands.R b/tests/distributions/plot_tukey_distribution.rkcommands.R
index a1c6a7d..0a28c41 100644
--- a/tests/distributions/plot_tukey_distribution.rkcommands.R
+++ b/tests/distributions/plot_tukey_distribution.rkcommands.R
@@ -1,10 +1,17 @@
local({
## Print result
-rk.header ("Tukey distribution function", list ("Number of Observations", "101", "Lower quantile", "-1.00", "Upper quantile", "8.00", "Sample size for range", "6", "Degreed of freedom for s", "5.00", "Number of groups", "1", "Scale", "normal", "Tail","Lower", "Function", "ptukey"));
+rk.header ("Studentized Range (Tukey) distribution function", parameters=list("Number of Observations"="101",
+ "Lower quantile"="-1.00",
+ "Upper quantile"="8.00",
+ "Number of observations"="6",
+ "Degrees of freedom for standard deviation estimate"="5.0",
+ "Tail"="Lower tail: P[X ≤ x]",
+ "Logarithmic"="no",
+ "Function"="ptukey"))
rk.graph.on ()
try ({
- curve (ptukey(x, nmeans=6, df=5.00, nranges=1, lower.tail = TRUE), from=-1.00, to=8.00, n=101)
+ curve (ptukey(x, nmeans=6, df=5.0, lower.tail = TRUE), from=-1.00, to=8.00, n=101)
})
rk.graph.off ()
})
diff --git a/tests/distributions/plot_tukey_distribution.rkout b/tests/distributions/plot_tukey_distribution.rkout
index d6e6568..5f31cf1 100644
--- a/tests/distributions/plot_tukey_distribution.rkout
+++ b/tests/distributions/plot_tukey_distribution.rkout
@@ -1,13 +1,12 @@
-<h1>Tukey distribution function</h1>
+<h1>Studentized Range (Tukey) distribution function</h1>
<h2>Parameters</h2>
<ul><li>Number of Observations: 101</li>
<li>Lower quantile: -1.00</li>
<li>Upper quantile: 8.00</li>
-<li>Sample size for range: 6</li>
-<li>Degreed of freedom for s: 5.00</li>
-<li>Number of groups: 1</li>
-<li>Scale: normal</li>
-<li>Tail: Lower</li>
+<li>Number of observations: 6</li>
+<li>Degrees of freedom for standard deviation estimate: 5.0</li>
+<li>Tail: Lower tail: P[X ≤ x]</li>
+<li>Logarithmic: no</li>
<li>Function: ptukey</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_uniform_distribution.rkcommands.R b/tests/distributions/plot_uniform_distribution.rkcommands.R
index e5a9a28..6b0f697 100644
--- a/tests/distributions/plot_uniform_distribution.rkcommands.R
+++ b/tests/distributions/plot_uniform_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Uniform density function", list ("Number of Observations", "100", "Lower quantile", "-1.00", "Upper quantile", "2.00", "Minimum", "0.00", "Maximum", "1.00", "Scale", "normal", "Function", "dunif"));
+rk.header ("Uniform density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="-1.00",
+ "Upper quantile"="2.00",
+ "Minimum"="0.00",
+ "Maximum"="1.00",
+ "Logarithmic"="no",
+ "Function"="dunif"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_uniform_distribution.rkout b/tests/distributions/plot_uniform_distribution.rkout
index 623cee0..bedf6d8 100644
--- a/tests/distributions/plot_uniform_distribution.rkout
+++ b/tests/distributions/plot_uniform_distribution.rkout
@@ -5,7 +5,7 @@
<li>Upper quantile: 2.00</li>
<li>Minimum: 0.00</li>
<li>Maximum: 1.00</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dunif</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_weibull_distribution.rkcommands.R b/tests/distributions/plot_weibull_distribution.rkcommands.R
index b151ef1..5e968fe 100644
--- a/tests/distributions/plot_weibull_distribution.rkcommands.R
+++ b/tests/distributions/plot_weibull_distribution.rkcommands.R
@@ -1,6 +1,12 @@
local({
## Print result
-rk.header ("Weibull density function", list ("Number of Observations", "100", "Lower quantile", "0.00", "Upper quantile", "5.00", "Shape", "2.00", "Scale", "1.00", "Scale", "normal", "Function", "dweibull"));
+rk.header ("Weibull density function", parameters=list("Number of Observations"="100",
+ "Lower quantile"="0.00",
+ "Upper quantile"="5.00",
+ "Shape"="2.00",
+ "Scale"="1.00",
+ "Logarithmic"="no",
+ "Function"="dweibull"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_weibull_distribution.rkout b/tests/distributions/plot_weibull_distribution.rkout
index bc67ff7..46732e7 100644
--- a/tests/distributions/plot_weibull_distribution.rkout
+++ b/tests/distributions/plot_weibull_distribution.rkout
@@ -5,7 +5,7 @@
<li>Upper quantile: 5.00</li>
<li>Shape: 2.00</li>
<li>Scale: 1.00</li>
-<li>Scale: normal</li>
+<li>Logarithmic: no</li>
<li>Function: dweibull</li>
</ul>
DATE<br />
diff --git a/tests/distributions/plot_wilcoxon_distribution.rkcommands.R b/tests/distributions/plot_wilcoxon_distribution.rkcommands.R
index f4a9885..4585125 100644
--- a/tests/distributions/plot_wilcoxon_distribution.rkcommands.R
+++ b/tests/distributions/plot_wilcoxon_distribution.rkcommands.R
@@ -1,6 +1,11 @@
local({
## Print result
-rk.header ("Binomial density function", list ("Lower quantile", "0", "Upper quantile", "24", "First sample size", "4", "Second sample size", "6", "Scale", "normal", "Function", "dwilcox"));
+rk.header ("Wilcoxon Rank Sum density function", parameters=list("Lower quantile"="0",
+ "Upper quantile (at most m*n)"="24",
+ "Number of Observations in first sample (m)"="4",
+ "Number of Observations in second sample (n)"="6",
+ "Logarithmic"="no",
+ "Function"="dwilcox"))
rk.graph.on ()
try ({
diff --git a/tests/distributions/plot_wilcoxon_distribution.rkout b/tests/distributions/plot_wilcoxon_distribution.rkout
index de66d3f..7a8392e 100644
--- a/tests/distributions/plot_wilcoxon_distribution.rkout
+++ b/tests/distributions/plot_wilcoxon_distribution.rkout
@@ -1,10 +1,10 @@
-<h1>Binomial density function</h1>
+<h1>Wilcoxon Rank Sum density function</h1>
<h2>Parameters</h2>
<ul><li>Lower quantile: 0</li>
-<li>Upper quantile: 24</li>
-<li>First sample size: 4</li>
-<li>Second sample size: 6</li>
-<li>Scale: normal</li>
+<li>Upper quantile (at most m*n): 24</li>
+<li>Number of Observations in first sample (m): 4</li>
+<li>Number of Observations in second sample (n): 6</li>
+<li>Logarithmic: no</li>
<li>Function: dwilcox</li>
</ul>
DATE<br />
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
rkward-cvs mailing list
rkward-cvs at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rkward-cvs
More information about the rkward-tracker
mailing list