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

[tfry at users.sourceforge.net]

Revision: 1712
          http://svn.sourceforge.net/rkward/?rev=1712&view=rev
Author:   tfry
Date:     2007-03-23 06:14:37 -0700 (Fri, 23 Mar 2007)

Log Message:
-----------
NA adjustment

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.php
    trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.rkh
    trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.xml

Modified: trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.php
===================================================================
--- trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.php	2007-03-23 12:15:11 UTC (rev 1711)
+++ trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.php	2007-03-23 13:14:37 UTC (rev 1712)
@@ -48,10 +48,8 @@
 		elseif ($mad_type == "high") echo (", high=TRUE"); ?>, na.rm=TRUE))
 <?	}
 	if (getRK_val ("length")) { ?>
-	results[i, 'length of sample'] <- try (length (var))
-<?	}
-	if (getRK_val ("nacount")) { ?>
-	results[i, 'number of NAs'] <- try (length (which(is.na(var))))
+	results[i, 'length of sample'] <- length (var)
+	results[i, 'number of NAs'] <- sum (is.na(var))
 <?	} ?>
 }
 <?

Modified: trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.rkh
===================================================================
--- trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.rkh	2007-03-23 12:15:11 UTC (rev 1711)
+++ trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.rkh	2007-03-23 13:14:37 UTC (rev 1712)
@@ -20,15 +20,14 @@
 		<setting id="sd">Compute the standard deviation?</setting>
 		<caption id="tab_median_mad"/>
 		<setting id="median">Should the median value be computed?</setting>
-		<setting id="mad">Compute the median absolute deviation, i.e., the (lo-/hi-) median of the absolute deviations from the median, and (by default) adjust by a factor for asymptotically normal consistency (see <link href="rhelp://mad"/>).</setting>
+		<setting id="mad">Compute the median absolute deviation, i.e., the (lo-/hi-) median of the absolute deviations from the median, and (by default) adjust by a factor for asymptotically normal consistency (see <link href="rkward://rhelp/mad"/>).</setting>
 		<setting id="constMad">Scale factor to use when computing the median absolute deviation</setting>
 		<setting id="mad_type">How to treat even size samples: Average the two middle values, take the lower, or take the higher</setting>
 		<caption id="tab_range_etc"/>
 		<setting id="range">Compute the range, i.e. lowest and highest value</setting>
 		<setting id="sum">Compute the sum of all values</setting>
 		<setting id="prod">Compute the product of all values</setting>
-		<setting id="length">Count the number of total values (including NAs)</setting>
-		<setting id="nacount">Count the number of NA values</setting>
+		<setting id="length">Count the total length of values, and the number of missing values (NAs)</setting>
 	</settings>
 	<related>
 		<ul>

Modified: trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.xml
===================================================================
--- trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.xml	2007-03-23 12:15:11 UTC (rev 1711)
+++ trunk/rkward/rkward/plugins/descriptive/descriptive_statistics.xml	2007-03-23 13:14:37 UTC (rev 1712)
@@ -50,8 +50,7 @@
 							<checkbox value_unchecked="0" checked="true" value="1" id="range" label="range" />
 							<checkbox value_unchecked="0" value="1" id="sum" label="sum" />
 							<checkbox value_unchecked="0" value="1" id="prod" label="prod" />
-							<checkbox value_unchecked="0" value="1" id="length" label="length" />
-							<checkbox value_unchecked="0" value="1" id="nacount" label="Na count" />
+							<checkbox value_unchecked="0" value="1" id="length" label="Length and NAs" checked="true" />
 						</frame>
 						<stretch/>
 					</column>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.