[rkward-cvs] SF.net SVN: rkward-code:[4888] branches/external_plugins/rk.power/inst/ rkward

[m-eik at users.sf.net]

Revision: 4888
          http://sourceforge.net/p/rkward/code/4888
Author:   m-eik
Date:     2014-10-08 15:21:13 +0000 (Wed, 08 Oct 2014)
Log Message:
-----------
rk.power: hint to df numerator/denominator

Modified Paths:
--------------
    branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.rkh
    branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.xml
    branches/external_plugins/rk.power/inst/rkward/rkwarddev_power_plugin_script.R

Modified: branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.rkh
===================================================================
--- branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.rkh	2014-10-08 13:17:36 UTC (rev 4887)
+++ branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.rkh	2014-10-08 15:21:13 UTC (rev 4888)
@@ -41,7 +41,7 @@
 		<caption id="frm_Knwnmsrs" />
 		<caption id="frm_spnbPP0801" />
 		<setting id="spn_Power" />
-		<caption id="frm_sD301D301D" />
+		<caption id="frm_sD301D3011" />
 		<setting id="pwr_spin_df" />
 		<setting id="pwr_spin_dfu" />
 		<setting id="pwr_spin_dfv" />

Modified: branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.xml
===================================================================
--- branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.xml	2014-10-08 13:17:36 UTC (rev 4887)
+++ branches/external_plugins/rk.power/inst/rkward/plugins/Poweranalysis.xml	2014-10-08 15:21:13 UTC (rev 4888)
@@ -37,7 +37,7 @@
 		<connect governor="pwr_lgc_proptest" client="drp_pwr_proptype.enabled" />
 		<connect governor="pwr_lgc_f2test.not" client="frm_sS0301F130.visible" />
 		<convert id="pwr_lgc_show_df" sources="pwr_lgc_f2test;pwr_lgc_chisq" mode="or" />
-		<connect governor="pwr_lgc_show_df" client="frm_sD301D301D.visible" />
+		<connect governor="pwr_lgc_show_df" client="frm_sD301D3011.visible" />
 		<connect governor="pwr_lgc_chisq" client="pwr_spin_df.visible" />
 		<connect governor="pwr_lgc_f2test" client="pwr_spin_dfu.visible" />
 		<connect governor="pwr_lgc_f2test" client="pwr_spin_dfv.visible" />
@@ -84,6 +84,8 @@
 		<connect governor="pwr_lgc_smpl_show_n2" client="pwr_spin_sample2.enabled" />
 		<connect governor="pwr_lgc_df_show_u" client="pwr_spin_dfu.enabled" />
 		<connect governor="pwr_lgc_df_show_v" client="pwr_spin_dfv.enabled" />
+		<connect governor="pwr_lgc_df_show_u" client="pwr_txt_dfu.enabled" />
+		<connect governor="pwr_lgc_df_show_v" client="pwr_txt_dfv.enabled" />
 		<convert id="pwr_lgc_noalternative" sources="pwr_lgc_anova.not;pwr_lgc_f2test.not;pwr_lgc_chisq.not" mode="and" />
 		<connect governor="pwr_lgc_noalternative" client="drp_pwr_hypothesis.enabled" />
 		<convert id="pwr_lgc_alt_less" sources="drp_pwr_hypothesis.string" mode="equals" standard="less" />
@@ -162,10 +164,22 @@
 					<frame id="frm_spnbPP0801">
 						<spinbox label="Power" id="spn_Power" initial="0.8" min="0" max="1" />
 					</frame>
-					<frame id="frm_sD301D301D">
+					<frame id="frm_sD301D3011">
 						<spinbox label="Degrees of freedom" id="pwr_spin_df" initial="30" min="1" type="integer" />
 						<spinbox label="Degrees of freedom for numerator" id="pwr_spin_dfu" initial="30" min="1" type="integer" />
+						<text id="pwr_txt_dfu">
+							df 							<sub>
+								num
+							</sub>
+							: k − 1
+						</text>
 						<spinbox label="Degrees of freedom for denominator" id="pwr_spin_dfv" initial="30" min="1" type="integer" />
+						<text id="pwr_txt_dfv">
+							df 							<sub>
+								den
+							</sub>
+							: k × (n − 1)
+						</text>
 					</frame>
 					<frame id="frm_sS0301F130">
 						<spinbox label="Sample size" id="pwr_spin_sample0" initial="30" min="1" type="integer" />

Modified: branches/external_plugins/rk.power/inst/rkward/rkwarddev_power_plugin_script.R
===================================================================
--- branches/external_plugins/rk.power/inst/rkward/rkwarddev_power_plugin_script.R	2014-10-08 13:17:36 UTC (rev 4887)
+++ branches/external_plugins/rk.power/inst/rkward/rkwarddev_power_plugin_script.R	2014-10-08 15:21:13 UTC (rev 4888)
@@ -94,6 +94,8 @@
 pwr.input.df <- rk.XML.spinbox(label="Degrees of freedom", id.name="pwr_spin_df", min=1, real=FALSE, initial=30)
 pwr.input.dfu <- rk.XML.spinbox(label="Degrees of freedom for numerator", id.name="pwr_spin_dfu", min=1, real=FALSE, initial=30)
 pwr.input.dfv <- rk.XML.spinbox(label="Degrees of freedom for denominator", id.name="pwr_spin_dfv", min=1, real=FALSE, initial=30)
+pwr.txt.dfu <- rk.XML.text("df<sub>num</sub>: k − 1", id.name="pwr_txt_dfu")
+pwr.txt.dfv <- rk.XML.text("df<sub>den</sub>: k × (n − 1)", id.name="pwr_txt_dfv")
 
 pwr.input.sample <- rk.XML.spinbox(label="Sample size", id.name="pwr_spin_sample0", min=1, real=FALSE, initial=30)
 pwr.input.sample.n1 <- rk.XML.spinbox(label="First sample size", id.name="pwr_spin_sample1", min=1, real=FALSE, initial=30)
@@ -152,7 +154,9 @@
         pwr.frame.df <- rk.XML.frame(
           pwr.input.df,
           pwr.input.dfu,
-          pwr.input.dfv
+          pwr.txt.dfu,
+          pwr.input.dfv,
+          pwr.txt.dfv
         ),
         pwr.frame.sample <- rk.XML.frame(
           pwr.input.sample,
@@ -282,6 +286,8 @@
     rk.XML.connect(governor=pwr.gov.smpl.show.n2, client=pwr.input.sample.n2, set="enabled"),
     rk.XML.connect(governor=pwr.gov.df.show.u, client=pwr.input.dfu, set="enabled"),
     rk.XML.connect(governor=pwr.gov.df.show.v, client=pwr.input.dfv, set="enabled"),
+    rk.XML.connect(governor=pwr.gov.df.show.u, client=pwr.txt.dfu, set="enabled"),
+    rk.XML.connect(governor=pwr.gov.df.show.v, client=pwr.txt.dfv, set="enabled"),
     
     # disable alterative setting
     pwr.gov.meth.noalternative <- rk.XML.convert(sources=list(not=pwr.gov.meth.anova, not=pwr.gov.meth.f2test, not=pwr.gov.meth.chisq), mode=c(and=""), id.name="pwr_lgc_noalternative"),