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

[tfry at users.sourceforge.net]

Revision: 1909
          http://svn.sourceforge.net/rkward/?rev=1909&view=rev
Author:   tfry
Date:     2007-05-16 11:10:50 -0700 (Wed, 16 May 2007)

Log Message:
-----------
Fix for working with more than one independent var

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/analysis/crosstab.php
    trunk/rkward/rkward/plugins/analysis/crosstab.xml

Modified: trunk/rkward/rkward/plugins/analysis/crosstab.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/crosstab.php	2007-05-16 17:03:54 UTC (rev 1908)
+++ trunk/rkward/rkward/plugins/analysis/crosstab.php	2007-05-16 18:10:50 UTC (rev 1909)
@@ -7,15 +7,15 @@
 	
 function calculate () {
 	$x = getRK_val ("x") ;
-	$yvarsstring = join (", ", split ("\n", getRK_val ("y")));
+	$y = "substitute (" . str_replace ("\n", "), substitute (", trim (getRK_val ("y"))) . ")";
 ?>
 x <- <? echo ($x . "\n"); ?>
-yvars <- list (substitute (<? echo ($yvarsstring); ?>))
+yvars <- list (<? echo ($y); ?>)
 results <- list()
 descriptions <- list ()
 
 # calculate crosstabs
-for (i in length (yvars)) {
+for (i in 1:length (yvars)) {
 	yvar <- eval (yvars[[i]], envir=globalenv ())
 	results[[i]] <- table(x, yvar)
 
@@ -26,7 +26,7 @@
 
 # calculate chisquares
 chisquares <- list ()
-for (i in length (results)) {
+for (i in 1:length (results)) {
 	chisquares[[i]] <- chisq.test (results[[i]], simulate.p.value = <? getRK ("simpv");?> <?if (getRK_val ("monte") == "TRUE") { ?>,B=(<? getRK ("B"); ?>) <?}?>)
 }
 <?	}

Modified: trunk/rkward/rkward/plugins/analysis/crosstab.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/crosstab.xml	2007-05-16 17:03:54 UTC (rev 1908)
+++ trunk/rkward/rkward/plugins/analysis/crosstab.xml	2007-05-16 18:10:50 UTC (rev 1909)
@@ -20,7 +20,7 @@
 						<varslot min_vars="1" multi="true" id="y" source="vars" required="true" label="Independent"/>
 						<checkbox id="chisq" label="Chisquare" value="TRUE" value_unchecked="FALSE" checked="false" />
 						<checkbox id="barplot" label="Draw Barplot" value="TRUE" value_unchecked="FALSE" checked="false" />
-						<preview id="preview" label="Preview"/>
+						<preview id="preview" label="Preview (for barplot)"/>
 						<stretch/>
 					</column>
 				</row>


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