[rkward-cvs] SF.net SVN: rkward: [1083] trunk/rkward/rkward/plugins/uni1.2

[tfry at users.sourceforge.net]

Revision: 1083
          http://svn.sourceforge.net/rkward/?rev=1083&view=rev
Author:   tfry
Date:     2007-01-07 11:14:24 -0800 (Sun, 07 Jan 2007)

Log Message:
-----------
Cleanups and corrections

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/uni1.2/code.php
    trunk/rkward/rkward/plugins/uni1.2/description.xml

Modified: trunk/rkward/rkward/plugins/uni1.2/code.php
===================================================================
--- trunk/rkward/rkward/plugins/uni1.2/code.php	2007-01-07 18:50:15 UTC (rev 1082)
+++ trunk/rkward/rkward/plugins/uni1.2/code.php	2007-01-07 19:14:24 UTC (rev 1083)
@@ -10,7 +10,6 @@
 rk.temp.vars <- list (<? echo ($vars); ?>)
 rk.temp.results <- data.frame ('Variable Name'=rep (NA, length (rk.temp.vars)), check.names=FALSE)
 
-rk.temp.option <- NA
 rk.temp.i <- 0
 for (rk.temp.var in rk.temp.vars)  {
 	rk.temp.i <- rk.temp.i + 1
@@ -59,8 +58,8 @@
 	rk.temp.results[['Quartiles']][rk.temp.i] <- paste (names (rk.temp.temp), rk.temp.temp, sep=": ", collapse=" ")
 <?	}
 	if (($nautre = getRK_val ("autre")) != "0") { ?>
-	rk.temp.temp <- quantile (rk.temp.var, probs=seq (0, 1, lenght.out=<? echo ($nautre); ?>), <? echo ($narm); ?>)
-	rk.temp.results[['Quantiles']][rk.temp.i] <- paste (names (rk.temp.temp), rk.temp.temp, sep=": ", 
+	rk.temp.temp <- quantile (rk.temp.var, probs=seq (0, 1, length.out=<? echo ($nautre); ?>), <? echo ($narm); ?>)
+	rk.temp.results[['Quantiles']][rk.temp.i] <- paste (names (rk.temp.temp), rk.temp.temp, sep=": ", collapse=" ")
 <?	} ?>
 	
 	#robust statistics
@@ -73,10 +72,12 @@
 	if (getRK_val ("huber") == "1") { ?>
 	require ("MASS")
 	rk.temp.temp <- list (c('Location Estimate','Mad scale estimate'), c(NA,NA))
-	try(rk.temp.temp[[2]] <- hubers (rk.temp.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"));
-	if (getRK_val ("huber") == "1") echo (",initmu =".getRK_val("initmu")."(rk.temp.var)))") ?>))
+	try({
+		rk.temp.temp[[2]] <- hubers (rk.temp.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)") ?>)
+	})
 	rk.temp.results[['Huber M-Estimator']][rk.temp.i] <- paste (rk.temp.temp[[1]], rk.temp.temp[[2]], sep=": ", collapse=" ")
 <?	} ?>
 }
@@ -102,7 +103,7 @@
 	if (getRK_val("huber")=="1") { ?>
 , "Winsorized values for Huber estimator", "<? getRK ("winsor"); ?>"
 , "Tolerance in Huber estimator", "<? getRK ("tol"); ?>"
-<?		if (getRK_val ("customMU")=="1") { ?>
+<?		if (getRK_val ("customMu")=="1") { ?>
 , "Mu for Huber estimator", "<? getRK ("mu"); ?>"
 <?		}
 		if (getRK_val ("customS")=="1") { ?>

Modified: trunk/rkward/rkward/plugins/uni1.2/description.xml
===================================================================
--- trunk/rkward/rkward/plugins/uni1.2/description.xml	2007-01-07 18:50:15 UTC (rev 1082)
+++ trunk/rkward/rkward/plugins/uni1.2/description.xml	2007-01-07 19:14:24 UTC (rev 1083)
@@ -96,7 +96,7 @@
 						</row>
 						<row>
 							<column>
-								<input size="small" intial="1e-6" id="tol" label="Tolerance" />
+								<spinbox type="real" intial="1e-6" max_precision="6" min="0" max="1" id="tol" label="Tolerance" />
 							</column>
 							<column>
 								<radio id="initmu" label="Initial value" >
@@ -110,9 +110,9 @@
 			</tab>
 			<tab id="option" label="Options" >
 				<checkbox value_unchecked="0" checked="true" value="1" id="narm" label="Omit missing values" />
-				<checkbox checked="false" value="1" id="option" label="Print options in output" />
 				<checkbox checked="false" value="1" id="result" label="Get the result in the console" />
 				<input size="medium" intial="rk.univariate" id="nom" label="Name of the result" />
+				<stretch/>
 			</tab>
 		</tabbook>
 	</dialog>


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