[rkward-cvs] SF.net SVN: rkward:[4366] trunk/rkward/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Oct 15 10:45:52 UTC 2012
Revision: 4366
http://rkward.svn.sourceforge.net/rkward/?rev=4366&view=rev
Author: tfry
Date: 2012-10-15 10:45:52 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Fix javascript error, when '0' is entered for probabilies / quantiles vector.
A similar problem may need fixing in other plugins, too.
Modified Paths:
--------------
trunk/rkward/rkward/plugins/distributions/beta_probabilities.js
trunk/rkward/rkward/plugins/distributions/beta_quantiles.js
trunk/rkward/rkward/plugins/distributions/binomial_quantiles.js
trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.js
trunk/rkward/rkward/plugins/distributions/cauchy_probabilities.js
trunk/rkward/rkward/plugins/distributions/cauchy_quantiles.js
trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.js
trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.js
trunk/rkward/rkward/plugins/distributions/exponential_probabilities.js
trunk/rkward/rkward/plugins/distributions/exponential_quantiles.js
trunk/rkward/rkward/plugins/distributions/f_probabilities.js
trunk/rkward/rkward/plugins/distributions/f_quantiles.js
trunk/rkward/rkward/plugins/distributions/gamma_probabilities.js
trunk/rkward/rkward/plugins/distributions/gamma_quantiles.js
trunk/rkward/rkward/plugins/distributions/geom_probabilities.js
trunk/rkward/rkward/plugins/distributions/geom_quantiles.js
trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.js
trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.js
trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.js
trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.js
trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.js
trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.js
trunk/rkward/rkward/plugins/distributions/logistic_probabilities.js
trunk/rkward/rkward/plugins/distributions/logistic_quantiles.js
trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.js
trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.js
trunk/rkward/rkward/plugins/distributions/normal_probabilities.js
trunk/rkward/rkward/plugins/distributions/normal_quantiles.js
trunk/rkward/rkward/plugins/distributions/poisson_probabilities.js
trunk/rkward/rkward/plugins/distributions/poisson_quantiles.js
trunk/rkward/rkward/plugins/distributions/t_probabilities.js
trunk/rkward/rkward/plugins/distributions/t_quantiles.js
trunk/rkward/rkward/plugins/distributions/tukey_probabilities.js
trunk/rkward/rkward/plugins/distributions/tukey_quantiles.js
trunk/rkward/rkward/plugins/distributions/uniform_probabilities.js
trunk/rkward/rkward/plugins/distributions/uniform_quantiles.js
trunk/rkward/rkward/plugins/distributions/weibull_probabilities.js
trunk/rkward/rkward/plugins/distributions/weibull_quantiles.js
trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.js
trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.js
trunk/rkward/rkward/scriptbackends/common.js
Modified: trunk/rkward/rkward/plugins/distributions/beta_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/beta_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/beta_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pbeta (q = ' + q + ', shape1 = ' + getValue ("shape1") + ', shape2 = ' + getValue ("shape2") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/beta_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/beta_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/beta_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qbeta (p = ' + p + ', shape1 = ' + getValue ("shape1") + ', shape2 = ' + getValue ("shape2") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/binomial_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/binomial_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/binomial_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qbinom (p = ' + p + ', size = ' + getValue ("size") + ', prob = ' + getValue ("prob") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pbinom (q = ' + q + ', size = ' + getValue ("size") + ', prob = ' + getValue ("prob") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/cauchy_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/cauchy_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/cauchy_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pcauchy (q = ' + q + ', location = ' + getValue ("location") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/cauchy_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/cauchy_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/cauchy_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qcauchy (p = ' + p + ', location = ' + getValue ("location") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pchisq (q = ' + q + ', df = ' + getValue ("df") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qchisq (p = ' + p + ', df = ' + getValue ("df") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/exponential_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/exponential_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/exponential_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pexp (q = ' + q + ', rate = ' + getValue ("rate") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/exponential_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/exponential_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/exponential_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qexp (p = ' + p + ', rate = ' + getValue ("rate") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/f_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/f_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/f_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pf (q = ' + q + ', df1 = ' + getValue ("df1") + ', df2 = ' + getValue ("df2") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/f_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/f_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/f_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qf (p = ' + p + ', df1 = ' + getValue ("df1") + ', df2 = ' + getValue ("df2") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/gamma_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gamma_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/gamma_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pgamma (q = ' + q + ', shape = ' + getValue ("shape") + ', rate = ' + getValue ("rate") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/gamma_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gamma_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/gamma_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qgamma (p = ' + p + ', shape = ' + getValue ("shape") + ', rate = ' + getValue ("rate") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
echo ('\n');
Modified: trunk/rkward/rkward/plugins/distributions/geom_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/geom_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/geom_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pgeom (q = ' + q + ', prob = ' + getValue ("prob") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/geom_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/geom_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/geom_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qgeom (p = ' + p + ', prob = ' + getValue ("prob") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pweibull (q = exp(' + q + '), shape = ' + getValue ("shape") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- log(qweibull (p = ' + p + ', shape = ' + getValue ("shape") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (phyper (q = ' + q + ', m = ' + getValue ("m") + ', n = ' + getValue ("n") + ', k = ' + getValue ("k") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qhyper (p = ' + p + ', m = ' + getValue ("m") + ', n = ' + getValue ("n") + ', k = ' + getValue ("k") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (plnorm (q = ' + q + ', meanlog = ' + getValue ("meanlog") + ', sdlog = ' + getValue ("sdlog") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qlnorm (p = ' + p + ', meanlog = ' + getValue ("meanlog") + ', sdlog = ' + getValue ("sdlog") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/logistic_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/logistic_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/logistic_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (plogis (q = ' + q + ', location = ' + getValue ("location") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/logistic_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/logistic_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/logistic_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qlogis (p = ' + p + ', location = ' + getValue ("location") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pnbinom (q = ' + q + ', size = ' + getValue ("size") + ', prob = ' + getValue ("prob") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qnbinom (p = ' + p + ', size = ' + getValue ("size") + ', prob = ' + getValue ("prob") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/normal_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/normal_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/normal_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pnorm (q = ' + q + ', mean = ' + getValue ("mean") + ', sd = ' + getValue ("sd") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/normal_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/normal_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/normal_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qnorm (p = ' + p + ', mean = ' + getValue ("mean") + ', sd = ' + getValue ("sd") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/poisson_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/poisson_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/poisson_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (ppois (q = ' + q + ', lambda = ' + getValue ("lambda") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/poisson_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/poisson_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/poisson_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qpois (p = ' + p + ', lambda = ' + getValue ("lambda") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/t_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/t_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/t_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pt (q = ' + q + ', df = ' + getValue ("df") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/t_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/t_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/t_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qt (p = ' + p + ', df = ' + getValue ("df") + ', ncp = ' + getValue ("ncp") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/tukey_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/tukey_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/tukey_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (ptukey (q = ' + q + ', nmeans = ' + getValue ("nmeans") + ', df = ' + getValue ("df") + ', nranges = ' + getValue ("nranges") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/tukey_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/tukey_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/tukey_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qtukey (p = ' + p + ', nmeans = ' + getValue ("nmeans") + ', df = ' + getValue ("df") + ', nranges = ' + getValue ("nranges") + ', ' + getValue ("tail") + ', ' + getValue ("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/uniform_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/uniform_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/uniform_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (punif (q = ' + q + ', min = ' + getValue ("min") + ', max = ' + getValue ("max") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/uniform_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/uniform_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/uniform_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qunif (p = ' + p + ', min = ' + getValue ("min") + ', max = ' + getValue ("max") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/weibull_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/weibull_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/weibull_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pweibull (q = ' + q + ', shape = ' + getValue ("shape") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/weibull_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/weibull_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/weibull_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qweibull (p = ' + p + ', shape = ' + getValue ("shape") + ', scale = ' + getValue ("scale") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var q;
function calculate () {
- q = "c (" + getValue ("q").replace (/[, ]+/g, ", ") + ")";
+ q = "c (" + getString ("q").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (pwilcox (q = ' + q + ', m = ' + getValue ("m") + ', n = ' + getValue ("n") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -2,7 +2,7 @@
var p;
function calculate () {
- p = "c (" + getValue ("p").replace (/[, ]+/g, ", ") + ")";
+ p = "c (" + getString ("p").replace (/[, ]+/g, ", ") + ")";
echo ('result <- (qwilcox (p = ' + p + ', m = ' + getValue ("m") + ', n = ' + getValue ("n") + ', ' + getValue ("tail") + ', ' + getValue("logp") + '))\n');
}
Modified: trunk/rkward/rkward/scriptbackends/common.js
===================================================================
--- trunk/rkward/rkward/scriptbackends/common.js 2012-10-15 10:34:50 UTC (rev 4365)
+++ trunk/rkward/rkward/scriptbackends/common.js 2012-10-15 10:45:52 UTC (rev 4366)
@@ -48,6 +48,11 @@
return (_RK_backend.getValue (id));
}
+getString = function (id) {
+ // getValue() sometimes returns numeric results (whenever the value is "0"). This variant always returns strings.
+ return (getValue (id).toString ());
+}
+
printValue = function (id) {
echo (getValue (id));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list