Menu
▾
▴
[rkward-cvs] [rkward] rkward/plugins: Fix typos
|
From: Yuri C. <yu...@uk...> - 2015-01-13 18:36:58
|
Git commit d3ba84222d0e3b68e7786404872c2fce6eb5f867 by Yuri Chornoivan. Committed on 13/01/2015 at 06:39. Pushed by yurchor into branch 'master'. Fix typos M +1 -1 rkward/plugins/analysis/power/Poweranalysis.js M +5 -5 rkward/plugins/analysis/power/Poweranalysis.rkh M +6 -6 rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R http://commits.kde.org/rkward/d3ba84222d0e3b68e7786404872c2fce6eb5f867 diff --git a/rkward/plugins/analysis/power/Poweranalysis.js b/rkward/plugins/analysis/power/Poweranalysis.js index 18aba7c..00b16c8 100644 --- a/rkward/plugins/analysis/power/Poweranalysis.js +++ b/rkward/plugins/analysis/power/Poweranalysis.js @@ -170,7 +170,7 @@ function printout(){ var drpPwrStat = getValue("drp_pwr_stat"); var radPwrParam = getValue("rad_pwr_param"); - echo("\t# Catch errors due to unsuitable data\n" + "\tif(class(pwr.result) == \"try-error\"){\n" + "\t\trk.print(\"Power anaylsis not possible with the data you provided\")\n" + "\t\treturn()\n\t}\n\n" + "\t# Prepare printout\n" + "\tnote <- pwr.result[[\"note\"]]\n" + "\tparameters <- list(\"Target measure\"=\"" + radPwrParam + "\")\n" + "\tif(!is.null(pwr.result[[\"alternative\"]])){\n\t\tparameters[[\"alternative\"]] <- pwr.result[[\"alternative\"]]\n\t}\n\n" + "\trk.header(pwr.result[[\"method\"]], parameters=parameters)\n" + "\tpwr.result[c(\"method\", \"note\", \"alternative\")] <- NULL\n" + "\tpwr.result <- as.data.frame(unlist(pwr.result))\n" + "\tcolnames(pwr.result) <- \"Parameters\"\n\n" + "\trk.results(pwr.result)\n" + "\tif(!is.null(note)){\n\t\trk.print(paste(\"<strong>Note:</strong> \", note))\n\t}\n\n"); + echo("\t# Catch errors due to unsuitable data\n" + "\tif(class(pwr.result) == \"try-error\"){\n" + "\t\trk.print(\"Power analysis not possible with the data you provided\")\n" + "\t\treturn()\n\t}\n\n" + "\t# Prepare printout\n" + "\tnote <- pwr.result[[\"note\"]]\n" + "\tparameters <- list(\"Target measure\"=\"" + radPwrParam + "\")\n" + "\tif(!is.null(pwr.result[[\"alternative\"]])){\n\t\tparameters[[\"alternative\"]] <- pwr.result[[\"alternative\"]]\n\t}\n\n" + "\trk.header(pwr.result[[\"method\"]], parameters=parameters)\n" + "\tpwr.result[c(\"method\", \"note\", \"alternative\")] <- NULL\n" + "\tpwr.result <- as.data.frame(unlist(pwr.result))\n" + "\tcolnames(pwr.result) <- \"Parameters\"\n\n" + "\trk.results(pwr.result)\n" + "\tif(!is.null(note)){\n\t\trk.print(paste(\"<strong>Note:</strong> \", note))\n\t}\n\n"); if(drpPwrStat == "pwr.t.test" | drpPwrStat == "pwr.norm.test") { echo("\trk.print(\"Interpretation of effect size <strong>d</strong> (according to Cohen):\")\n" + "\trk.results(data.frame(small=0.2, medium=0.5, large=0.8))\n"); } diff --git a/rkward/plugins/analysis/power/Poweranalysis.rkh b/rkward/plugins/analysis/power/Poweranalysis.rkh index 838ec81..fd40680 100644 --- a/rkward/plugins/analysis/power/Poweranalysis.rkh +++ b/rkward/plugins/analysis/power/Poweranalysis.rkh @@ -6,7 +6,7 @@ Power analysis </title> <summary> - Perform power anaylsis for a variety of statistcal methods. + Perform power analysis for a variety of statistical methods. </summary> <usage> Given three of the parameters 'power of test', @@ -49,15 +49,15 @@ <caption id="frm_Knwnmsrs" /> <caption id="frm_spnbPP0801" /> <setting id="spn_Power"> - Targetted power of test (1 minus Type II error probability) + Targeted power of test (1 minus Type II error probability) </setting> <caption id="frm_sD301D3011" /> <setting id="pwr_spin_df"> - Only shown for chi-square statistics: Targetted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, + Only shown for chi-square statistics: Targeted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, and (cells − 1) for a test of goodness of fit. </setting> <setting id="pwr_spin_dfu"> - Only shown for general linear model: Targetted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1. + Only shown for general linear model: Targeted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1. </setting> <setting id="pwr_spin_dfv"> Only shown for general linear model: Available denominator degrees of freedom / degrees of freedom of the error term. @@ -76,7 +76,7 @@ </setting> <caption id="frm_spnSS00501" /> <setting id="spn_Sgnfcncl"> - Targetted level of significance + Targeted level of significance </setting> </settings> <related> diff --git a/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R b/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R index f73b9fb..0c5e34f 100644 --- a/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R +++ b/rkward/plugins/rkwarddev_scripts/rkwarddev_power_plugin_script.R @@ -82,12 +82,12 @@ pwr.proptype.drop <- rk.XML.dropdown("Samples", ), help=FALSE, # In the help file, same as t.test dropdown id.name="drp_pwr_proptype") -pwr.input.power <- rk.XML.spinbox(label="Power", min=0, max=1, initial=0.8, help="Targetted power of test (1 minus Type II error probability)") +pwr.input.power <- rk.XML.spinbox(label="Power", min=0, max=1, initial=0.8, help="Targeted power of test (1 minus Type II error probability)") pwr.input.df <- rk.XML.spinbox(label="Degrees of freedom", id.name="pwr_spin_df", min=1, real=FALSE, initial=30, - help="Only shown for chi-square statistics: Targetted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, + help="Only shown for chi-square statistics: Targeted degrees of freedom. As a reminder, this is (rows − 1)×(columns − 1) for a test of independence, and (cells − 1) for a test of goodness of fit.") pwr.input.dfu <- rk.XML.spinbox(label="Degrees of freedom for numerator", id.name="pwr_spin_dfu", min=1, real=FALSE, initial=30, - help="Only shown for general linear model: Targetted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1.") + help="Only shown for general linear model: Targeted numerator degrees of freedom. As a reminder, this is the number of parameters to estimate, or number of groups/samples minus 1.") pwr.input.dfv <- rk.XML.spinbox(label="Degrees of freedom for denominator", id.name="pwr_spin_dfv", min=1, real=FALSE, initial=30, help="Only shown for general linear model: Available denominator degrees of freedom / degrees of freedom of the error term. As a reminder, this is the total number of observations minus numerator degrees of freedom minus 1, or total number of observations minus number of groups/samples.") @@ -118,7 +118,7 @@ pwr.txt.effect.e2 <- rk.XML.text("Measure for selected method is <b>Eta<sup>2</s pwr.txt.effect.f2 <- rk.XML.text("Measure for selected method is <b>Cohen's f<sup>2</sup></b>", id.name="pwr_txt_efct_f2") pwr.txt.effect.w <- rk.XML.text("Measure for selected method is <b>Cohen's w</b>", id.name="pwr_txt_efct_w") pwr.txt.effect.h <- rk.XML.text("Measure for selected method is <b>Cohen's h</b>", id.name="pwr_txt_efct_h") -pwr.input.signif <- rk.XML.spinbox(label="Significance level", min=0, max=1, initial=0.05, help="Targetted level of significance") +pwr.input.signif <- rk.XML.spinbox(label="Significance level", min=0, max=1, initial=0.05, help="Targeted level of significance") save.results.pwr <- rk.XML.saveobj("Save results to workspace", initial="pwr.result", @@ -466,7 +466,7 @@ pwr.js.print <- rk.paste.JS( echo( "\t# Catch errors due to unsuitable data\n", "\tif(class(pwr.result) == \"try-error\"){\n", - "\t\trk.print(\"Power anaylsis not possible with the data you provided\")\n", + "\t\trk.print(\"Power analysis not possible with the data you provided\")\n", "\t\treturn()\n\t}\n\n", "\t# Prepare printout\n", "\tnote <- pwr.result[[\"note\"]]\n", @@ -508,7 +508,7 @@ pwr.js.print <- rk.paste.JS( ############ ## help file -pwr.rkh.summary <- rk.rkh.summary("Perform power anaylsis for a variety of statistcal methods.") +pwr.rkh.summary <- rk.rkh.summary("Perform power analysis for a variety of statistcal methods.") pwr.rkh.usage <- rk.rkh.usage("Given three of the parameters 'power of test', 'sample size', 'effect size', and 'significance level', this plugin will |