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

[tfry at users.sourceforge.net]

Revision: 1735
          http://svn.sourceforge.net/rkward/?rev=1735&view=rev
Author:   tfry
Date:     2007-03-26 11:18:38 -0700 (Mon, 26 Mar 2007)

Log Message:
-----------
Final(?) few local() adjustments

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/00saveload/save/save/description.xml
    trunk/rkward/rkward/plugins/00saveload/save/write/description.xml
    trunk/rkward/rkward/plugins/00saveload/save/write_table.xml
    trunk/rkward/rkward/plugins/analysis/ansari_bradley/ansari_bradley_test.php
    trunk/rkward/rkward/plugins/simple_anova/code.php
    trunk/rkward/rkward/plugins/uni1.2/code.php

Modified: trunk/rkward/rkward/plugins/00saveload/save/save/description.xml
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/save/save/description.xml	2007-03-26 17:57:02 UTC (rev 1734)
+++ trunk/rkward/rkward/plugins/00saveload/save/save/description.xml	2007-03-26 18:18:38 UTC (rev 1735)
@@ -13,7 +13,7 @@
 				</column>
 				<frame label="Options" >
 					<row>
-						<browser size="small" initial="~/rk.temp.data.RData" id="file" label="File name" />
+						<browser size="small" initial="my.RData" id="file" label="File name" />
 						<checkbox value_unchecked="FALSE" checked="false" value="TRUE" id="ascii" label="Ascii" />
 						<checkbox value_unchecked="FALSE" checked="false" value="TRUE" id="compress" label="Compress" />
 					</row>

Modified: trunk/rkward/rkward/plugins/00saveload/save/write/description.xml
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/save/write/description.xml	2007-03-26 17:57:02 UTC (rev 1734)
+++ trunk/rkward/rkward/plugins/00saveload/save/write/description.xml	2007-03-26 18:18:38 UTC (rev 1735)
@@ -8,7 +8,7 @@
 			<column>
 				<varselector id="vars" label="Select a variable" />
 				<varslot multi="false" classes="character numeric integer factor" id="data" source="vars" label="Data" required="true" />
-				<browser size="small" initial="~/rk.temp.data" id="file" label="File name" />
+				<browser size="small" initial="data" id="file" label="File name" />
 			</column>
 			<frame label="Options" >
 				<row>

Modified: trunk/rkward/rkward/plugins/00saveload/save/write_table.xml
===================================================================
--- trunk/rkward/rkward/plugins/00saveload/save/write_table.xml	2007-03-26 17:57:02 UTC (rev 1734)
+++ trunk/rkward/rkward/plugins/00saveload/save/write_table.xml	2007-03-26 18:18:38 UTC (rev 1735)
@@ -19,7 +19,7 @@
 					</text>
 					<varselector id="vars" label="Select a variable or a table" />
 					<varslot multi="false" classes="array data.frame matrix character numeric integer" source="vars" id="data" label="Data" required="true" />
-					<browser size="small" id="file" initial="~/rk.temp.data" label="Name of the file" />
+					<browser size="small" id="file" initial="data" label="Name of the file" />
 				</column>
 				<frame label="Options" >
 					<row>

Modified: trunk/rkward/rkward/plugins/analysis/ansari_bradley/ansari_bradley_test.php
===================================================================
--- trunk/rkward/rkward/plugins/analysis/ansari_bradley/ansari_bradley_test.php	2007-03-26 17:57:02 UTC (rev 1734)
+++ trunk/rkward/rkward/plugins/analysis/ansari_bradley/ansari_bradley_test.php	2007-03-26 18:18:38 UTC (rev 1735)
@@ -36,10 +36,4 @@
 	'confidence interval of difference'=result$conf.int<? } ?>))
 <?
 }
-
-function cleanup () {
 ?>
-rm (list=grep ("^rk.temp", ls (), value=TRUE))
-<?
-}
-?>

Modified: trunk/rkward/rkward/plugins/simple_anova/code.php
===================================================================
--- trunk/rkward/rkward/plugins/simple_anova/code.php	2007-03-26 17:57:02 UTC (rev 1734)
+++ trunk/rkward/rkward/plugins/simple_anova/code.php	2007-03-26 18:18:38 UTC (rev 1735)
@@ -1,25 +1,18 @@
 <?
-	function preprocess () {
-	}
-	
-	function calculate () {
-?>rk.temp.glm = glm (<? getRK ("model"); ?>, data=<? getRK ("model.table"); ?>)
-rk.temp.labels = <? getRK ("model.labels"); ?> 
-rk.temp.anova = anova (rk.temp.glm)
+function preprocess () {
+}
+
+function calculate () {
+?>model = glm (<? getRK ("model"); ?>, data=<? getRK ("model.table"); ?>)
+labels = <? getRK ("model.labels"); ?> 
+result = anova (model)
 <?
-	}
-	
-	function printout () {
+}
+
+function printout () {
 ?>
 rk.header ("Simple Anova")
-rk.print (rk.temp.anova)
+rk.print (result)
 <?
-	}
-	
-	function cleanup () {
-?>rm (rk.temp.glm)
-rm (rk.temp.labels)
-rm (rk.temp.anova)
-<?
-	}
+}
 ?>

Modified: trunk/rkward/rkward/plugins/uni1.2/code.php
===================================================================
--- trunk/rkward/rkward/plugins/uni1.2/code.php	2007-03-26 17:57:02 UTC (rev 1734)
+++ trunk/rkward/rkward/plugins/uni1.2/code.php	2007-03-26 18:18:38 UTC (rev 1735)
@@ -72,7 +72,7 @@
 		temp <- hubers (var, k = <? getRK ("winsor"); ?>,tol=<? getRK ("tol"); ?><?
 	if (getRK_val("customMu")=="1") echo (", mu=".getRK_val("mu"));
 	if (getRK_val("customS")=="1") echo (", s=".getRK_val("s"));
-	echo (",initmu =".getRK_val("initmu")."(rk.temp.var)") ?>)
+	echo (",initmu =".getRK_val("initmu")."(var)") ?>)
 	})
 	results[i, 'Huber M-Estimator'] <- paste (temp[[1]], temp[[2]], sep=": ", collapse=" ")
 <?	} ?>


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