[rkward-cvs] [rkward] rkward/plugins/distributions: Implement Number of observations control as a snippet. Slightly more consistent, and silences some warnings during message extraction.

Thomas Friedrichsmeier thomas.friedrichsmeier at ruhr-uni-bochum.de
Sat Jan 31 16:32:47 UTC 2015


Git commit b25285fb92331223c265767af6b4787ec10d8703 by Thomas Friedrichsmeier.
Committed on 31/01/2015 at 16:31.
Pushed by tfry into branch 'master'.

Implement Number of observations control as a snippet. Slightly more consistent, and silences some warnings during message extraction.

M  +1    -1    rkward/plugins/distributions/normal.rkh
M  +1    -1    rkward/plugins/distributions/plot_beta_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_cauchy_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_chi_squared_distribution.xml
M  +3    -0    rkward/plugins/distributions/plot_dist_common_snippets.xml
M  +1    -1    rkward/plugins/distributions/plot_exponential_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_f_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_gamma_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_logistic_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_lognormal_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_normal_distribution.xml
M  +2    -2    rkward/plugins/distributions/plot_t_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_tukey_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_uniform_distribution.xml
M  +1    -1    rkward/plugins/distributions/plot_weibull_distribution.xml

http://commits.kde.org/rkward/b25285fb92331223c265767af6b4787ec10d8703

diff --git a/rkward/plugins/distributions/normal.rkh b/rkward/plugins/distributions/normal.rkh
index c41441a..2dcf3cf 100644
--- a/rkward/plugins/distributions/normal.rkh
+++ b/rkward/plugins/distributions/normal.rkh
@@ -10,7 +10,7 @@
 	<settings>
 		<insert snippet="dialog_settings"/>
 		<setting id="mean">Mean.</setting>
-		<setting id="prob">Standard deviation.</setting>
+		<setting id="sd">Standard deviation.</setting>
 	</settings>
 	<related>
 		<ul>
diff --git a/rkward/plugins/distributions/plot_beta_distribution.xml b/rkward/plugins/distributions/plot_beta_distribution.xml
index 649a2dc..09c4204 100644
--- a/rkward/plugins/distributions/plot_beta_distribution.xml
+++ b/rkward/plugins/distributions/plot_beta_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" initial="100" min="1" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="0.00" min="0" max="1" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="1.00" min="0" max="1" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_cauchy_distribution.xml b/rkward/plugins/distributions/plot_cauchy_distribution.xml
index bd54480..db7debe 100644
--- a/rkward/plugins/distributions/plot_cauchy_distribution.xml
+++ b/rkward/plugins/distributions/plot_cauchy_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="-3.29" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="3.29" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_chi_squared_distribution.xml b/rkward/plugins/distributions/plot_chi_squared_distribution.xml
index d3e1c8d..2165cfe 100644
--- a/rkward/plugins/distributions/plot_chi_squared_distribution.xml
+++ b/rkward/plugins/distributions/plot_chi_squared_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" initial="100" min="1" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" min="0" initial="0.30" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" min="0" initial="24.10" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_dist_common_snippets.xml b/rkward/plugins/distributions/plot_dist_common_snippets.xml
index d43720d..ebe0764 100644
--- a/rkward/plugins/distributions/plot_dist_common_snippets.xml
+++ b/rkward/plugins/distributions/plot_dist_common_snippets.xml
@@ -57,4 +57,7 @@
 		<setting id="min">Smallest value at which the function is to be plotted.</setting>
 		<setting id="max">Largest value at which the function is to be plotted. Since this is a discrete distribution the function will be evaluated at all the integers between the lower quantile and the upper quantile (inclusive of the end points).</setting>
 	</snippet>
+	<snippet id="num_observations">
+		<spinbox type="integer" id="n" initial="100" min="1" label="Number of Observations" />
+	</snippet>
 </document>
\ No newline at end of file
diff --git a/rkward/plugins/distributions/plot_exponential_distribution.xml b/rkward/plugins/distributions/plot_exponential_distribution.xml
index 32e2dde..29fe3a3 100644
--- a/rkward/plugins/distributions/plot_exponential_distribution.xml
+++ b/rkward/plugins/distributions/plot_exponential_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="0" min="0" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="10" min="0" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_f_distribution.xml b/rkward/plugins/distributions/plot_f_distribution.xml
index fe62069..3351d46 100644
--- a/rkward/plugins/distributions/plot_f_distribution.xml
+++ b/rkward/plugins/distributions/plot_f_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" initial="100" min="1" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" min="0.001" id="min" initial="0.001" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" min="0.001" id="max" initial="25" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_gamma_distribution.xml b/rkward/plugins/distributions/plot_gamma_distribution.xml
index 9e06a5e..baff42c 100644
--- a/rkward/plugins/distributions/plot_gamma_distribution.xml
+++ b/rkward/plugins/distributions/plot_gamma_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="0.01" min="0.01" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="4.6" min="0.02" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_logistic_distribution.xml b/rkward/plugins/distributions/plot_logistic_distribution.xml
index f942cb2..e3bcb3c 100644
--- a/rkward/plugins/distributions/plot_logistic_distribution.xml
+++ b/rkward/plugins/distributions/plot_logistic_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="-3.29" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="3.29" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_lognormal_distribution.xml b/rkward/plugins/distributions/plot_lognormal_distribution.xml
index f749b81..62db829 100644
--- a/rkward/plugins/distributions/plot_lognormal_distribution.xml
+++ b/rkward/plugins/distributions/plot_lognormal_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="0.01" min="0.01" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="3.29" min="0.02" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_normal_distribution.xml b/rkward/plugins/distributions/plot_normal_distribution.xml
index b123471..a60d616 100644
--- a/rkward/plugins/distributions/plot_normal_distribution.xml
+++ b/rkward/plugins/distributions/plot_normal_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="-3.29" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="3.29" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_t_distribution.xml b/rkward/plugins/distributions/plot_t_distribution.xml
index 3bac4b1..0c5627c 100644
--- a/rkward/plugins/distributions/plot_t_distribution.xml
+++ b/rkward/plugins/distributions/plot_t_distribution.xml
@@ -6,9 +6,8 @@
 		<insert snippet="common_logic"/>
 	</logic>
 	<snippets>
-		<include file="plot_dist_common_snippets.xml"/>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" initial="100" min="1" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="-12.924" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="12.924" label="Upper quantile" />
@@ -20,6 +19,7 @@
 				<spinbox default_precision="2" type="real" id="ncp" initial="0" label="Non-centrality parameter" />
 			</frame>
 		</snippet>
+		<include file="plot_dist_common_snippets.xml"/>
 	</snippets>
 	<dialog label="Plot Student T probabilities" >
 		<insert snippet="dialog_layout"/>
diff --git a/rkward/plugins/distributions/plot_tukey_distribution.xml b/rkward/plugins/distributions/plot_tukey_distribution.xml
index cdad417..1c7fa45 100644
--- a/rkward/plugins/distributions/plot_tukey_distribution.xml
+++ b/rkward/plugins/distributions/plot_tukey_distribution.xml
@@ -10,7 +10,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="101" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="-1" min="-1" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="8" min="0" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_uniform_distribution.xml b/rkward/plugins/distributions/plot_uniform_distribution.xml
index 16dc247..67600f2 100644
--- a/rkward/plugins/distributions/plot_uniform_distribution.xml
+++ b/rkward/plugins/distributions/plot_uniform_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="-1" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="2" label="Upper quantile" />
diff --git a/rkward/plugins/distributions/plot_weibull_distribution.xml b/rkward/plugins/distributions/plot_weibull_distribution.xml
index bc313c0..cd79e8f 100644
--- a/rkward/plugins/distributions/plot_weibull_distribution.xml
+++ b/rkward/plugins/distributions/plot_weibull_distribution.xml
@@ -7,7 +7,7 @@
 	</logic>
 	<snippets>
 		<snippet id="range_options">
-			<spinbox type="integer" id="n" min="2" initial="100" label="Number of Observations" />
+			<insert snippet="num_observations"/>
 			<frame label="Range" >
 				<spinbox default_precision="2" type="real" id="min" initial="0" min="0" label="Lower quantile" />
 				<spinbox default_precision="2" type="real" id="max" initial="5" min="0" label="Upper quantile" />


------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
rkward-cvs mailing list
rkward-cvs at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rkward-cvs


More information about the rkward-tracker mailing list