[rkward-cvs] SF.net SVN: rkward: [1319] trunk/rkward/rkward/plugins/distributions
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Feb 5 11:09:11 UTC 2007
Revision: 1319
http://svn.sourceforge.net/rkward/?rev=1319&view=rev
Author: tfry
Date: 2007-02-05 03:09:11 -0800 (Mon, 05 Feb 2007)
Log Message:
-----------
Added plot_options
Changed to use curve instead of plot.function
Some prettifications
(Prasenjit Kapat)
Modified Paths:
--------------
trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_f_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_f_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_t_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_t_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.xml
trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php
trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml
Modified: trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -54,7 +54,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, shape1 = <? echo ($a); ?>, shape2 = <? echo ($b); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, shape1 = <? echo ($a); ?>, shape2 = <? echo ($b); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_beta_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot beta probabilities" plugin--><document>
<code file="plot_beta_distribution.php" />
+ <help file="plot_beta_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pbeta" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Beta probabilities" >
<tabbook>
<tab label="Plot Beta probabilities" >
@@ -31,14 +37,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pbeta" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -43,9 +43,11 @@
$size = getRK_val ("size");
$prob = getRK_val ("prob");
$max = getRK_val ("max");
-
if (getRK_val ("log") == "1") $log_label="logarithmic";
else $log_label="normal";
+// $type = getRK_val ("plotoptions.pointtype.string");
+ $type_tag = "";
+// if ($type == "") $type_tag = ", type=\"p\"";
if ($final) { ?>
rk.header ("Binomial <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Number of trials", "<? echo ($size); ?>", "Probability of success on each trial", "<? echo ($prob); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -53,7 +55,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, size = <? echo ($size); ?>, prob=<? echo ($prob); ?><? echo ($log_option); ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?>, type="p"))
+try (curve (<? echo ($fun); ?> (x, size = <? echo ($size); ?>, prob=<? echo ($prob); ?><? echo ($log_option); ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -2,6 +2,13 @@
<!--This is the simple "Plot binomial probabilities" plugin-->
<document>
<code file="plot_binomial_distribution.php" />
+ <help file="plot_binomial_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pbinom" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ <set id="plotoptions.pointtype.string" to="p"/>
+ </logic>
<dialog label="Plot binomial probabilities" >
<tabbook>
<tab label="Plot binomial probabilities" >
@@ -24,14 +31,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pbinom" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -53,7 +53,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, location = <? echo ($loc); ?>, scale = <? echo ($scale); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, location = <? echo ($loc); ?>, scale = <? echo ($scale); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_cauchy_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot cauchy probabilities" plugin--><document>
<code file="plot_cauchy_distribution.php" />
+ <help file="plot_cauchy_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pcauchy" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Cauchy probabilities" >
<tabbook>
<tab label="Plot Cauchy probabilities" >
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pcauchy" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -53,7 +53,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, df = <? echo ($df); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, df = <? echo ($df); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot Chi-squared probabilities" plugin--><document>
<code file="plot_chi_squared_distribution.php" />
+ <help file="plot_chi_squared_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pchisq" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Chi-squared probabilities" >
<tabbook>
<tab label="Plot Chi-squared probabilities" >
@@ -11,8 +17,8 @@
</row>
<row>
<frame label="Range" >
- <spinbox default_precision="4" type="real" id="min" initial="0.299" label="Minimum" />
- <spinbox default_precision="4" type="real" id="max" initial="24.103" label="Maximum" />
+ <spinbox default_precision="4" type="real" id="min" initial="0.299" label="Lower quantile" />
+ <spinbox default_precision="4" type="real" id="max" initial="24.103" label="Upper quantile" />
</frame>
</row>
<row>
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pchisq" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -52,7 +52,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, rate = <? echo ($rate); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, rate = <? echo ($rate); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_exponential_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot exponential probabilities" plugin--><document>
<code file="plot_exponential_distribution.php" />
+ <help file="plot_exponential_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pexp" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Exponential probabilities" >
<tabbook>
<tab label="Plot Exponential probabilities" >
@@ -29,14 +35,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pexp" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_f_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_f_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_f_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -54,7 +54,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, df1 = <? echo ($df1); ?>, df2 = <? echo ($df2); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, df1 = <? echo ($df1); ?>, df2 = <? echo ($df2); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_f_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_f_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_f_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot F probabilities" plugin--><document>
<code file="plot_f_distribution.php" />
+ <help file="plot_f_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pf" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot F probabilities" >
<tabbook>
<tab label="Plot F probabilities" >
@@ -16,13 +22,9 @@
</frame>
</row>
<frame label="Parameters">
- <row>
<spinbox max_precision="2" default_precision="2" type="real" min="0.01" id="df1" initial="5" label="Numerator degrees of freedom" />
<spinbox max_precision="2" default_precision="2" type="real" min="0.01" id="df2" initial="5" label="Denominator degrees of freedom" />
- </row>
-<!-- <row> -->
<spinbox max_precision="2" default_precision="0" type="real" min="0" id="ncp" initial="0" label="Non-centrality parameter" />
-<!-- </row> -->
</frame>
</column>
<column>
@@ -33,14 +35,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pf" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -53,7 +53,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, shape = <? echo ($shape); ?>, rate = <? echo ($rate); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, shape = <? echo ($shape); ?>, rate = <? echo ($rate); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_gamma_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot gamma probabilities" plugin--><document>
<code file="plot_gamma_distribution.php" />
+ <help file="plot_gamma_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pgamma" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Gamma probabilities" >
<tabbook>
<tab label="Plot Gamma probabilities" >
@@ -17,8 +23,8 @@
</row>
<row>
<frame label="Parameters">
- <spinbox max_precision="2" default_precision="2" type="real" id="shape" initial="1" min="0.01" label="Shape (a)" />
- <spinbox max_precision="2" default_precision="2" type="real" id="rate" initial="1" min="0.01" label="Rate (lambda)" label="rate or 1/scale" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="shape" initial="1" min="0.01" label="Shape" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="rate" initial="1" min="0.01" label="Rate (lambda)" label="Rate or 1/Scale" />
</frame>
</row>
</column>
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pgamma" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -44,6 +44,9 @@
$max = getRK_val ("max");
if (getRK_val ("log") == "1") $log_label="logarithmic";
else $log_label="normal";
+ $type = getRK_val ("plotoptions.pointtype.string");
+ $type_tag = "";
+ if ($type == "") $type_tag = ", type=\"p\"";
if ($final) { ?>
rk.header ("Geometric <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Probability of success on each trial", "<? echo ($prob); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -51,7 +54,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, prob=<? echo ($prob); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?>, type="p"))
+try (curve (<? echo ($fun); ?> (x, prob=<? echo ($prob); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -2,6 +2,12 @@
<!--This is the simple "Plot geometric probabilities" plugin-->
<document>
<code file="plot_geometric_distribution.php" />
+ <help file="plot_geometric_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pgeom" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot geometric probabilities" >
<tabbook>
<tab label="Plot geometric probabilities" >
@@ -23,14 +29,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pgeom" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -46,6 +46,9 @@
$n = getRK_val ("n");
$m = getRK_val ("m");
$k = getRK_val ("k");
+ $type = getRK_val ("plotoptions.pointtype.string");
+ $type_tag = "";
+ if ($type == "") $type_tag = ", type=\"p\"";
if ($final) { ?>
rk.header ("Hypergeometric <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Number of white balls", "<? echo ($m); ?>", "Number of black balls", "<? echo ($n); ?>", "Number of balls drawn", "<? echo ($k); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -53,7 +56,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, m = <? echo ($m); ?>, n = <? echo ($n); ?>, k = <? echo ($k); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?>, type="p"))
+try (curve (<? echo ($fun); ?> (x, m = <? echo ($m); ?>, n = <? echo ($n); ?>, k = <? echo ($k); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -2,6 +2,12 @@
<!--This is the simple "Plot hypergeometric probabilities" plugin-->
<document>
<code file="plot_hypergeometric_distribution.php" />
+ <help file="plot_hypergeometric_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="phyper" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot hypergeometric probabilities" >
<tabbook>
<tab label="Plot hypergeometric probabilities" >
@@ -25,14 +31,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="phyper" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -53,7 +53,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, location = <? echo ($loc); ?>, scale = <? echo ($scale); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, location = <? echo ($loc); ?>, scale = <? echo ($scale); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_logistic_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot logistic probabilities" plugin--><document>
<code file="plot_logistic_distribution.php" />
+ <help file="plot_logistic_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="plogis" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Logistic probabilities" >
<tabbook>
<tab label="Plot Logistic probabilities" >
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="plogis" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -52,7 +52,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, meanlog = <? echo ($mean); ?>, sdlog = <? echo ($sd); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, meanlog = <? echo ($mean); ?>, sdlog = <? echo ($sd); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_lognormal_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot lognormal probabilities" plugin--><document>
<code file="plot_lognormal_distribution.php" />
+ <help file="plot_lognormal_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="plnorm" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Lognormal probabilities" >
<tabbook>
<tab label="Plot Lognormal probabilities" >
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="plnorm" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -55,6 +55,9 @@
}
if (getRK_val ("log") == "1") $log_label="logarithmic";
else $log_label="normal";
+ $type = getRK_val ("plotoptions.pointtype.string");
+ $type_tag = "";
+ if ($type == "") $type_tag = ", type=\"p\"";
if ($final) { ?>
rk.header ("Negative Binomial <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Target for number of successful trials", "<? echo ($size); ?>", "<? echo ($paramLabel); ?>", "<? echo ($paramVal); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -62,7 +65,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, size = <? echo ($size); ?><? echo ($paramTag); ?><? echo ($paramVal); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?>, type="p"))
+try (curve (<? echo ($fun); ?> (x, size = <? echo ($size); ?><? echo ($paramTag); ?><? echo ($paramVal); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -2,17 +2,27 @@
<!--This is the simple "Plot negative binomial probabilities" plugin-->
<document>
<code file="plot_negbinomial_distribution.php" />
+ <help file="plot_negbinomial_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pnbinom" />
+ <connect client="lower.enabled" governor="dodist" />
+ <convert id="useprob" mode="equals" sources="param.string" standard="pprob" />
+ <connect client="prob.enabled" governor="useprob" />
+ <convert id="usemu" mode="equals" sources="param.string" standard="pmu" />
+ <connect client="mu.enabled" governor="usemu" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot negative binomial probabilities" >
<tabbook>
<tab label="Plot negative binomial probabilities" >
<row>
<column>
<frame label="Range" >
- <spinbox type="integer" min = "0" id="min" initial="12" label="Lower quantile (at least size)" />
+ <spinbox type="integer" min = "0" id="min" initial="0" label="Lower quantile" />
<spinbox type="integer" min = "0" id="max" initial="24" label="Upper quantile" />
</frame>
<frame label="Parameters">
- <spinbox max_precision="2" default_precision="0" type="real" id="size" min="0.01" initial="12" label="Target number of successful trials (size)" />
+ <spinbox max_precision="2" default_precision="0" type="real" id="size" min="0.01" initial="12" label="Target number of successful trials" />
<row>
<column>
<spinbox max_precision="2" default_precision="2" type="real" id="prob" initial="0.75" min="0" max="1" label="Probability of success on each trial" />
@@ -35,18 +45,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pnbinom" />
- <connect client="lower.enabled" governor="dodist" />
- <convert id="useprob" mode="equals" sources="param.string" standard="pprob" />
- <connect client="prob.enabled" governor="useprob" />
- <convert id="usemu" mode="equals" sources="param.string" standard="pmu" />
- <connect client="mu.enabled" governor="usemu" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -41,9 +41,9 @@
if (getRK_val ("log") == "1") $log_label="logarithmic";
else $log_label="normal";
$n = getRK_val ("n");
- $mean = getRK_val ("mean");
$min = getRK_val ("min");
$max = getRK_val ("max");
+ $mean = getRK_val ("mean");
$sd = getRK_val ("sd");
if ($final) { ?>
@@ -52,7 +52,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, mean = <? echo ($mean); ?>, sd = <? echo ($sd); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, mean = <? echo ($mean); ?>, sd = <? echo ($sd); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_normal_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot normal probabilities" plugin--><document>
<code file="plot_normal_distribution.php" />
+ <help file="plot_normal_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pnorm" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Normal probabilities" >
<tabbook>
<tab label="Plot Normal probabilities" >
@@ -17,8 +23,8 @@
</row>
<row>
<frame label="Parameter">
- <spinbox max_precision="2" default_precision="2" type="real" id="mean" initial="0" label="Mean (mu)" />
- <spinbox max_precision="2" default_precision="2" type="real" id="sd" min="0.01" initial="1" label="Standard deviation (sigma)" label="standard deviation" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="mean" initial="0" label="Mean" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="sd" min="0.01" initial="1" label="Standard deviation"/>
</frame>
</row>
</column>
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pnorm" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -44,6 +44,9 @@
if (getRK_val ("log") == "1") $log_label="logarithmic";
else $log_label="normal";
$mean = getRK_val ("mean");
+ $type = getRK_val ("plotoptions.pointtype.string");
+ $type_tag = "";
+ if ($type == "") $type_tag = ", type=\"p\"";
if ($final) { ?>
rk.header ("Poisson <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Mean", "<? echo ($mean); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -51,7 +54,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, lambda = <? echo ($mean); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?>, type="p"))
+try (curve (<? echo ($fun); ?> (x, lambda = <? echo ($mean); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot Poisson probabilities" plugin--><document>
<code file="plot_poisson_distribution.php" />
+ <help file="plot_poisson_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="ppois" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Poisson probabilities" >
<tabbook>
<tab label="Plot Poisson probabilities" >
@@ -13,7 +19,9 @@
</frame>
</row>
<row>
- <spinbox type="real" id="mean" min="0" initial="5" label="Mean" />
+ <frame label="Paramters" >
+ <spinbox type="real" id="mean" min="0" initial="5" label="Mean" />
+ </frame>
</row>
</column>
<column>
@@ -24,14 +32,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="ppois" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_t_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_t_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_t_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -53,7 +53,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, df = <? echo ($df); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, df = <? echo ($df); ?>, ncp = <? echo ($ncp); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_t_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_t_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_t_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,7 +1,12 @@
<!DOCTYPE rkplugin>
-<!--This is the simple "Plot t probabilities" plugin-->
-<document>
+<!--This is the simple "Plot t probabilities" plugin--><document>
<code file="plot_t_distribution.php" />
+ <help file="plot_t_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pt" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Student T probabilities" >
<tabbook>
<tab label="Plot Student T probabilities" >
@@ -19,7 +24,7 @@
<row>
<frame label="Parameters">
<spinbox max_precision="2" default_precision="2" type="real" id="df" min="0.01" initial="1" label="Degrees of freedom" />
- <spinbox max_precision="2" default_precision="2" type="real" id="ncp" min="0" initial="0" label="Non-centrality parameters" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="ncp" min="0" initial="0" label="Non-centrality parameter" />
</frame>
</row>
</column>
@@ -31,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pt" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -55,7 +55,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, nmeans = <? echo ($nmeans); ?>, df = <? echo ($df); ?>, nranges = <? echo ($nranges); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, nmeans = <? echo ($nmeans); ?>, df = <? echo ($df); ?>, nranges = <? echo ($nranges); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_tukey_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,23 +1,31 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot tukey probabilities" plugin--><document>
<code file="plot_tukey_distribution.php" />
+ <help file="plot_tukey_distribution.rkh" />
+ <logic>
+ <convert id="disablefunction" mode="range" sources="n.int" max="0" />
+ <connect client="function.enabled" governor="disablefunction" />
+ <convert id="dodist" mode="equals" sources="function.string" standard="ptukey" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Studentized Range (Tukey) probabilities" >
<tabbook>
<tab label="Plot Studentized Range (Tukey) probabilities" >
<row>
<column>
<row>
- <spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+ <spinbox type="integer" id="n" min="2" initial="101" label="Number of Observations" />
</row>
<row>
<frame label="Range" >
- <spinbox max_precision="2" default_precision="2" type="real" id="min" initial="0" min="0" label="Lower quantile" />
- <spinbox max_precision="2" default_precision="2" type="real" id="max" initial="4" label="Upper quantile" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="min" initial="-1" min="-1" label="Lower quantile" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="max" initial="8" label="Upper quantile" />
</frame>
</row>
<row>
<frame label="Parameters">
- <spinbox type="integer" id="nmeans" min="1" initial="30" label="Sample size for range (same for each group)" />
+ <spinbox type="integer" id="nmeans" min="1" initial="6" label="Sample size for range (same for each group)" />
<spinbox max_precision="2" 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" />
</frame>
@@ -28,19 +36,15 @@
<option value="dtukey" label="Plot density function" />
<option value="ptukey" label="Plot distribution" checked="true"/>
</radio>
+ <text>Only the distribution function can be plotted for the Tukey distribution.</text>
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="disablefunction" mode="range" sources="n.int" max="0" />
- <connect client="function.enabled" governor="disablefunction" />
- <convert id="dodist" mode="equals" sources="function.string" standard="ptukey" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -51,7 +51,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, min = <? echo ($llim); ?>, max = <? echo ($ulim); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, min = <? echo ($llim); ?>, max = <? echo ($ulim); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_uniform_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot uniform probabilities" plugin--><document>
<code file="plot_uniform_distribution.php" />
+ <help file="plot_uniform_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="punif" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Uniform probabilities" >
<tabbook>
<tab label="Plot Uniform probabilities" >
@@ -17,8 +23,8 @@
</row>
<row>
<frame label="Parameters">
- <spinbox max_precision="2" default_precision="2" type="real" id="llim" initial="0" label="Lower limit" />
- <spinbox max_precision="2" default_precision="2" type="real" id="ulim" initial="1" label="Upper limit" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="llim" initial="0" label="Minimum" />
+ <spinbox max_precision="2" default_precision="2" type="real" id="ulim" initial="1" label="Maximum" />
</frame>
</row>
</column>
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="punif" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -53,7 +53,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, shape = <? echo ($shape); ?>, scale = <? echo ($scale); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>))
+try (curve (<? echo ($fun); ?> (x, shape = <? echo ($shape); ?>, scale = <? echo ($scale); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_weibull_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,6 +1,12 @@
<!DOCTYPE rkplugin>
<!--This is the simple "Plot weibullprobabilities" plugin--><document>
<code file="plot_weibull_distribution.php" />
+ <help file="plot_weibull_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pweibull" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Weibull probabilities" >
<tabbook>
<tab label="Plot Weibull probabilities" >
@@ -30,14 +36,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pweibull" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
Modified: trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php 2007-02-05 11:09:11 UTC (rev 1319)
@@ -39,15 +39,16 @@
}
if (getRK_val ("log")) $log_option = ", log.p=TRUE";
}
-/* $min = getRK_val ("min");
- $max = getRK_val ("max");*/
+ $min = getRK_val ("min");
+ $max = getRK_val ("max");
$nm = getRK_val ("nm");
$nn = getRK_val ("nn");
- $min = 0;
- $max = $nn * $nm;
$n = $max - $min + 1;
if (getRK_val ("log") == "1") $log_label="logarithmic";
else $log_label="normal";
+ $type = getRK_val ("plotoptions.pointtype.string");
+ $type_tag = "";
+ if ($type == "") $type_tag = ", type=\"p\"";
if ($final) { ?>
rk.header ("Wilcoxon <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>","Upper quantile", "<? echo ($max); ?>", "First sample size", "<? echo ($nm); ?>", "Second sample size", "<? echo ($nn); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -55,7 +56,7 @@
rk.graph.on ()
<? }
?>
-try (plot (function (x) <? echo ($fun); ?> (x, m = <? echo ($nm); ?>, n = <? echo ($nn); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?>, type="p"))
+try (curve (<? echo ($fun); ?> (x, m = <? echo ($nm); ?>, n = <? echo ($nn); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
<? if ($final) { ?>
rk.graph.off ()
Modified: trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml 2007-02-05 11:02:48 UTC (rev 1318)
+++ trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml 2007-02-05 11:09:11 UTC (rev 1319)
@@ -1,22 +1,27 @@
<!DOCTYPE rkplugin>
-<!--This is the simple "Plot wilcoxon probabilities" plugin-->
-<document>
+<!--This is the simple "Plot wilcoxon probabilities" plugin--><document>
<code file="plot_wilcoxon_distribution.php" />
+ <help file="plot_wilcoxon_distribution.rkh" />
+ <logic>
+ <convert id="dodist" mode="equals" sources="function.string" standard="pwilcox" />
+ <connect client="lower.enabled" governor="dodist" />
+ <set id="plotoptions.allow_log" to="false"/>
+ </logic>
<dialog label="Plot Wilcoxon Rank Sum statistic probabilities" >
<tabbook>
<tab label="Plot Wilcoxon Rank Sum statistic probabilities" >
<row>
<column>
-<!-- <row>
+ <row>
<frame label="Range" >
- <spinbox default_precision="0" type="integer" id="min" initial="0" min = "0" label="Lower quantile" />
- <spinbox type="integer" id="max" initial="6" min="0" label="Upper quantile" />
+ <spinbox type="integer" id="min" initial="0" min = "0" label="Lower quantile" />
+ <spinbox type="integer" id="max" initial="24" min="0" label="Upper quantile (atmost m*n)" />
</frame>
- </row>-->
+ </row>
<row>
<frame label="Parameters">
- <spinbox type="integer" id="nm" min="1" initial="2" label="Number of Observations in first sample" />
- <spinbox type="integer" id="nn" min="1" initial="3" label="Number of Observations in second sample" />
+ <spinbox type="integer" id="nm" min="1" initial="4" label="Number of Observations in first sample (m)" />
+ <spinbox type="integer" id="nn" min="1" initial="6" label="Number of Observations in second sample (n)" />
</frame>
</row>
</column>
@@ -28,14 +33,11 @@
<checkbox id="log" label="Logarithmic" value="1" value_unchecked="0"/>
<checkbox id="lower" label="Lower Tail" value="1" value_unchecked="0" checked="true"/>
<stretch/>
- <preview id="preview"/>
+ <preview id="preview" label="Preview"/>
+ <embed id="plotoptions" component="rkward::plot_options" as_button="true" label="Plot Options" />
</column>
</row>
</tab>
</tabbook>
</dialog>
- <logic>
- <convert id="dodist" mode="equals" sources="function.string" standard="pwilcox" />
- <connect client="lower.enabled" governor="dodist" />
- </logic>
</document>
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