[rkward-cvs] SF.net SVN: rkward: [869] trunk/rkward/rkward/plugins

tfry at users.sourceforge.net tfry at users.sourceforge.net
Tue Oct 17 10:59:22 UTC 2006


Revision: 869
          http://svn.sourceforge.net/rkward/?rev=869&view=rev
Author:   tfry
Date:     2006-10-17 03:58:44 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
Distribution plugins corrections and new wilcoxon plugins by sjar

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/Makefile.am
    trunk/rkward/rkward/plugins/distributions/binomial_quantiles.php
    trunk/rkward/rkward/plugins/distributions/binomial_quantiles.xml
    trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.php
    trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.xml
    trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.php
    trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.xml
    trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.php
    trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.xml
    trunk/rkward/rkward/plugins/distributions/exponential_probabilities.xml
    trunk/rkward/rkward/plugins/distributions/exponential_quantiles.php
    trunk/rkward/rkward/plugins/distributions/exponential_quantiles.xml
    trunk/rkward/rkward/plugins/distributions/f_probabilities.php
    trunk/rkward/rkward/plugins/distributions/f_quantiles.php
    trunk/rkward/rkward/plugins/distributions/f_quantiles.xml
    trunk/rkward/rkward/plugins/distributions/gamma_probabilities.php
    trunk/rkward/rkward/plugins/distributions/gamma_quantiles.php
    trunk/rkward/rkward/plugins/distributions/geom_probabilities.php
    trunk/rkward/rkward/plugins/distributions/geom_quantiles.php
    trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.php
    trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.php
    trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.php
    trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.xml
    trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.php
    trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.php
    trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.php
    trunk/rkward/rkward/plugins/distributions/logistic_probabilities.php
    trunk/rkward/rkward/plugins/distributions/logistic_quantiles.php
    trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.php
    trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.php
    trunk/rkward/rkward/plugins/distributions/normal_probabilities.php
    trunk/rkward/rkward/plugins/distributions/normal_probabilities.xml
    trunk/rkward/rkward/plugins/distributions/normal_quantiles.php
    trunk/rkward/rkward/plugins/distributions/normal_quantiles.xml
    trunk/rkward/rkward/plugins/distributions/poisson_probabilities.php
    trunk/rkward/rkward/plugins/distributions/poisson_quantiles.php
    trunk/rkward/rkward/plugins/distributions/t_probabilities.php
    trunk/rkward/rkward/plugins/distributions/t_quantiles.php
    trunk/rkward/rkward/plugins/distributions/uniform_probabilities.php
    trunk/rkward/rkward/plugins/distributions/uniform_quantiles.php
    trunk/rkward/rkward/plugins/distributions/weibull_probabilities.php
    trunk/rkward/rkward/plugins/distributions/weibull_quantiles.php
    trunk/rkward/rkward/plugins/distributions.pluginmap

Added Paths:
-----------
    trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.php
    trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.xml
    trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.php
    trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.xml

Modified: trunk/rkward/rkward/plugins/Makefile.am
===================================================================
--- trunk/rkward/rkward/plugins/Makefile.am	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/Makefile.am	2006-10-17 10:58:44 UTC (rev 869)
@@ -100,7 +100,11 @@
 	distributions/weibull_probabilities.php \
 	distributions/weibull_probabilities.xml \
 	distributions/weibull_quantiles.php \
-	distributions/weibull_quantiles.xml
+	distributions/weibull_quantiles.xml \
+	distributions/wilcoxon_probabilities.php \
+	distributions/wilcoxon_probabilities.xml \
+	distributions/wilcoxon_quantiles.php \
+	distributions/wilcoxon_quantiles.xml
 
 pluginsXwritetabledir = $(kde_datadir)/rkward/writetable
 dist_pluginsXwritetable_DATA = \

Modified: trunk/rkward/rkward/plugins/distributions/binomial_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/binomial_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/binomial_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,7 +6,7 @@
 	global $p;
 	$p = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("p")) . ")";
 ?>
-rk.temp = (qbinom (p = <? echo ($p); ?>, size = <? getRK ("size"); ?>, prob = <? getRK ("prob"); ?>, <? getRK ("tail"); ?>))
+rk.temp = (qbinom (p = <? echo ($p); ?>, size = <? getRK ("size"); ?>, prob = <? getRK ("prob"); ?>, <? getRK ("tail"); ?>, <? getRK ("logp"); ?>))
 <?
 }
 	
@@ -14,9 +14,8 @@
 	//produce the output
 	global $p;
 ?>
-rk.header ("Binomial quantile", list ("Probabilities [0,1]", "<? echo ($p); ?>", "Binomial trials", "<? getRK ("size"); ?>", "Probability of success", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>Binomial quantile:  ", rk.temp, "</h3>")
-<?
+rk.header ("Binomial quantile", list ("Vector of quantiles probabilities", "<? echo ($p); ?>", "Binomial trials", "<? getRK ("size"); ?>", "Probability of success", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+cat ("<h3>Binomial quantiles:  ", rk.temp, "</h3>")<?
 }
 
 function cleanup () {

Modified: trunk/rkward/rkward/plugins/distributions/binomial_quantiles.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/binomial_quantiles.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/binomial_quantiles.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -8,15 +8,23 @@
       <tab label="Binomial quantile" >
           <row>
             <column>
-              <input initial="0.95" id="p" min="0" max="1" label="Probability"/>
+              <input initial="0.95" id="p" min="0" max="1" label="Vector of probabilities"/>
               <spinbox default_precision="2" type="real" initial="0" id="size" min="1" label="Binomial trials"/>
               <spinbox default_precision="2" type="real" initial="0.5" id="prob" min="0" max="1" label="Probability of success"/>
             </column>
             <column>
-              <radio id="tail" label="Choose type of probability" >
+              <row>
+               <radio id="tail" label="Choose type of probability" >
                 <option value="lower.tail=TRUE" label="lower tail" />
                 <option value="lower.tail=FALSE" label="upper tail" />
-              </radio>
+               </radio>
+              </row>
+              <row>
+               <radio id="logp" label="probabilities p are given as:" >
+                <option value="log.p = FALSE" label="not log(p)" />
+                <option value="log.p = TRUE" label="log(p)" />
+               </radio>
+              </row>
               <stretch/>
             </column>
           </row>

Modified: trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,16 +6,15 @@
 	global $q;
 	$q = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("q")) . ")";
 ?>
-rk.temp = (pbinom (q = <? echo ($q); ?>, size = <? getRK ("size"); ?>, prob = <? getRK ("prob"); ?>, <? getRK ("tail"); ?>))
+rk.temp = (pbinom (q = <? echo ($q); ?>, size = <? getRK ("size"); ?>, prob = <? getRK ("prob"); ?>, <? getRK ("tail"); ?>, <? getRK ("logp"); ?>))
 <?
 }
 
 function printout () {
 	global $q;
 ?>
-rk.header ("Binomial tail probability", list ("Variable value", "<? echo ($q); ?>", "Binomial trials", "<? getRK ("size"); ?>", "Probability of success", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>Binomial tail probability:  ", rk.temp, "</h3>")
-<?
+rk.header ("Binomial tail probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Binomial trials", "<? getRK ("size"); ?>", "Probability of success", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+cat ("<h3>Binomial tail probabilities:  ", rk.temp, "</h3>")<?
 }
 
 function cleanup () {

Modified: trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/binomial_tail_probabilities.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,10 +13,18 @@
               <spinbox default_precision="2" type="real" initial="0.5" id="prob" min="0" max="1" label="Probability of success"/>
             </column>
             <column>
+             <row>
               <radio id="tail" label="Choose type of probability" >
                 <option value="lower.tail=TRUE" label="lower tail" />
                 <option value="lower.tail=FALSE" label="upper tail" />
               </radio>
+             </row>
+             <row>
+              <radio id="logp" label="probabilities p are given as:" >
+               <option value="log.p = FALSE" label="not log(p)" />
+               <option value="log.p = TRUE" label="log(p)" />
+              </radio>
+             </row>
               <stretch/>
             </column>
           </row>

Modified: trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,15 +6,15 @@
 	global $q;
 	$q = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("q")) . ")";
 ?>
-rk.temp <- (pchisq (q = <? echo ($q); ?>, df = <? getRK ("df"); ?>,  ncp = <? getRK ("ncp"); ?>, <? getRK ("tail"); ?>))
+rk.temp <- (pchisq (q = <? echo ($q); ?>, df = <? getRK ("df"); ?>,  ncp = <? getRK ("ncp"); ?>, <? getRK ("tail"); ?>, <? getRK ("logp"); ?>))
 <?
 }
 
 function printout () {
 	global $q;
 ?>
-rk.header ("Chi-squared probability", list ("Variable value", "<? echo ($q); ?>", "Degrees of Freedom", "<? getRK ("df"); ?>", "non-centrality parameter", "<? getRK ("ncp"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>Chi-squared probaility:  ", rk.temp, "</h3>")
+rk.header ("Chi-squared probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Degrees of Freedom", "<? getRK ("df"); ?>", "non-centrality parameter", "<? getRK ("ncp"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+cat ("<h3>Chi-squared probailities:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/chi_squared_probabilities.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -12,10 +12,18 @@
 					<spinbox default_precision="2" type="real" initial="0" id="ncp" min="0" label="non-centrality parameter"/>
 				</column>
 				<column>
-					<radio id="tail" label="Choose type of probability" >
-						<option value="lower.tail=TRUE" label="lower tail" />
-						<option value="lower.tail=FALSE" label="upper tail" />
-					</radio>
+					<row>
+						<radio id="tail" label="Choose type of probability" >
+							<option value="lower.tail=TRUE" label="lower tail" />
+							<option value="lower.tail=FALSE" label="upper tail" />
+						</radio>
+					</row>
+					<row>
+						<radio id="logp" label="probabilities p are given as:" >
+							<option value="log.p = FALSE" label="not log(p)" />
+							<option value="log.p = TRUE" label="log(p)" />
+						</radio>
+					</row>
 					<stretch/>
 				</column>
 			</row>

Modified: trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,15 +6,15 @@
 	global $p;
 	$p = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("p")) . ")";
 ?>
-rk.temp = (qchisq (p = <? echo ($p); ?>, df = <? getRK ("df"); ?>, ncp = <? getRK ("ncp"); ?>, <? getRK ("tail"); ?>))
+rk.temp = (qchisq (p = <? echo ($p); ?>, df = <? getRK ("df"); ?>, ncp = <? getRK ("ncp"); ?>, <? getRK ("tail"); ?>, <? getRK ("logp"); ?>))
 <?
 }
 
 function printout () {
 	global $p;
 ?>
-rk.header ("Chi-squared quantile", list ("Probabilities [0,1]", "<? echo ($p); ?>", "Degrees of freedom", "<? getRK ("df"); ?>", "non-centrality parameter", "<? getRK ("ncp"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>Chi-squared quantile:  ", rk.temp, "</h3>")
+rk.header ("Chi-squared quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Degrees of freedom", "<? getRK ("df"); ?>", "non-centrality parameter", "<? getRK ("ncp"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+cat ("<h3>Chi-squared quantiles:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/chi_squared_quantiles.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -7,15 +7,23 @@
 			<tab label="Chi-squared quantile" >
 				<row>
 					<column>
-						<input initial="0.95" id="p" min="0" max="1" label="Probability"/>
+						<input initial="0.95" id="p" min="0" max="1" label="Vector of probabilities"/>
 						<spinbox default_precision="2" type="real" initial="1" id="df" min="0" label="Degrees of Freedom"/>
 						<spinbox default_precision="2" type="real" initial="0" id="ncp" min="0" label="non-centrality parameter"/>
 					</column>
 					<column>
-						<radio id="tail" label="Choose type of probability" >
-							<option value="lower.tail=TRUE" label="lower tail" />
-							<option value="lower.tail=FALSE" label="upper tail" />
-						</radio>
+						<row>
+							<radio id="tail" label="Choose type of probability" >
+								<option value="lower.tail=TRUE" label="lower tail" />
+								<option value="lower.tail=FALSE" label="upper tail" />
+							</radio>
+						</row>
+						<row>
+							<radio id="logp" label="probabilities p are given as:" >
+								<option value="log.p = FALSE" label="not log(p)" />
+								<option value="log.p = TRUE" label="log(p)" />
+							</radio>
+						</row>
 						<stretch/>
 					</column>
 				</row>

Modified: trunk/rkward/rkward/plugins/distributions/exponential_probabilities.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/exponential_probabilities.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/exponential_probabilities.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -9,7 +9,7 @@
           <row>
             <column>
                 <input initial="0.95" id="q" label="Vector of quantiles"/>
-                <spinbox default_precision="2" type="real" min="0" initial="0.5" id="rate" label="vector of rates"/>
+                <spinbox default_precision="2" type="real" min="0" initial="1" id="rate" label="vector of rates"/>
             </column>
             <column>
                 <row>

Modified: trunk/rkward/rkward/plugins/distributions/exponential_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/exponential_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/exponential_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,7 +6,7 @@
 	global $p;
 	$p = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("p")) . ")";
 ?>
-rk.temp = (pexp (p = <? echo ($p); ?>, rate = <? getRK ("rate"); ?>, <? getRK ("tail"); ?>, <? getRK("logp"); ?>))
+rk.temp = (qexp (p = <? echo ($p); ?>, rate = <? getRK ("rate"); ?>, <? getRK ("tail"); ?>, <? getRK("logp"); ?>))
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/exponential_quantiles.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/exponential_quantiles.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/exponential_quantiles.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -9,7 +9,7 @@
           <row>
             <column>
               <input initial="0.95" id="q" label="Vector of probabilities"/>
-              <spinbox default_precision="2" type="real" min="0" initial="0.5" id="rate" label="vector of rates"/>
+              <spinbox default_precision="2" type="real" min="0" initial="1" id="rate" label="vector of rates"/>
             </column>
             <column>
                 <row>

Modified: trunk/rkward/rkward/plugins/distributions/f_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/f_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/f_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,8 +13,8 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("F probability", list ("Variable value", "<? echo ($q); ?>", "Numerator degrees of freedom", "<? getRK ("df1"); ?>", "Denominator degrees of freedom", "<? getRK ("df2"); ?>", "non-centrality parameter", "<? getRK ("ncp"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>F probability:  ", rk.temp, "</h3>")
+rk.header ("F probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Numerator degrees of freedom", "<? getRK ("df1"); ?>", "Denominator degrees of freedom", "<? getRK ("df2"); ?>", "non-centrality parameter", "<? getRK ("ncp"); ?>", "Tail", "<? getRK ("tail"); ?>"));
+cat ("<h3>F probabilities:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/f_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/f_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/f_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,8 +13,8 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("F quantile", list ("Probabilities [0,1]", "<? echo ($p); ?>", "Numerator degrees of freedom", "<? getRK ("df1"); ?>", "Denominator degrees of freedom", "<? getRK ("df2"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>F quantile:  ", rk.temp, "</h3>")
+rk.header ("F quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Numerator degrees of freedom", "<? getRK ("df1"); ?>", "Denominator degrees of freedom", "<? getRK ("df2"); ?>", "Tail", "<? getRK ("tail"); ?>"));
+cat ("<h3>F quantiles:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/f_quantiles.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/f_quantiles.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/f_quantiles.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -7,7 +7,7 @@
       <tab label="F quantile" >
           <row>
             <column>
-              <input initial="0.95" id="p" min="0" max="1" label="Probability"/>
+              <input initial="0.95" id="p" min="0" max="1" label="Vector of probabilities"/>
               <spinbox default_precision="2" type="real" initial="1" id="df1" min="0" label="Numerator degree of Freedom"/>
               <spinbox default_precision="2" type="real" initial="1" id="df2" min="0" label="Denominator degree of Freedom"/>
             </column>

Modified: trunk/rkward/rkward/plugins/distributions/gamma_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gamma_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/gamma_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Gamma probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Shape", "<? getRK ("shape"); ?>", "Rate", "<? getRK ("rate"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Gamma probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Shape", "<? getRK ("shape"); ?>", "Rate", "<? getRK ("rate"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Gamma probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/gamma_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gamma_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/gamma_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -14,7 +14,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Gamma quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Shape", "<? getRK ("shape"); ?>", "Rate", "<? getRK ("rate"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Gamma quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Shape", "<? getRK ("shape"); ?>", "Rate", "<? getRK ("rate"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Gamma quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/geom_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/geom_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/geom_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Geometric probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Geometric probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Geometric probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/geom_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/geom_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/geom_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Geometric quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Geometric quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Geometric quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/gumbel_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Gumbel probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Gumbel probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Gumbel probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/gumbel_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Gumbel quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Gumbel quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Gumbel quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Hypergeometric probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Number of white balls in the urn", "<? getRK ("m"); ?>", "Number of black balls in the urn", "<? getRK ("n"); ?>", "Number of balls drawn from the urn", "<? getRK ("k"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Hypergeometric probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Number of white balls in the urn", "<? getRK ("m"); ?>", "Number of black balls in the urn", "<? getRK ("n"); ?>", "Number of balls drawn from the urn", "<? getRK ("k"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Hypergeometric probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/hypergeometric_probabilities.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -8,7 +8,7 @@
      <tab label="Hypergeometric probabilities" >
           <row>
             <column>
-                <input default_precision="2" type="real" initial="0.95" id="q" label="Vector quantiles"/>
+                <input initial="0.95" id="q" label="Vector of quantiles"/>
                 <spinbox type="integer" min="0" initial="1" id="m" label="m (Number of white balls in the urn)"/>
                 <spinbox type="integer" min="0" initial="1" id="n" label="n (Number of black balls in the urn)"/>
                 <spinbox type="integer" min="0" initial="1" id="k" label="k (Number of balls drawn from the urn)"/>

Modified: trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/hypergeometric_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Hypergeometric quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Number of white balls in the urn", "<? getRK ("m"); ?>", "Number of black balls in the urn", "<? getRK ("n"); ?>", "Number of balls drawn from the urn", "<? getRK ("k"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Hypergeometric quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Number of white balls in the urn", "<? getRK ("m"); ?>", "Number of black balls in the urn", "<? getRK ("n"); ?>", "Number of balls drawn from the urn", "<? getRK ("k"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Hypergeometric quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/log_normal_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Log Normal probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "meanlog", "<? getRK ("meanlog"); ?>", "sdlog", "<? getRK ("sdlog"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+rk.header ("Log Normal probability", list ("Vector of quantiles", "<? echo ($q); ?>", "meanlog", "<? getRK ("meanlog"); ?>", "sdlog", "<? getRK ("sdlog"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Log Normal probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/log_normal_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Log Normal quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "meanlog", "<? getRK ("meanlog"); ?>", "sdlog", "<? getRK ("sdlog"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+rk.header ("Log Normal quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "meanlog", "<? getRK ("meanlog"); ?>", "sdlog", "<? getRK ("sdlog"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Log Normal quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/logistic_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/logistic_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/logistic_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Logistic probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Location", "<? getRK ("location"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Logistic probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Location", "<? getRK ("location"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Logistic probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/logistic_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/logistic_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/logistic_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Logistic quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Location", "<? getRK ("location"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Logistic quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Location", "<? getRK ("location"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Logistic quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/negative_binomial_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -14,7 +14,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Negative Binomial probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Size", "<? getRK ("size"); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Negative Binomial probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Size", "<? getRK ("size"); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Negative Binomial probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/negative_binomial_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,14 +6,14 @@
 	global $p;
 	$p = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("p")) . ")";
 ?>
-rk.temp = (qnbinom (q = <? echo ($p); ?>, size = <? getRK ("size"); ?>, prob = <? getRK ("prob"); ?>, <? getRK ("tail"); ?>, <? getRK("logp"); ?>))
+rk.temp = (qnbinom (p = <? echo ($p); ?>, size = <? getRK ("size"); ?>, prob = <? getRK ("prob"); ?>, <? getRK ("tail"); ?>, <? getRK("logp"); ?>))
 <?
 }
 
 function printout () {
 	global $p;
 ?>
-rk.header ("Negative Binomial quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Size", "<? getRK ("size"); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Negative Binomial quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Size", "<? getRK ("size"); ?>", "Probability of success in each trial", "<? getRK ("prob"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Negative Binomial quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/normal_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/normal_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/normal_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,15 +6,15 @@
 	global $q;
 	$q = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("q")) . ")";
 ?>
-rk.temp = (pnorm (q = <? echo ($q); ?>, mean = <? getRK ("mean"); ?>, sd = <? getRK ("sd"); ?>, <? getRK ("tail"); ?>))
+rk.temp = (pnorm (q = <? echo ($q); ?>, mean = <? getRK ("mean"); ?>, sd = <? getRK ("sd"); ?>, <? getRK ("tail"); ?>, <? getRK ("logp"); ?>))
 <?
 }
 
 function printout () {
 	global $q;
 ?>
-rk.header ("Normal probabilities", list ("Variable value(s)", "<? echo ($q); ?>", "mu", "<? getRK ("mean"); ?>", "sigma", "<? getRK ("sd"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>Normal quantile:  ", rk.temp, "</h3>")
+rk.header ("Normal probability", list ("Vector of quantiles", "<? echo ($q); ?>", "mu", "<? getRK ("mean"); ?>", "sigma", "<? getRK ("sd"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+cat ("<h3>Normal probabilities:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/normal_probabilities.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/normal_probabilities.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/normal_probabilities.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -12,10 +12,19 @@
              <spinbox default_precision="2" type="real" initial="1" id="sd" label="sigma (standard deviation)"/>
             </column>
             <column>
-              <radio id="tail" label="Choose type of probability" >
-                <option value="lower.tail=TRUE" label="lower tail" />
-                <option value="lower.tail=FALSE" label="upper tail" />
-              </radio>
+              <row>
+               <radio id="tail" label="Choose type of probability" >
+                 <option value="lower.tail=TRUE" label="lower tail" />
+                 <option value="lower.tail=FALSE" label="upper tail" />
+               </radio>
+              </row>
+              <row>
+               <radio id="logp" label="probabilities p are given as:" >
+                 <option value="log.p = FALSE" label="not log(p)" />
+                 <option value="log.p = TRUE" label="log(p)" />
+               </radio>
+              </row>
+             <stretch/>
             </column>
           </row>
       </tab>

Modified: trunk/rkward/rkward/plugins/distributions/normal_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/normal_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/normal_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -6,15 +6,15 @@
 	global $p;
 	$p = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("p")) . ")";
 ?>
-rk.temp = (qnorm (p = <? echo ($p); ?>, mean = <? getRK ("mean"); ?>, sd = <? getRK ("sd"); ?>, <? getRK ("tail"); ?>))
+rk.temp = (qnorm (p = <? echo ($p); ?>, mean = <? getRK ("mean"); ?>, sd = <? getRK ("sd"); ?>, <? getRK ("tail"); ?>, <? getRK ("logp"); ?>))
 <?
 }
 
 function printout () {
 	global $p;
 ?>
-rk.header ("Normal quantile", list ("Probabilities [0,1]", "<? echo ($p); ?>", "mu", "<? getRK ("mean"); ?>", "sigma", "<? getRK ("sd"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>Normal quantile:  ", rk.temp, "</h3>")
+rk.header ("Normal quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "mu", "<? getRK ("mean"); ?>", "sigma", "<? getRK ("sd"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"));
+cat ("<h3>Normal quantiles:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/normal_quantiles.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/normal_quantiles.xml	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/normal_quantiles.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -12,10 +12,19 @@
               <spinbox default_precision="2" type="real" initial="1" id="sd" label="sigma (standard deviation)" />
             </column>
             <column>
+             <row>
               <radio id="tail" label="Choose type of probability" >
                 <option value="lower.tail=TRUE" label="lower tail" />
                 <option value="lower.tail=FALSE" label="upper tail" />
               </radio>
+             </row>
+             <row>
+              <radio id="logp" label="probabilities p are given as:" >
+                <option value="log.p = FALSE" label="not log(p)" />
+                <option value="log.p = TRUE" label="log(p)" />
+              </radio>
+             </row>
+             <stretch/>
             </column>
           </row>
       </tab>

Modified: trunk/rkward/rkward/plugins/distributions/poisson_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/poisson_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/poisson_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Poisson probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Lambda", "<? getRK ("lambda"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Poisson probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Lambda", "<? getRK ("lambda"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Poisson probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/poisson_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/poisson_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/poisson_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Poisson quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Lambda", "<? getRK ("lambda"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Poisson quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Lambda", "<? getRK ("lambda"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Poisson quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/t_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/t_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/t_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,8 +13,8 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("t probability", list ("Variable value", "<? echo ($q); ?>", "Degrees of Freedom", "<? getRK ("df"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>t probability:  ", rk.temp, "</h3>")
+rk.header ("t probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Degrees of Freedom", "<? getRK ("df"); ?>", "Tail", "<? getRK ("tail"); ?>"));
+cat ("<h3>t probabilities:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/t_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/t_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/t_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,8 +13,8 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("t quantile", list ("Probabilities [0,1]", "<? echo ($p); ?>", "Degrees of freedom", "<? getRK ("df"); ?>", "Tail", "<? getRK ("tail"); ?>"));
-cat ("<h3>t quantile:  ", rk.temp, "</h3>")
+rk.header ("t quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Degrees of freedom", "<? getRK ("df"); ?>", "Tail", "<? getRK ("tail"); ?>"));
+cat ("<h3>t quantiles:  ", rk.temp, "</h3>")
 <?
 }
 

Modified: trunk/rkward/rkward/plugins/distributions/uniform_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/uniform_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/uniform_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Uniform probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Lower limits of the distribution", "<? getRK ("min"); ?>", "Upper limits of the distribution", "<? getRK ("max"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Uniform probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Lower limits of the distribution", "<? getRK ("min"); ?>", "Upper limits of the distribution", "<? getRK ("max"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Uniform probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/uniform_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/uniform_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/uniform_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Uniform quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Lower limits of the distribution", "<? getRK ("min"); ?>", "Upper limits of the distribution", "<? getRK ("max"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Uniform quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Lower limits of the distribution", "<? getRK ("min"); ?>", "Upper limits of the distribution", "<? getRK ("max"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Uniform quantiles:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/weibull_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/weibull_probabilities.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/weibull_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $q;
 ?>
-rk.header ("Weibull probabilities", list ("Vector of quantiles", "<? echo ($q); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Weibull probability", list ("Vector of quantiles", "<? echo ($q); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Weibull probabilities:  ", rk.temp, "</h3>")
 <?
 }

Modified: trunk/rkward/rkward/plugins/distributions/weibull_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/weibull_quantiles.php	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions/weibull_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -13,7 +13,7 @@
 function printout () {
 	global $p;
 ?>
-rk.header ("Weibull quantiles", list ("Vector of probabilities", "<? echo ($p); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+rk.header ("Weibull quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "Shape", "<? getRK ("shape"); ?>", "Scale", "<? getRK ("scale"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
 cat ("<h3>Weibull quantiles:  ", rk.temp, "</h3>")
 <?
 }

Added: trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.php	                        (rev 0)
+++ trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -0,0 +1,26 @@
+<?
+function preprocess () {
+}
+	
+function calculate () {
+	global $q;
+	$q = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("q")) . ")";
+?>
+rk.temp = (pwilcox (q = <? echo ($q); ?>, m = <? getRK ("m"); ?>, n = <? getRK ("n"); ?>, <? getRK ("tail"); ?>, <? getRK("logp"); ?>))
+<?
+	}
+	
+function printout () {
+	global $q;
+?>
+rk.header ("Wilcoxon Rank Sum probability", list ("Vector of quantiles", "<? echo ($q); ?>", "m (Numbers of observations in the first sample)", "<? getRK ("m"); ?>", "n (Numbers of observations in the second sample)", "<? getRK ("n"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+cat ("<h3>Wilcoxon Rank Sum probabilities:  ", rk.temp, "</h3>")
+<?
+	}
+	
+	function cleanup () {
+?>
+rm (rk.temp)
+<?
+	}
+?>


Property changes on: trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.php
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.xml	                        (rev 0)
+++ trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -0,0 +1,34 @@
+<!DOCTYPE rkplugin>
+<!--This is the "Wilcoxon Rank Sum probabilities" plugin-->
+
+<document>
+<code file="wilcoxon_probabilities.php" />
+<dialog label="Wilcoxon Rank Sum probabilities" >
+    <tabbook>
+       <tab label="Wilcoxon Rank Sum probabilities" >
+          <row>
+            <column>
+                <input initial="0.95" id="q" label="Vector of quantiles"/>
+                <spinbox type="integer" min="0" initial="1" id="m" label="m (Numbers of observations in the first sample)"/>
+                <spinbox type="integer" min="0" initial="1" id="n" label="n (Numbers of observations in the econd sample)"/>
+            </column>
+            <column>
+                <row>
+                    <radio id="tail" label="Choose type of probability" >
+                        <option value="lower.tail=TRUE" label="lower tail" />
+                        <option value="lower.tail=FALSE" label="upper tail" />
+                    </radio>
+                </row>
+                <row>
+                    <radio id="logp" label="probabilities p are given as:" >
+                      <option value="log.p = FALSE" label="not log(p)" />
+                      <option value="log.p = TRUE" label="log(p)" />
+                  </radio>
+                </row>
+              <stretch/>
+            </column>
+          </row>
+      </tab>
+    </tabbook>
+  </dialog>
+</document>


Property changes on: trunk/rkward/rkward/plugins/distributions/wilcoxon_probabilities.xml
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.php	                        (rev 0)
+++ trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.php	2006-10-17 10:58:44 UTC (rev 869)
@@ -0,0 +1,26 @@
+<?
+function preprocess () {
+}
+	
+function calculate () {
+	global $p;
+	$p = "c (" . preg_replace ("/[, ]+/", ", ", getRK_val ("p")) . ")";
+?>
+rk.temp = (qwilcox (p = <? echo ($p); ?>, m = <? getRK ("m"); ?>, n = <? getRK ("n"); ?>, <? getRK ("tail"); ?>, <? getRK("logp"); ?>))
+<?
+	}
+	
+function printout () {
+	global $p;
+?>
+rk.header ("Wilcoxon Rank Sum quantile", list ("Vector of probabilities", "<? echo ($p); ?>", "m (Numbers of observations in the first sample)", "<? getRK ("m"); ?>", "n (Numbers of observations in the second sample)", "<? getRK ("n"); ?>", "Tail", "<? getRK ("tail"); ?>", "Probabilities p are given as", "<? getRK ("logp"); ?>"))
+cat ("<h3>Wilcoxon Rank Sum quantiles:  ", rk.temp, "</h3>")
+<?
+	}
+	
+	function cleanup () {
+?>
+rm (rk.temp)
+<?
+	}
+?>


Property changes on: trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.php
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.xml	                        (rev 0)
+++ trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.xml	2006-10-17 10:58:44 UTC (rev 869)
@@ -0,0 +1,34 @@
+<!DOCTYPE rkplugin>
+<!--This is the "Wilcoxon Rank Sum quantiles" plugin-->
+
+<document>
+<code file="wilcoxon_quantiles.php" />
+<dialog label="Wilcoxon Rank Sum quantiles" >
+    <tabbook>
+       <tab label="Wilcoxon Rank Sum quantiles" >
+          <row>
+            <column>
+                <input default_precision="2" type="real" min="0" initial="0.95" max="1" id="p" label="Vector of probabilities"/>
+                <spinbox type="integer" min="0" initial="1" id="m" label="m (Numbers of observations in the first sample)"/>
+                <spinbox type="integer" min="0" initial="1" id="n" label="n (Numbers of observations in the econd sample)"/>
+            </column>
+            <column>
+                <row>
+                    <radio id="tail" label="Choose type of probability" >
+                        <option value="lower.tail=TRUE" label="lower tail" />
+                        <option value="lower.tail=FALSE" label="upper tail" />
+                    </radio>
+                </row>
+                <row>
+                    <radio id="logp" label="probabilities p are given as:" >
+                      <option value="log.p = FALSE" label="not log(p)" />
+                      <option value="log.p = TRUE" label="log(p)" />
+                  </radio>
+                </row>
+              <stretch/>
+            </column>
+          </row>
+      </tab>
+    </tabbook>
+  </dialog>
+</document>


Property changes on: trunk/rkward/rkward/plugins/distributions/wilcoxon_quantiles.xml
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/rkward/rkward/plugins/distributions.pluginmap
===================================================================
--- trunk/rkward/rkward/plugins/distributions.pluginmap	2006-10-17 09:55:33 UTC (rev 868)
+++ trunk/rkward/rkward/plugins/distributions.pluginmap	2006-10-17 10:58:44 UTC (rev 869)
@@ -7,7 +7,6 @@
 		<component type="standard" id="beta_probabilities" file="beta_probabilities.xml" label="Beta probabilities" />
 	
 		<component type="standard" id="binomial_quantiles" file="binomial_quantiles.xml" label="Binomial quantils" />
-		<component type="standard" id="binomial_probabilities" file="binomial_probabilities.xml" label="Binomial probabilities" />
 		<component type="standard" id="binomial_tail_probabilities" file="binomial_tail_probabilities.xml" label="Binomial tail probabilities" />
 		<component type="standard" id="plot_binomial_distribution" file="plot_binomial_distribution.xml" label="Plot binomial distribution" />
 		
@@ -62,6 +61,9 @@
 
 		<component type="standard" id="weibull_quantiles" file="weibull_quantiles.xml" label="Weibull quantiles" />
 		<component type="standard" id="weibull_probabilities" file="weibull_probabilities.xml" label="Weibull probabilities" />
+
+                <component type="standard" id="wilcoxon_quantiles" file="wilcoxon_quantiles.xml" label=" Wilcoxon Rank Sum quantiles" />
+                <component type="standard" id="wilcoxon_probabilities" file="wilcoxon_probabilities.xml" label=" Wilcoxon Rank Sum probabilities" />
 		
 	</components>
 
@@ -125,14 +127,17 @@
 					<entry component="weibull_quantiles" label="Weibull quantiles" index="1"/>
 					<entry component="weibull_probabilities" label="Weibull probabilities" index="0"/>
 				</menu>
+                                <menu id="wilcoxon_distribution" label="Wilcoxon Rank Sum Distribution" index="13">
+                                        <entry component="wilcoxon_quantiles" label="Wilcoxon Rank Sum quantiles" index="1"/>
+					<entry component="wilcoxon_probabilities" label="Wilcoxon Rank Sum probabilities" index="0"/>
+				</menu>
 			</menu>
 
 			<menu id="univariate_discrete_distributions" label="Univariate discrete distributions" index="1">
 				<menu id="binomial_distribution" label="Binomial Distribution" index="0">
 					<entry component="binomial_quantiles" label="Binomial quantils" index="1"/>
-					<entry component="binomial_probabilities" label="Binomial probabilities" index="0"/>
-					<entry component="binomial_tail_probabilities" label="Binomial tail probabilities" index="2"/>
-					<entry component="plot_binomial_distribution" label="Plot binomial distribution" index="3"/>
+					<entry component="binomial_tail_probabilities" label="Binomial tail probabilities" index="0"/>
+					<entry component="plot_binomial_distribution" label="Plot binomial distribution" index="2"/>
 				</menu>
 				<menu id="geom_distribution" label="Geometric Distribution" index="1">
 					<entry component="geom_probabilities" label="Geometric probabilities" index="0"/>


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