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

[tfry at users.sourceforge.net]

Revision: 1342
          http://svn.sourceforge.net/rkward/?rev=1342&view=rev
Author:   tfry
Date:     2007-02-06 04:16:47 -0800 (Tue, 06 Feb 2007)

Log Message:
-----------
Minor corrections

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/analysis/corr_matrix.php
    trunk/rkward/rkward/plugins/plots/plot_options.rkh

Modified: trunk/rkward/rkward/plugins/analysis/corr_matrix.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/corr_matrix.php	2007-02-06 01:26:06 UTC (rev 1341)
+++ trunk/rkward/rkward/plugins/analysis/corr_matrix.php	2007-02-06 12:16:47 UTC (rev 1342)
@@ -4,7 +4,6 @@
 	
 function calculate () {
 	global $use;
-	global $exclude_whole;
 
 	$vars = "substitute (" . str_replace ("\n", "), substitute (", trim (getRK_val ("x"))) . ")";
 	$use = getRK_val ("use");
@@ -28,11 +27,11 @@
 # calculate matrix of probabilities
 rk.temp.p <- matrix (nrow = length (rk.temp.frame), ncol = length (rk.temp.frame))
 local ({
-<?	if ($exclude_whole) { ?>
+<?		if ($exclude_whole) { ?>
 	# as we need to do pairwise comparisons for technical reasons,
 	# we need to exclude incomplete cases first to match the use="complete.obs" parameter to cor()
 	rk.temp.frame <- rk.temp.frame[complete.cases (rk.temp.frame),]
-<?	} ?>
+<?		} ?>
 	for (i in 1:length (rk.temp.frame)) {
 		for (j in i:length (rk.temp.frame)) {
 			if (i != j) {
@@ -47,8 +46,9 @@
 }
 
 function printout () {
+	global $use;
 ?>
-rk.header ("Correlation Matrix", parameters=list ("Method", "<? getRK ("method"); ?>", "Exclusion", "<? getRK ("use"); ?>"))
+rk.header ("Correlation Matrix", parameters=list ("Method", "<? getRK ("method"); ?>", "Exclusion", <? echo ($use); ?>))
 
 rk.temp <- data.frame (I (sapply (rk.temp.objects, FUN=function (x) rk.get.description (x, is.substitute=TRUE))), as.data.frame (rk.temp))
 rk.results (rk.temp, titles=c ('Coefficient', sapply (rk.temp.objects, rk.get.short.name)))

Modified: trunk/rkward/rkward/plugins/plots/plot_options.rkh
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot_options.rkh	2007-02-06 01:26:06 UTC (rev 1341)
+++ trunk/rkward/rkward/plugins/plots/plot_options.rkh	2007-02-06 12:16:47 UTC (rev 1342)
@@ -28,7 +28,7 @@
 		<setting id="pointtype">Choose one of the listed point/line types for the plot. To let the calling function use its default plotting type, choose the 'default' option. This is the <i>type</i> argument to <b>plot.default</b>.</setting>
 
 		<caption id="pointcolorpage"/>
-		<setting id="pointcolor">Choose one of the listed point/line colors for the plot. To let the calling function use its default plotting color, choose the 'default' option. This is the <i>color</i> argument to <b>plot.default</b>.</setting>
+		<setting id="pointcolor">Choose one of the listed point/line colors for the plot. To let the calling function use its default plotting color, choose the 'default' option. This is the <i>col</i> argument to <b>plot.default</b>.</setting>
 
 		<caption id="aspectratio"/>
 		<setting id="asp">This is the <i>asp</i> argument to <b>plot.default</b>.</setting>


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