[rkward-cvs] SF.net SVN: rkward: [1248] trunk/rkward/rkward/plugins/wilcoxon
sjar at users.sourceforge.net
sjar at users.sourceforge.net
Mon Jan 29 23:22:30 UTC 2007
Revision: 1248
http://svn.sourceforge.net/rkward/?rev=1248&view=rev
Author: sjar
Date: 2007-01-29 15:22:30 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
correct, mu and exact added to "Parameter list"
alternative in table renamed to Hypothesis
some minor errors corrected
Modified Paths:
--------------
trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.php
trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.xml
trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.php
trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.xml
Modified: trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.php
===================================================================
--- trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.php 2007-01-29 23:19:57 UTC (rev 1247)
+++ trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.php 2007-01-29 23:22:30 UTC (rev 1248)
@@ -7,7 +7,7 @@
require(exactRankTests)
rk.temp.x <- substitute (<? getRK ("x"); ?>)
rk.temp.y <- substitute (<? getRK ("y"); ?>)
-rk.temp <- wilcox.exact (eval (rk.temp.x), eval (rk.temp.y), alternative = c("<? getRK ("hypothesis"); ?>"), mu = <? getRK ("mu"); ?>, paired = <? getRK ("paired"); ?>, exact = <? getRK ("exact"); ?>, correct = <? getRK ("correct"); ?>, conf.int = <? getRK ("confint"); ?> <?
+rk.temp <- wilcox.exact (eval (rk.temp.x), eval (rk.temp.y), alternative = c("<? getRK ("alternative"); ?>"), mu = <? getRK ("mu"); ?>, paired = <? getRK ("paired"); ?>, exact = <? getRK ("exact"); ?>, correct = <? getRK ("correct"); ?>, conf.int = <? getRK ("confint"); ?> <?
if (($conflevel = getRK_val ("conflevel")) != "0.95") echo (", conf.level=" . $conflevel); ?>)
rk.temp.print.conf.level <- <? if (getRK_val ("confint")) echo "TRUE"; else echo "FALSE"; ?>
@@ -23,14 +23,14 @@
else if (rk.temp$alternative == "greater")
paste (rk.get.short.name (rk.temp.x), "is greater than", rk.get.short.name (rk.temp.y))
else
- paste (rk.get.short.name (rk.temp.x), "and", rk.get.short.name (rk.temp.y), "differ")))
+ paste (rk.get.short.name (rk.temp.x), "and", rk.get.short.name (rk.temp.y), "differ"),"Confidence Interval", "<? getRK ("confint"); ?>", "Continuity correction in normal approximation for p-value", "<? getRK ("correct"); ?>","mu", "<? getRK ("mu"); ?>"))
rk.results (list (
- 'Variable Name'=rk.get.description (rk.temp.x),
+ 'Variable Name'=rk.temp$data.name,
'statistic'=rk.temp$statistic,
- 'degrees of freedom'=rk.temp$parameter,
+ 'parameter'=rk.temp$parameter,
'mu'=rk.temp$null.value,
- 'alternative'=rk.temp$alternative,
+ 'Hypothesis'=rk.temp$alternative,
p=rk.temp$p.value<?
if (getRK_val ("confint")) { ?>,
'confidence interval percent'=(100 * attr(rk.temp$conf.int, "conf.level")),
Modified: trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.xml 2007-01-29 23:19:57 UTC (rev 1247)
+++ trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_exact_test.xml 2007-01-29 23:22:30 UTC (rev 1248)
@@ -13,7 +13,7 @@
<column>
<varslot type="numeric" id="x" source="vars" required="true" label="compare"/>
<varslot type="numeric" id="y" source="vars" required="true" label="against"/>
- <radio id="hypothesis" label="using test hypothesis">
+ <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"/>
Modified: trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.php
===================================================================
--- trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.php 2007-01-29 23:19:57 UTC (rev 1247)
+++ trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.php 2007-01-29 23:22:30 UTC (rev 1248)
@@ -7,7 +7,7 @@
rk.temp.length.x <- length (<? getRK ("x"); ?>)
rk.temp.x <- substitute (<? getRK ("x"); ?>)
rk.temp.y <- substitute (<? getRK ("y"); ?>)
-rk.temp <- wilcox.test (eval (rk.temp.x), eval (rk.temp.y), alternative = c("<? getRK ("hypothesis"); ?>"), mu = <? getRK ("mu"); ?>, paired = <? getRK ("paired"); ?>, exact = <? getRK ("exact"); ?>, correct = <? getRK ("correct"); ?>, conf.int = <? getRK ("confint"); ?> <?
+rk.temp <- wilcox.test (eval (rk.temp.x), eval (rk.temp.y), alternative = c("<? getRK ("alternative"); ?>"), mu = <? getRK ("mu"); ?>, paired = <? getRK ("paired"); ?>, exact = <? getRK ("exact"); ?>, correct = <? getRK ("correct"); ?>, conf.int = <? getRK ("confint"); ?> <?
if (($conflevel = getRK_val ("conflevel")) != "0.95") echo (", conf.level=" . $conflevel); ?>)
rk.temp.print.conf.level <- <? if (getRK_val ("confint")) echo "TRUE"; else echo "FALSE"; ?>
@@ -24,14 +24,14 @@
paste (rk.get.short.name (rk.temp.x), "is greater than", rk.get.short.name (rk.temp.y))
else
paste (rk.get.short.name (rk.temp.x), "and", rk.get.short.name (rk.temp.y), "differ"),
- "Note", if (rk.temp.length.x < 50) paste ("You have less then 50 values. Consider to perform an exact test.") else paste("Length is", (rk.temp.length.x))))
+ "Note", if (rk.temp.length.x < 50) paste ("You have less then 50 values. An exact test is recommended.") else paste("Length is", (rk.temp.length.x)),"Confidence Interval", "<? getRK ("confint"); ?>", "Continuity correction in normal approximation for p-value", "<? getRK ("correct"); ?>","mu", "<? getRK ("mu"); ?>"))
rk.results (list (
- 'Variable Name'=rk.get.description (rk.temp.x),
+ 'Variable Name'=rk.temp$data.name,
'statistic'=rk.temp$statistic,
- 'degrees of freedom'=rk.temp$parameter,
+ 'parameter'=rk.temp$parameter,
'mu'=rk.temp$null.value,
- 'alternative'=rk.temp$alternative,
+ 'Hypothesis'=rk.temp$alternative,
p=rk.temp$p.value<?
if (getRK_val ("confint")) { ?>,
'confidence interval percent'=(100 * attr(rk.temp$conf.int, "conf.level")),
Modified: trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.xml
===================================================================
--- trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.xml 2007-01-29 23:19:57 UTC (rev 1247)
+++ trunk/rkward/rkward/plugins/wilcoxon/wilcoxon_test.xml 2007-01-29 23:22:30 UTC (rev 1248)
@@ -13,7 +13,7 @@
<column>
<varslot type="numeric" id="x" source="vars" required="true" label="compare"/>
<varslot type="numeric" id="y" source="vars" required="true" label="against"/>
- <radio id="hypothesis" label="using test hypothesis">
+ <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"/>
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