[rkward-cvs] SF.net SVN: rkward: [1741] trunk/rkward/rkward/plugins/analysis/outliers

tfry at users.sourceforge.net tfry at users.sourceforge.net
Tue Mar 27 11:43:40 UTC 2007


Revision: 1741
          http://svn.sourceforge.net/rkward/?rev=1741&view=rev
Author:   tfry
Date:     2007-03-27 04:43:40 -0700 (Tue, 27 Mar 2007)

Log Message:
-----------
Make printing of descriptives a single option in outlier tests.
Adjust links in help files

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.php
    trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.rkh
    trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.xml
    trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.php
    trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.rkh
    trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.xml
    trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.php
    trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.rkh
    trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.xml
    trunk/rkward/rkward/plugins/analysis/outliers/outlier.php
    trunk/rkward/rkward/plugins/analysis/outliers/outlier.rkh
    trunk/rkward/rkward/plugins/analysis/outliers/outlier.xml

Modified: trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.php	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.php	2007-03-27 11:43:40 UTC (rev 1741)
@@ -30,19 +30,11 @@
 		results[i, 'p-value'] <- t$p.value
 		results[i, 'Alternative Hypothesis']<- rk.describe.alternative (t)
 		results[i, 'Variance'] <- var (var)
-<?	if (getRK_val ("mean")) { ?>
+<?	if (getRK_val ("descriptives")) { ?>
 		results[i, 'Mean'] <- mean (var)
-<?	}
-	if (getRK_val ("sd")) { ?>
-		results[i, 'Standard Deviation'] <-  sd (var)
-<?	}
-	if (getRK_val ("median")) { ?>
+		results[i, 'Standard Deviation'] <- sd (var)
 		results[i, 'Median'] <- median (var)
-<?	}
-	if (getRK_val ("min")) { ?>
 		results[i, 'Minimum'] <- min (var)
-<?	}
-	if (getRK_val ("max")) { ?>
 		results[i, 'Maximum'] <- max (var)
 <?	} ?>
 		NA				# no error

Modified: trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.rkh
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.rkh	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.rkh	2007-03-27 11:43:40 UTC (rev 1741)
@@ -13,17 +13,14 @@
 		<setting id="x">Select the data to be computed. The vectors need to be numeric, and can be of different length. For the calculation missing values are removed from the data.</setting>
 		<caption id="tab_options"/>
 		<setting id="opposite">Check if you want not the value with largest difference from the mean, but opposite (lowest, if most suspicious is highest etc.).</setting>
-		<setting id="mean">If checked this will calculate you the arithmetic mean is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="sd">If checked this will calculate you the standard deviation (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="median">If checked this will calculate you the median (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="min">If checked this will calculate you the minimum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="max">If checked this will calculate you the maximum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
+		<setting id="descriptives">Print additional descriptive statistics (mean, sd, median, min, max) to help with interpretation of the test result (purely informational, does not affect the test). Missing values will be ignored.</setting>
 		<setting id="length">Show the total length of the data, and the number of missing values (purely informational, does not affect the test)?</setting>
 	</settings>
 	<related>
 		<ul>
-			<li><link href="rkward://rhelp/dixon.test"/></li>
-			<li><link href="rkward://rhelp/grubbs.test"/></li>
+			<li><link href="rkward://rhelp/chisq.out.test"/></li>
+			<li><link href="rkward://component/dixon_test"/></li>
+			<li><link href="rkward://component/grubbs_test"/></li>
 		</ul>
 
 	</related>

Modified: trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.xml	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/chisq_out_test.xml	2007-03-27 11:43:40 UTC (rev 1741)
@@ -20,20 +20,10 @@
 					<checkbox id="opposite" label="Opposite" value_unchecked="FALSE" value="TRUE" checked="false" />
 				</frame>
 				<frame label="additional settings">
-					<row>
-						<column>
-							<checkbox id="mean" label="Show mean" value_unchecked="0" value="1" checked="false" />
-							<checkbox id="sd" label="Show standard deviation" value_unchecked="0" value="1" checked="false" />
-							<checkbox id="median" label="Show median" value_unchecked="0" value="1" checked="false" />
-						</column>
-						<column>
-							<checkbox id="min" label="Show Minimum" value_unchecked="0" value="1" checked="false" />
-							<checkbox id="max" label="Show Maximum" value_unchecked="0" value="1" checked="false" />
-							<checkbox id="length" label="Show Length and NAs" value_unchecked="0" value="1" checked="true" />
-						</column>
-						<stretch/>
-					</row>
+					<checkbox id="descriptives" label="Show additional descriptives" value_unchecked="0" value="1" checked="false" />
+					<checkbox id="length" label="Show Length and NAs" value_unchecked="0" value="1" checked="true" />
 				</frame>
+				<stretch/>
 			</tab>
 		</tabbook>
 	</dialog>

Modified: trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.php	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.php	2007-03-27 11:43:40 UTC (rev 1741)
@@ -29,19 +29,11 @@
 		results[i, 'Dixon Q-statistic'] <- t$statistic["Q"]
 		results[i, 'p-value'] <- t$p.value
 		results[i, 'Alternative Hypothesis']<- rk.describe.alternative (t)
-<?	if (getRK_val ("mean")) { ?>
+<?	if (getRK_val ("descriptives")) { ?>
 		results[i, 'Mean'] <- mean (var)
-<?	}
-	if (getRK_val ("sd")) { ?>
 		results[i, 'Standard Deviation'] <-  sd (var)
-<?	}
-	if (getRK_val ("median")) { ?>
 		results[i, 'Median'] <- median (var)
-<?	}
-	if (getRK_val ("min")) { ?>
 		results[i, 'Minimum'] <- min (var)
-<?	}
-	if (getRK_val ("max")) { ?>
 		results[i, 'Maximum'] <- max (var)
 <?	} ?>
 		NA				# no error

Modified: trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.rkh
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.rkh	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.rkh	2007-03-27 11:43:40 UTC (rev 1741)
@@ -15,18 +15,14 @@
 		<setting id="type">This is specyfying the variant of test to be performed.</setting>
 		<setting id="two_sided">Here you can specify the alternative hypothesis. It must be one of "two-sided" or "not two-sided".</setting>
 		<setting id="opposite">Here you can define if you want to check not the value with largest difference from the mean, but opposite.</setting>
-		<setting id="mean">If checked this will calculate you the arithmetic mean is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="sd">If checked this will calculate you the standard deviation (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="median">If checked this will calculate you the median (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="min">If checked this will calculate you the minimum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="max">If checked this will calculate you the maximum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="length"Show the total length of the data, and the number of missing values (purely informational, does not affect the test)?</setting>
+		<setting id="descriptives">Print additional descriptive statistics (mean, sd, median, min, max) to help with interpretation of the test result (purely informational, does not affect the test). Missing values will be ignored.</setting>
+		<setting id="length">Show the total length of the data, and the number of missing values (purely informational, does not affect the test)?</setting>
 	</settings>
 	<related>
 		<ul>
-			<li><link href="rkward://rhelp/chisq.out.test"/></li>
-			<li><link href="rkward://rhelp/grubbs.test"/></li>
+			<li><link href="rkward://rhelp/dixon.test"/></li>
+			<li><link href="rkward://component/chisq_out_test"/></li>
+			<li><link href="rkward://component/grubbs_test"/></li>
 		</ul>
-
 	</related>
 </document>

Modified: trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.xml	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/dixon_test.xml	2007-03-27 11:43:40 UTC (rev 1741)
@@ -31,20 +31,10 @@
 						<checkbox id="two_sided" label="two-sided (default)" value_unchecked="FALSE" value="TRUE" checked="true" />
 					</frame>
 					<frame label="additional settings">
-						<row>
-							<column>
-								<checkbox id="mean" label="Show mean" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="sd" label="Show standard deviation" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="median" label="Show median" value_unchecked="0" value="1" checked="false" />
-							</column>
-							<column>
-								<checkbox id="min" label="Show Minimum" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="max" label="Show Maximum" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="length" label="Show Length and NAs" value_unchecked="0" value="1" checked="true" />
-							</column>
-							<stretch/>
-						</row>
+						<checkbox id="descriptives" label="Show additional descriptives" value_unchecked="0" value="1" checked="false" />
+						<checkbox id="length" label="Show Length and NAs" value_unchecked="0" value="1" checked="true" />
 					</frame>
+					<stretch/>
 				</column>
 				<stretch/>
 			</tab>

Modified: trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.php	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.php	2007-03-27 11:43:40 UTC (rev 1741)
@@ -30,19 +30,11 @@
 		results[i, 'U'] <- t$statistic["U"]
 		results[i, 'p-value'] <- t$p.value
 		results[i, 'Alternative Hypothesis']<- rk.describe.alternative (t)
-<?	if (getRK_val ("mean")) { ?>
+<?	if (getRK_val ("descriptives")) { ?>
 		results[i, 'Mean'] <- mean (var)
-<?	}
-	if (getRK_val ("sd")) { ?>
-		results[i, 'Standard Deviation'] <-  sd (var)
-<?	}
-	if (getRK_val ("median")) { ?>
+		results[i, 'Standard Deviation'] <- sd (var)
 		results[i, 'Median'] <- median (var)
-<?	}
-	if (getRK_val ("min")) { ?>
 		results[i, 'Minimum'] <- min (var)
-<?	}
-	if (getRK_val ("max")) { ?>
 		results[i, 'Maximum'] <- max (var)
 <?	} ?>
 		NA				# no error

Modified: trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.rkh
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.rkh	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.rkh	2007-03-27 11:43:40 UTC (rev 1741)
@@ -15,18 +15,14 @@
 		<setting id="type">This is specyfying the variant of test to be performed. Please refere to the R-help here.</setting>
 		<setting id="two_sided">Here you can specify the alternative hypothesis. It must be one of "two-sided" or "not two-sided"</setting>
 		<setting id="opposite">Here you can define if you want to check not the value with largest difference from the mean, but opposite.</setting>
-		<setting id="mean">If checked this will calculate you the arithmetic mean is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="sd">If checked this will calculate you the standard deviation (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="median">If checked this will calculate you the median (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="min">If checked this will calculate you the minimum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="max">If checked this will calculate you the maximum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
+		<setting id="descriptives">Print additional descriptive statistics (mean, sd, median, min, max) to help with interpretation of the test result (purely informational, does not affect the test). Missing values will be ignored.</setting>
 		<setting id="length">Show the total length of the data, and the number of missing values (purely informational, does not affect the test)?</setting>
 	</settings>
 	<related>
 		<ul>
-			<li><link href="rkward://rhelp/chisq.out.test"/></li>
-			<li><link href="rkward://rhelp/dixon.test"/></li>
+			<li><link href="rkward://rhelp/grubbs.test"/></li>
+			<li><link href="rkward://component/chisq_out_test"/></li>
+			<li><link href="rkward://component/dixon_test"/></li>
 		</ul>
-
 	</related>
 </document>

Modified: trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.xml	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/grubbs_test.xml	2007-03-27 11:43:40 UTC (rev 1741)
@@ -27,20 +27,10 @@
 						<checkbox id="two_sided" label="two-sided (default)" value_unchecked="FALSE" value="TRUE" checked="true" />
 					</frame>
 					<frame label="additional settings">
-						<row>
-							<column>
-								<checkbox id="mean" label="Show mean" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="sd" label="Show standard deviation" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="median" label="Show median" value_unchecked="0" value="1" checked="false" />
-							</column>
-							<column>
-								<checkbox id="min" label="Show Minimum" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="max" label="Show Maximum" value_unchecked="0" value="1" checked="false" />
-								<checkbox id="length" label="Show Length and NAs" value_unchecked="0" value="1" checked="true" />
-							</column>
-							<stretch/>
-						</row>
+						<checkbox id="descriptives" label="Show additional descriptives" value_unchecked="0" value="1" checked="false" />
+						<checkbox id="length" label="Show Length and NAs" value_unchecked="0" value="1" checked="true" />
 					</frame>
+					<stretch/>
 				</column>
 				<stretch/>
 			</tab>

Modified: trunk/rkward/rkward/plugins/analysis/outliers/outlier.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/outlier.php	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/outlier.php	2007-03-27 11:43:40 UTC (rev 1741)
@@ -27,19 +27,11 @@
 		# This is the core of the calculation
 		t <- outlier (var, opposite = <? getRK ("opposite"); ?>)
 		results[i, 'Outlier'] <- t
-<?	if (getRK_val ("mean")) { ?>
+<?	if (getRK_val ("descriptives")) { ?>
 		results[i, 'Mean'] <- mean (var)
-<?	}
-	if (getRK_val ("sd")) { ?>
-		results[i, 'Standard Deviation'] <-  sd (var)
-<?	}
-	if (getRK_val ("median")) { ?>
+		results[i, 'Standard Deviation'] <- sd (var)
 		results[i, 'Median'] <- median (var)
-<?	}
-	if (getRK_val ("min")) { ?>
 		results[i, 'Minimum'] <- min (var)
-<?	}
-	if (getRK_val ("max")) { ?>
 		results[i, 'Maximum'] <- max (var)
 <?	} ?>
 		NA				# no error

Modified: trunk/rkward/rkward/plugins/analysis/outliers/outlier.rkh
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/outlier.rkh	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/outlier.rkh	2007-03-27 11:43:40 UTC (rev 1741)
@@ -13,17 +13,15 @@
 		<setting id="x">Select the data to be computed. The vectors need to be numeric and can have missing values included. For the calculation missing values are removed from the data.</setting>
 		<caption id="tab_options"/>
 		<setting id="opposite">Set to give the opposite value. If the largest value has maximum difference from the mean, it gives smallest and vice versa.</setting>
-		<setting id="mean">If checked this will calculate you the arithmetic mean is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="sd">If checked this will calculate you the standard deviation (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="median">If checked this will calculate you the median (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="min">If checked this will calculate you the minimum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
-		<setting id="max">If checked this will calculate you the maximum (regardless of missing values) is an additional out put. However, this will not effect your results but is just an optional information.</setting>
+		<setting id="descriptives">Print additional descriptive statistics (mean, sd, median, min, max) to help with interpretation of the test result (purely informational, does not affect the test). Missing values will be ignored.</setting>
 		<setting id="length">Show the total length of the data, and the number of missing values (purely informational, does not affect the test)?</setting>
 	</settings>
 	<related>
 		<ul>
-			<li><link href="rkward://rhelp/rm.outlier"/></li>
+			<li><link href="rkward://rhelp/outlier"/></li>
+			<li><link href="rkward://component/chisq_out_test"/></li>
+			<li><link href="rkward://component/dixon_test"/></li>
+			<li><link href="rkward://component/grubbs_test"/></li>
 		</ul>
-
 	</related>
 </document>

Modified: trunk/rkward/rkward/plugins/analysis/outliers/outlier.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/outliers/outlier.xml	2007-03-27 11:17:56 UTC (rev 1740)
+++ trunk/rkward/rkward/plugins/analysis/outliers/outlier.xml	2007-03-27 11:43:40 UTC (rev 1741)
@@ -20,20 +20,10 @@
 					<checkbox id="opposite" label="Opposite" value_unchecked="FALSE" value="TRUE" checked="false" />
 				</frame>
 				<frame label="additional settings">
-					<row>
-						<column>
-							<checkbox id="mean" label="Show mean" value_unchecked="0" value="1" checked="true" />
-							<checkbox id="sd" label="Show standard deviation" value_unchecked="0" value="1" checked="true" />
-							<checkbox id="median" label="Show median" value_unchecked="0" value="1" checked="false" />
-						</column>
-						<column>
-							<checkbox id="min" label="Show Minimum" value_unchecked="0" value="1" checked="false" />
-							<checkbox id="max" label="Show Maximum" value_unchecked="0" value="1" checked="false" />
-							<checkbox id="length" label="Show Length" value_unchecked="0" value="1" checked="true" />
-						</column>
-						<stretch/>
-					</row>
+					<checkbox id="descriptives" label="Show additional descriptives" value_unchecked="0" value="1" checked="false" />
+					<checkbox id="length" label="Show Length" value_unchecked="0" value="1" checked="true" />
 				</frame>
+				<stretch/>
 			</tab>
 		</tabbook>
 	</dialog>


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