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

[tfry at users.sourceforge.net]

Revision: 3754
          http://rkward.svn.sourceforge.net/rkward/?rev=3754&view=rev
Author:   tfry
Date:     2011-09-12 08:35:05 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Adjust correlation matrix plugin to changed rk.results() rowname handling.

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/analysis/corr_matrix.js
    trunk/rkward/tests/analysis_plugins/correlation_matrix.rkcommands.R

Modified: trunk/rkward/rkward/plugins/analysis/corr_matrix.js
===================================================================
--- trunk/rkward/rkward/plugins/analysis/corr_matrix.js	2011-09-12 08:22:15 UTC (rev 3753)
+++ trunk/rkward/rkward/plugins/analysis/corr_matrix.js	2011-09-12 08:35:05 UTC (rev 3754)
@@ -47,9 +47,9 @@
 function printout () {
 	echo ('rk.header ("Correlation Matrix", parameters=list ("Method", ' + method + ', "Exclusion", ' + use + '))\n');
 	echo ('\n');
-	echo ('rk.results (data.frame ("Coefficient"=I(names (data)), result, check.names=FALSE))\n');
+	echo ('rk.results (data.frame (result, check.names=FALSE), titles=c ("Coefficient", names (data)))\n');
 	if (do_p) {
-		echo ('rk.results (data.frame ("n \\\\ p"=I(names (data)), result.p, check.names=FALSE))\n');
+		echo ('rk.results (data.frame (result.p, check.names=FALSE), titles=c ("n \\\\ p", names (data)))\n');
 	}
 }
 

Modified: trunk/rkward/tests/analysis_plugins/correlation_matrix.rkcommands.R
===================================================================
--- trunk/rkward/tests/analysis_plugins/correlation_matrix.rkcommands.R	2011-09-12 08:22:15 UTC (rev 3753)
+++ trunk/rkward/tests/analysis_plugins/correlation_matrix.rkcommands.R	2011-09-12 08:35:05 UTC (rev 3754)
@@ -21,8 +21,8 @@
 ## Print result
 rk.header ("Correlation Matrix", parameters=list ("Method", "pearson", "Exclusion", "pairwise.complete.obs"))
 
-rk.results (data.frame ("Coefficient"=I(names (data)), result, check.names=FALSE))
-rk.results (data.frame ("n \\ p"=I(names (data)), result.p, check.names=FALSE))
+rk.results (data.frame (result, check.names=FALSE), titles=c ("Coefficient", names (data)))
+rk.results (data.frame (result.p, check.names=FALSE), titles=c ("n \\ p", names (data)))
 })
 local({
 ## Prepare
@@ -36,5 +36,5 @@
 ## Print result
 rk.header ("Correlation Matrix", parameters=list ("Method", "pearson", "Exclusion", "pairwise.complete.obs"))
 
-rk.results (data.frame ("Coefficient"=I(names (data)), result, check.names=FALSE))
+rk.results (data.frame (result, check.names=FALSE), titles=c ("Coefficient", names (data)))
 })

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