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

tfry at users.sourceforge.net tfry at users.sourceforge.net
Mon Mar 26 17:01:54 UTC 2007


Revision: 1731
          http://svn.sourceforge.net/rkward/?rev=1731&view=rev
Author:   tfry
Date:     2007-03-26 10:01:54 -0700 (Mon, 26 Mar 2007)

Log Message:
-----------
local() adjustments, remove tabs where not needed

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/analysis/variances/F_test.php
    trunk/rkward/rkward/plugins/analysis/variances/F_test.xml
    trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.php
    trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.rkh
    trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.xml
    trunk/rkward/rkward/plugins/analysis/variances/fligner_test.php
    trunk/rkward/rkward/plugins/analysis/variances/fligner_test.rkh
    trunk/rkward/rkward/plugins/analysis/variances/fligner_test.xml

Modified: trunk/rkward/rkward/plugins/analysis/variances/F_test.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/F_test.php	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/F_test.php	2007-03-26 17:01:54 UTC (rev 1731)
@@ -5,9 +5,7 @@
 function calculate () {
 
 ?>
-rk.temp.x <- substitute (<? getRK ("x"); ?>)
-rk.temp.y <- substitute (<? getRK ("y"); ?>)
-rk.temp <- var.test (eval (rk.temp.x), eval (rk.temp.y), alternative = "<? getRK ("alternative"); ?>", ratio = <? getRK ("ratio"); ?> <?
+result <- var.test (<? getRK ("x"); ?>, <? getRK ("x"); ?>, alternative = "<? getRK ("alternative"); ?>", ratio = <? getRK ("ratio"); ?><?
 if (($conflevel = getRK_val ("conflevel")) != "0.95") echo (", conf.level=" . $conflevel); ?>)
 
 <?
@@ -15,26 +13,21 @@
 
 function printout () {
 ?>
+names <- rk.get.description (<? getRK ("x"); ?>, <? getRK ("y"); ?>)
+
 rk.header ("F test to compare two variances",
-	parameters=list ("Comparing", paste (rk.get.description (rk.temp.x, is.substitute=TRUE), "against", rk.get.description (rk.temp.y, is.substitute=TRUE)),"Confidence Level", "<? getRK ("conflevel"); ?>", "Ratio", "<? getRK ("ratio"); ?>", "Alternative Hypothesis", "<? getRK ("alternative"); ?>"))
+	parameters=list ("Comparing", paste (names[1], "against", names[2]),"Confidence Level", "<? getRK ("conflevel"); ?>", "Ratio", "<? getRK ("ratio"); ?>", "Alternative Hypothesis", "<? getRK ("alternative"); ?>"))
 
 rk.results (list (
-	'Variables'=rk.get.description (rk.temp.x, rk.temp.y, is.substitute=TRUE),
-	'F'=rk.temp$statistic["F"],
-	'Numerator DF'=rk.temp$parameter["num df"],
-	'Denominator DF'=rk.temp$parameter["denom df"],
-	'p-value'=rk.temp$p.value,
-	'Alternative Hypothesis'=rk.describe.alternative(rk.temp),
-	'Lower CI'=rk.temp$conf.int[1],
-	'Upper CI'=rk.temp$conf.int[2],
-	'ratio of variances'=rk.temp$estimate
-	))
+	'Variables'=names,
+	'F'=result$statistic["F"],
+	'Numerator DF'=result$parameter["num df"],
+	'Denominator DF'=result$parameter["denom df"],
+	'p-value'=result$p.value,
+	'Alternative Hypothesis'=rk.describe.alternative(result),
+	'Lower CI'=result$conf.int[1],
+	'Upper CI'=result$conf.int[2],
+	'ratio of variances'=result$estimate))
 <?
 }
-
-function cleanup () {
 ?>
-rm (list=grep ("^rk.temp", ls (), value=TRUE))
-<?
-}
-?>

Modified: trunk/rkward/rkward/plugins/analysis/variances/F_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/F_test.xml	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/F_test.xml	2007-03-26 17:01:54 UTC (rev 1731)
@@ -14,8 +14,8 @@
 						<varslot type="numeric" id="y" source="vars" required="true" label="against"/>
 						<radio id="alternative" label="using test hypothesis">
 							<option value="two.sided" label="Two-sided"/>
-							<option value="greater" label="First is greater"/>
-							<option value="less" label="Second is greater"/>
+							<option value="greater" label="greater"/>
+							<option value="less" label="less"/>
 						</radio>
 					</column>
 				</row>

Modified: trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.php	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.php	2007-03-26 17:01:54 UTC (rev 1731)
@@ -5,29 +5,22 @@
 function calculate () {
 
 ?>
-rk.temp.x <- substitute (<? getRK ("x"); ?>)
-rk.temp.y <- substitute (<? getRK ("y"); ?>)
-rk.temp <- bartlett.test (eval (rk.temp.x), eval (rk.temp.y))
-
+result <- bartlett.test (<? getRK ("x"); ?>, <? getRK ("y"); ?>)
 <?
 }
 
 function printout () {
 ?>
+names <- rk.get.description (<? getRK ("x"); ?>, <? getRK ("y"); ?>)
+
 rk.header ("Bartlett Test of Homogeneity of Variances",
-	parameters=list ("Sample", paste (rk.get.description (rk.temp.x, is.substitute=TRUE), "and" ,"Group", rk.get.description (rk.temp.y, is.substitute=TRUE))))
+	parameters=list ("Sample: ", paste (names[1], "grouped by:", names[2])))
 
 rk.results (list (
-	'Variables'=rk.get.description (rk.temp.x, rk.temp.y, is.substitute=TRUE),
-	'Bartlett s K-squared'=rk.temp$statistic,
-	'df'=rk.temp$parameter,
-	'p-value'=rk.temp$p.value))
+	'Variables'=names,
+	'Bartlett s K-squared'=result$statistic,
+	'df'=result$parameter,
+	'p-value'=result$p.value))
 <?
 }
-
-function cleanup () {
 ?>
-rm (list=grep ("^rk.temp", ls (), value=TRUE))
-<?
-}
-?>

Modified: trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.rkh
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.rkh	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.rkh	2007-03-26 17:01:54 UTC (rev 1731)
@@ -9,7 +9,6 @@
 	</usage>
 
 	<settings>
-		<caption id="tab_variables"/>
 		<setting id="x">Select the data to be computed. The vectors need to be numeric.</setting>
 		<setting id="y">Select the data to be computed. The vectors need to be a factor.</setting>
 	</settings>

Modified: trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.xml	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/bartlett_test.xml	2007-03-26 17:01:54 UTC (rev 1731)
@@ -5,17 +5,13 @@
 	<help file="bartlett_test.rkh"/>
 	
 	<dialog label="Bartlett Test of Homogeneity of Variances">
-		<tabbook>
-			<tab label="Basic settings" id="tab_variables">
-				<row>
-					<varselector id="vars"/>
-					<column>
-						<varslot type="numeric" id="x" source="vars" required="true" label="samples"/>
-						<varslot type="factor" id="y" source="vars" required="true" label="group"/>
-					</column>
-				</row>
-			</tab>
-		</tabbook>
+		<row>
+			<varselector id="vars"/>
+			<column>
+				<varslot type="numeric" id="x" source="vars" required="true" label="samples"/>
+				<varslot type="factor" id="y" source="vars" required="true" label="group"/>
+			</column>
+		</row>
 	</dialog>
 	
 </document>

Modified: trunk/rkward/rkward/plugins/analysis/variances/fligner_test.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/fligner_test.php	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/fligner_test.php	2007-03-26 17:01:54 UTC (rev 1731)
@@ -3,32 +3,24 @@
 }
 
 function calculate () {
-
 ?>
-rk.temp.x <- substitute (<? getRK ("x"); ?>)
-rk.temp.y <- substitute (<? getRK ("y"); ?>)
-rk.temp <- fligner.test (eval (rk.temp.x), eval (rk.temp.y))
-
+result <- fligner.test (<? getRK ("x"); ?>, <? getRK ("x"); ?>)
 <?
 }
 
 function printout () {
 ?>
+names <- rk.get.description (<? getRK ("x"); ?>, <? getRK ("y"); ?>)
+
 rk.header ("Fligner-Killeen Test of Homogeneity of Variances",
-	parameters=list ("Compare", paste (rk.get.description (rk.temp.x, is.substitute=TRUE), "and", rk.get.description (rk.temp.y, is.substitute=TRUE))))
+	parameters=list ("Sample: ", paste (names[1], "grouped by:", names[2])))
 
 rk.results (list (
-	'Variables'=rk.get.description (rk.temp.x, rk.temp.y, is.substitute=TRUE),
-	'Fligner-Killeen:med X^2 test statistic'=rk.temp$statistic,
-	'df'=rk.temp$parameter,
-	'p-value'=rk.temp$p.value
-	))
+	'Variables'=names,
+	'Fligner-Killeen:med X^2 test statistic'=result$statistic,
+	'df'=result$parameter,
+	'p-value'=result$p.value))
 <?
 }
 
-function cleanup () {
 ?>
-rm (list=grep ("^rk.temp", ls (), value=TRUE))
-<?
-}
-?>

Modified: trunk/rkward/rkward/plugins/analysis/variances/fligner_test.rkh
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/fligner_test.rkh	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/fligner_test.rkh	2007-03-26 17:01:54 UTC (rev 1731)
@@ -9,7 +9,6 @@
 	</usage>
 
 	<settings>
-		<caption id="tab_variables"/>
 		<setting id="x">Select the data to be computed. The vectors need to be numeric.</setting>
 		<setting id="y">Select the data to be computed. The vectors need to be a factor.</setting>
 	</settings>

Modified: trunk/rkward/rkward/plugins/analysis/variances/fligner_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/analysis/variances/fligner_test.xml	2007-03-26 10:10:32 UTC (rev 1730)
+++ trunk/rkward/rkward/plugins/analysis/variances/fligner_test.xml	2007-03-26 17:01:54 UTC (rev 1731)
@@ -5,17 +5,13 @@
 	<help file="fligner_test.rkh"/>
 	
 	<dialog label="Fligner-Killeen Test of Homogeneity of Variances">
-		<tabbook>
-			<tab label="Basic settings" id="tab_variables">
-				<row>
-					<varselector id="vars"/>
-					<column>
-						<varslot type="numeric" id="x" source="vars" required="true" label="samples"/>
-						<varslot type="factor" id="y" source="vars" required="true" label="group"/>
-					</column>
-				</row>
-			</tab>
-		</tabbook>
+		<row>
+			<varselector id="vars"/>
+			<column>
+				<varslot type="numeric" id="x" source="vars" required="true" label="samples"/>
+				<varslot type="factor" id="y" source="vars" required="true" label="group"/>
+			</column>
+		</row>
 	</dialog>
 	
 </document>


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