[rkward-cvs] SF.net SVN: rkward-code:[4548] branches/external_plugins/rk.ANOVA
m-eik at users.sf.net
m-eik at users.sf.net
Thu Feb 21 11:18:52 UTC 2013
Revision: 4548
http://sourceforge.net/p/rkward/code/4548
Author: m-eik
Date: 2013-02-21 11:18:51 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
rk.ANOVA: first of the external plugins which was re-generated with the forthcoming rkwarddev release
Modified Paths:
--------------
branches/external_plugins/rk.ANOVA/ChangeLog
branches/external_plugins/rk.ANOVA/DESCRIPTION
branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R
branches/external_plugins/rk.ANOVA/inst/CITATION
branches/external_plugins/rk.ANOVA/inst/NEWS.Rd
branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap
branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R
branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd
Modified: branches/external_plugins/rk.ANOVA/ChangeLog
===================================================================
--- branches/external_plugins/rk.ANOVA/ChangeLog 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/ChangeLog 2013-02-21 11:18:51 UTC (rev 4548)
@@ -1,5 +1,9 @@
ChangeLog for package rk.ANOVA
+changes in version 0.01-15 (2013-02-21)
+changed:
+ - updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+
changes in version 0.01-14 (2012-11-09)
added:
- plugin tests
Modified: branches/external_plugins/rk.ANOVA/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.ANOVA/DESCRIPTION 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/DESCRIPTION 2013-02-21 11:18:51 UTC (rev 4548)
@@ -1,18 +1,23 @@
Package: rk.ANOVA
Type: Package
-Title: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot
- interactions.
-Version: 0.01-14
-Date: 2012-11-09
+Title: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests
+ and plot interactions.
+Version: 0.01-15
+Date: 2013-02-21
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
-Depends: rkward (>= 0.5.6)
-Suggests: ez, sciplot
+Depends:
+ rkward (>= 0.5.6)
+Suggests:
+ ez,
+ sciplot
Enhances: rkward
-Description: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and
- plot interactions.
+Description: RKWard GUI to conduct ANOVAs (using the ez package), pairwise
+ t-Tests and plot interactions.
License: GPL (>= 3)
LazyLoad: yes
URL: http://rkward.sf.net
-Authors at R: person(given="Meik", family="Michalke", email="meik.michalke at hhu.de",
- role=c("aut", "cre"))
+Authors at R: person(given="Meik", family="Michalke",
+ email="meik.michalke at hhu.de", role=c("aut", "cre"))
+Collate:
+ 'rk.ANOVA-package.R'
Modified: branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R
===================================================================
--- branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R 2013-02-21 11:18:51 UTC (rev 4548)
@@ -3,9 +3,9 @@
#' \tabular{ll}{
#' Package: \tab rk.ANOVA\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.01-13\cr
-#' Date: \tab 2012-09-29\cr
-#' Depends: \tab rkward (>= 0.5.6)\cr
+#' Version: \tab 0.01-15\cr
+#' Date: \tab 2013-02-21\cr
+#' Depends: \tab rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' License: \tab GPL (>= 3)\cr
#' LazyLoad: \tab yes\cr
@@ -17,7 +17,7 @@
#' @aliases rk.ANOVA-package rk.ANOVA
#' @name rk.ANOVA-package
#' @docType package
-#' @title RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions..
+#' @title The rk.ANOVA Package
#' @author Meik Michalke \email{meik.michalke@@hhu.de}
#' @keywords package
NULL
Modified: branches/external_plugins/rk.ANOVA/inst/CITATION
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/CITATION 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/inst/CITATION 2013-02-21 11:18:51 UTC (rev 4548)
@@ -1,13 +1,13 @@
bibentry("Manual",
title="rk.ANOVA: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions.",
author="Meik Michalke",
- year="2012",
- note="(Version 0.01-13)",
+ year="2013",
+ note="(Version 0.01-15)",
url="http://rkward.sf.net",
textVersion =
- paste("Michalke, M. (2012). ",
- "rk.ANOVA: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions. (Version 0.01-13). ",
+ paste("Michalke, M. (2013). ",
+ "rk.ANOVA: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions. (Version 0.01-15). ",
"Available from http://rkward.sf.net",
sep=""),
Modified: branches/external_plugins/rk.ANOVA/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/NEWS.Rd 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/inst/NEWS.Rd 2013-02-21 11:18:51 UTC (rev 4548)
@@ -1,5 +1,24 @@
\name{NEWS}
\title{News for Package 'rk.ANOVA'}
+\section{Changes in rk.ANOVA version 0.01-15 (2013-02-21)}{
+ \subsection{changed}{
+ \itemize{
+ \item updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+ }
+ }
+}
+\section{Changes in rk.ANOVA version 0.01-14 (2012-11-09)}{
+ \subsection{added}{
+ \itemize{
+ \item plugin tests
+ }
+ }
+ \subsection{changed}{
+ \itemize{
+ \item preparing/reshaping data now shows a summary of the result
+ }
+ }
+}
\section{Changes in rk.ANOVA version 0.01-13 (2012-09-29)}{
\subsection{fixed}{
\itemize{
Modified: branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap 2013-02-21 11:18:51 UTC (rev 4548)
@@ -1,18 +1,23 @@
<!DOCTYPE rkpluginmap >
<document
- namespace="rkward"
+ namespace="ANOVA"
id="ANOVA_rkward"
+ priority="medium"
>
<!--
this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead!
-->
+ <dependencies rkward_min_version="0.5.6">
+ <package name="ez" />
+ <package name="sciplot" />
+ </dependencies>
<about
name="rk.ANOVA"
shortinfo="RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions."
longinfo="RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions."
- version="0.01-14"
- releasedate="2012-11-09"
+ version="0.01-15"
+ releasedate="2013-02-21"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
@@ -22,19 +27,11 @@
email="meik.michalke at hhu.de"
role="aut, cre"
/>
- <dependencies rkward_min_version="0.5.6">
- <package name="ez" />
- <package name="sciplot" />
- <!--
- If this plugin depends on other pluginmaps, edit this part to your needs: <pluginmap
- name="CHANGE_ME_OR_DELETE_ME"
- url="CHANGE_ME_OR_DELETE_ME"
- />
- -->
- </dependencies>
</about>
<!--
- <require file="path/file.pluginmap" />
+ <require
+ file="path/file.pluginmap"
+ />
-->
<components>
<component
@@ -42,25 +39,29 @@
label="Pairwise t-Tests"
type="standard"
file="plugins/PairwisetTests.xml"
- />
+ >
+ </component>
<component
id="cmp_ANOVAInteractionplot"
label="Interaction plot"
type="standard"
file="plugins/Interactionplot.xml"
- />
+ >
+ </component>
<component
id="cmp_ANOVAPreparewithinsbjctdt"
label="Prepare within subject data"
type="standard"
file="plugins/Preparewithinsubjectdata.xml"
- />
+ >
+ </component>
<component
id="cmp_ANOVAANOVA"
label="ANOVA"
type="standard"
file="plugins/ANOVA.xml"
- />
+ >
+ </component>
</components>
<hierarchy>
<menu
Modified: branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R 2013-02-21 11:18:51 UTC (rev 4548)
@@ -7,6 +7,8 @@
# set the output directory to overwrite the actual plugin
output.dir <- tempdir()
overwrite <- TRUE
+# if you set guess.getters to TRUE, the resulting code will need RKWard >= 0.6.0
+guess.getter <- FALSE
require(rkwarddev)
@@ -16,10 +18,12 @@
person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut","cre"))),
about=list(desc="RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions.",
- version="0.01-14", url="http://rkward.sf.net"),
- dependencies=list(rkward.min="0.5.6"),
+ version="0.01-15", url="http://rkward.sf.net")
+ )
+dependencies.info <- rk.XML.dependencies(
+ dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6")),
package=list(c(name="ez"), c(name="sciplot"))
- )
+)
############
## ANOVA
@@ -105,10 +109,10 @@
anova.gov.mixed <- rk.XML.convert(sources=list(string=anova.drp.design), mode=c(equals="mixed")),
anova.gov.show.bvars <- rk.XML.convert(sources=list(anova.gov.between, anova.gov.mixed), mode=c(or=""), id.name="lgc_bvars"),
anova.gov.show.wvars <- rk.XML.convert(sources=list(anova.gov.within, anova.gov.mixed), mode=c(or=""), id.name="lgc_vvars"),
- rk.XML.connect(governor=anova.gov.data, client=var.dv, set="enabled"),
- rk.XML.connect(governor=anova.gov.data, client=var.between, set="enabled"),
- rk.XML.connect(governor=anova.gov.data, client=var.within, set="enabled"),
- rk.XML.connect(governor=anova.gov.data, client=var.wid, set="enabled"),
+ rk.XML.connect(governor=anova.gov.data, client=var.dv, set="enabled"),
+ rk.XML.connect(governor=anova.gov.data, client=var.between, set="enabled"),
+ rk.XML.connect(governor=anova.gov.data, client=var.within, set="enabled"),
+ rk.XML.connect(governor=anova.gov.data, client=var.wid, set="enabled"),
rk.XML.connect(governor=anova.gov.show.wvars, client=var.wid, set="required"),
rk.XML.connect(governor=anova.gov.show.bvars, client=var.between, set="visible"),
rk.XML.connect(governor=anova.gov.show.wvars, client=var.within, set="visible"),
@@ -256,9 +260,10 @@
xml=list(
logic=pd.lgc.sect,
dialog=pd.full.dialog),
- js=list(
- calculate=pd.js.calc,
- printout=pd.js.print),
+ js=list(
+ calculate=pd.js.calc,
+ printout=pd.js.print),
+ guess.getter=guess.getter,
hierarchy=list("data", "ANOVA"),
create=c("xml", "js"))
@@ -358,6 +363,7 @@
js=list(
calculate=pt.js.calc,
printout=pt.js.print),
+ guess.getter=guess.getter,
hierarchy=list("analysis", "means", "t-tests"),
create=c("xml", "js"))
@@ -386,13 +392,13 @@
## logic
ip.lgc.sect <- rk.XML.logic(
- ip.gov.lineplot <- rk.XML.convert(sources=list(string=ip.rad.plottype), mode=c(equals="line")),
- rk.XML.connect(governor=ip.gov.lineplot, client=ip.rad.ltype, set="visible"),
+ ip.gov.lineplot <- rk.XML.convert(sources=list(string=ip.rad.plottype), mode=c(equals="line")),
+ rk.XML.connect(governor=ip.gov.lineplot, client=ip.rad.ltype, set="visible"),
rk.XML.connect(governor=ip.gov.lineplot, client=ip.rad.btype, set="visible", not=TRUE),
- ip.gov.traces <- rk.XML.convert(sources=list(available=ip.tvar.group), mode=c(notequals="")),
+ ip.gov.traces <- rk.XML.convert(sources=list(available=ip.tvar.group), mode=c(notequals="")),
rk.XML.connect(governor=ip.gov.traces, client=ip.rad.btype, set="enabled"),
rk.XML.connect(governor=ip.gov.traces, client=ip.chk.legend, set="enabled"),
- ip.gov.leglabel <- rk.XML.convert(sources=list(ip.gov.traces, state=ip.chk.legend), mode=c(and="")),
+ ip.gov.leglabel <- rk.XML.convert(sources=list(ip.gov.traces, state=ip.chk.legend), mode=c(and="")),
rk.XML.connect(governor=ip.gov.leglabel, client=ip.inp.trace.label, set="enabled"),
rk.XML.connect(governor=ip.tvar.x, client=ip.plot.options, get="available", set="xvar"),
rk.XML.connect(governor=ip.tvar.response, client=ip.plot.options, get="available", set="yvar"),
@@ -440,10 +446,11 @@
xml=list(
logic=ip.lgc.sect,
dialog=ip.full.dialog),
- js=list(
+ js=list(
results.header="\"Interaction plot\"",
require="sciplot",
- doPrintout=ip.js.prnt),
+ doPrintout=ip.js.prnt),
+ guess.getter=guess.getter,
hierarchy=list("plots"),
create=c("xml", "js"))
@@ -456,6 +463,7 @@
rk.ANOVA.dir <<- rk.plugin.skeleton(
about.info,
path=output.dir,
+ guess.getter=guess.getter,
xml=list(
logic=lgc.sect,
dialog=full.dialog),
@@ -466,6 +474,7 @@
load.silencer=var.chk.suppress),
pluginmap=list(name="ANOVA", hierarchy=list("analysis", "ANOVA")),
components=list(pttest.component, plot.component, pdata.component),
+ dependencies=dependencies.info,
create=c("pmap", "xml", "js", "desc"),
overwrite=overwrite,
tests=FALSE,
Modified: branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd
===================================================================
--- branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd 2013-02-21 11:03:28 UTC (rev 4547)
+++ branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd 2013-02-21 11:18:51 UTC (rev 4548)
@@ -2,15 +2,15 @@
\name{rk.ANOVA-package}
\alias{rk.ANOVA}
\alias{rk.ANOVA-package}
-\title{RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions..}
+\title{The rk.ANOVA Package}
\description{
RKWard GUI to conduct ANOVAs (using the ez package),
pairwise t-Tests and plot interactions..
}
\details{
\tabular{ll}{ Package: \tab rk.ANOVA\cr Type: \tab
- Package\cr Version: \tab 0.01-13\cr Date: \tab
- 2012-09-29\cr Depends: \tab rkward (>= 0.5.6)\cr
+ Package\cr Version: \tab 0.01-15\cr Date: \tab
+ 2013-02-21\cr Depends: \tab rkward (>= 0.5.6)\cr
Enhances: \tab rkward\cr License: \tab GPL (>= 3)\cr
LazyLoad: \tab yes\cr URL: \tab http://rkward.sf.net\cr }
More information about the rkward-tracker
mailing list