[rkward-cvs] SF.net SVN: rkward-code:[4560] branches/external_plugins
m-eik at users.sf.net
m-eik at users.sf.net
Sun Feb 24 20:17:31 UTC 2013
Revision: 4560
http://sourceforge.net/p/rkward/code/4560
Author: m-eik
Date: 2013-02-24 20:17:27 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
external plugins: re-built rk.ClusterAnalysis, rk.CohenKappa, rk.FactorAnalysis, rk.MultidimensionalScaling and rk.subset, to comply with the recent XML changes
Modified Paths:
--------------
branches/external_plugins/rk.ClusterAnalysis/ChangeLog
branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION
branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R
branches/external_plugins/rk.ClusterAnalysis/inst/CITATION
branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.js
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.js
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.js
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.xml
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/ModelbasedCA.xml
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rkwarddev_CA_plugin_script.R
branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd
branches/external_plugins/rk.CohenKappa/ChangeLog
branches/external_plugins/rk.CohenKappa/DESCRIPTION
branches/external_plugins/rk.CohenKappa/R/rk.CohenKappa-package.R
branches/external_plugins/rk.CohenKappa/inst/CITATION
branches/external_plugins/rk.CohenKappa/inst/NEWS.Rd
branches/external_plugins/rk.CohenKappa/inst/rkward/rk.CohenKappa.pluginmap
branches/external_plugins/rk.CohenKappa/inst/rkward/rkwarddev_plugin_script_kappa.R
branches/external_plugins/rk.CohenKappa/man/rk.CohenKappa-package.Rd
branches/external_plugins/rk.FactorAnalysis/ChangeLog
branches/external_plugins/rk.FactorAnalysis/DESCRIPTION
branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R
branches/external_plugins/rk.FactorAnalysis/inst/CITATION
branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd
branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Correlationplot.xml
branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml
branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/ParallelanalysisHorn.xml
branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Screeplot.xml
branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/VerySimpleStructureMinimumAveragePartial.xml
branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap
branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R
branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd
branches/external_plugins/rk.MultidimensionalScaling/ChangeLog
branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION
branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R
branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION
branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd
branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.js
branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml
branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap
branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R
branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd
branches/external_plugins/rk.subset/ChangeLog
branches/external_plugins/rk.subset/DESCRIPTION
branches/external_plugins/rk.subset/R/rk.subset-package.R
branches/external_plugins/rk.subset/inst/CITATION
branches/external_plugins/rk.subset/inst/NEWS.Rd
branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml
branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap
branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R
branches/external_plugins/rk.subset/man/rk.subset-package.Rd
Modified: branches/external_plugins/rk.ClusterAnalysis/ChangeLog
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/ChangeLog 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/ChangeLog 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,9 @@
ChangeLog for package rk.ClusterAnalysis
+changes in version 0.01-8 (2013-02-24)
+changed:
+ - updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+
changes in version 0.01-7 (2012-09-29)
fixed:
- added generic pre/post plot options
Modified: branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -2,8 +2,8 @@
Type: Package
Title: RKWard GUI to conduct k-means, model based and hierarchical cluster
analyses
-Version: 0.01-7
-Date: 2012-09-29
+Version: 0.01-8
+Date: 2013-02-24
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
Depends:
Modified: branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rk.ClusterAnalysis\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.01-7\cr
-#' Date: \tab 2012-09-29\cr
+#' Version: \tab 0.01-8\cr
+#' Date: \tab 2013-02-24\cr
#' Depends: \tab rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' License: \tab GPL (>= 3)\cr
@@ -17,7 +17,7 @@
#' @aliases rk.ClusterAnalysis-package rk.ClusterAnalysis
#' @name rk.ClusterAnalysis-package
#' @docType package
-#' @title RKWard GUI to conduct k-means, model based and hierarchical cluster analyses.
+#' @title The rk.ClusterAnalysis Package
#' @author Meik Michalke \email{meik.michalke@@hhu.de}
#' @keywords package
NULL
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/CITATION
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/CITATION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/CITATION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,13 +1,13 @@
bibentry("Manual",
title="rk.ClusterAnalysis: RKWard GUI to conduct k-means, model based and hierarchical cluster analyses",
author="Meik Michalke",
- year="2012",
- note="(Version 0.01-7)",
+ year="2013",
+ note="(Version 0.01-8)",
url="http://rkward.sf.net",
textVersion =
- paste("Michalke, M. (2012). ",
- "rk.ClusterAnalysis: RKWard GUI to conduct k-means, model based and hierarchical cluster analyses (Version 0.01-7). ",
+ paste("Michalke, M. (2013). ",
+ "rk.ClusterAnalysis: RKWard GUI to conduct k-means, model based and hierarchical cluster analyses (Version 0.01-8). ",
"Available from http://rkward.sf.net",
sep=""),
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,12 @@
\name{NEWS}
\title{News for Package 'rk.ClusterAnalysis'}
+\section{Changes in rk.ClusterAnalysis version 0.01-8 (2013-02-24)}{
+ \subsection{changed}{
+ \itemize{
+ \item updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+ }
+ }
+}
\section{Changes in rk.ClusterAnalysis version 0.01-7 (2012-09-29)}{
\subsection{fixed}{
\itemize{
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.js
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.js 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.js 2013-02-24 20:17:27 UTC (rev 4560)
@@ -83,9 +83,9 @@
var frmDtprprtnEnabled = getValue("frm_Dtprprtn.enabled");
echo("\n");
// in case there are generic plot options defined:
- var embGnrcpltpCodePreprocess = getValue("emb_Gnrcpltp.code.preprocess");
- var embGnrcpltpCodePrintout = getValue("emb_Gnrcpltp.code.printout");
- var embGnrcpltpCodeCalculate = getValue("emb_Gnrcpltp.code.calculate");
+ var embRkwrdpltptnGCodePreprocess = getValue("emb_rkwrdpltptnG.code.preprocess");
+ var embRkwrdpltptnGCodePrintout = getValue("emb_rkwrdpltptnG.code.printout");
+ var embRkwrdpltptnGCodeCalculate = getValue("emb_rkwrdpltptnG.code.calculate");
if(full) {
echo("rk.graph.on()\n");
@@ -93,48 +93,48 @@
echo("\ttry({\n");
// insert any option-setting code that should be run before the actual plotting commands:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodePreprocess, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodePreprocess, "\n", "");
// the actual plot:
- if(!embGnrcpltpCodePrintout.match(/sub\s*=/) && frmDtprprtnEnabled != "true") {
+ if(!embRkwrdpltptnGCodePrintout.match(/sub\s*=/) && frmDtprprtnEnabled != "true") {
echo("\t# extract distance computation method from dist object\n\tdistance.computation <- attr(" + varData + ", \"method\")\n\n");
}
echo("\t\tplot(\n\t\t\t");
if(radMethod == "kmeans" && frmDtprprtnEnabled == "true") {
echo("1:" + spnMxmmnmbr + ",\n\t\t\tclust.wss");
- if(!embGnrcpltpCodePrintout.match(/type\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/type\s*=/)) {
echo(",\n\t\t\ttype=\"b\"");
}
- if(!embGnrcpltpCodePrintout.match(/xlab\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/xlab\s*=/)) {
echo(",\n\t\t\txlab=\"Number of Clusters\"");
}
- if(!embGnrcpltpCodePrintout.match(/ylab\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/ylab\s*=/)) {
echo(",\n\t\t\tylab=\"Within groups sum of squares\"");
}
- if(!embGnrcpltpCodePrintout.match(/main\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/main\s*=/)) {
echo(",\n\t\t\tmain=\"Within sum of squares by clusters\"");
}
- if(!embGnrcpltpCodePrintout.match(/sub\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/sub\s*=/)) {
echo(",\n\t\t\tsub=\"Examined " + spnMxmmnmbr + " clusters using k-means partitioning\"");
}
- echo(embGnrcpltpCodePrintout.replace(/, /g, ",\n\t\t\t"));
+ echo(embRkwrdpltptnGCodePrintout.replace(/, /g, ",\n\t\t\t"));
echo(")");
}
if(radMethod == "hclust" || frmDtprprtnEnabled != "true") {
echo("clust.wss");
- if(!embGnrcpltpCodePrintout.match(/type\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/type\s*=/)) {
echo(",\n\t\t\ttype=\"b\"");
}
- if(!embGnrcpltpCodePrintout.match(/xlab\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/xlab\s*=/)) {
echo(",\n\t\t\txlab=\"Number of Clusters\"");
}
- if(!embGnrcpltpCodePrintout.match(/ylab\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/ylab\s*=/)) {
echo(",\n\t\t\tylab=\"Agglomeration criterion\"");
}
- if(!embGnrcpltpCodePrintout.match(/main\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/main\s*=/)) {
echo(",\n\t\t\tmain=\"Inverse Scree plot\"");
}
- if(!embGnrcpltpCodePrintout.match(/sub\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/sub\s*=/)) {
if(frmDtprprtnEnabled == "true") {
echo(",\n\t\t\tsub=\"Examined " + spnMxmmnmbr + " clusters (dist: " + drpCmpttnmt + ", hclust: " + drpAgglmrtn + ")\"");
} else {
@@ -142,12 +142,12 @@
}
}
echo(",\n\t\t\txaxt=\"n\"");
- echo(embGnrcpltpCodePrintout.replace(/, /g, ",\n\t\t\t"));
+ echo(embRkwrdpltptnGCodePrintout.replace(/, /g, ",\n\t\t\t"));
echo(")" + "\n\t\taxis(1, at=1:" + spnMxmmnmbr + ", labels=" + spnMxmmnmbr + ":1)");
}
// insert any option-setting code that should be run after the actual plot:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodeCalculate, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodeCalculate, "\n", "");
echo("\n\t})\n");
if(full) {
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
@@ -55,7 +55,7 @@
</frame>
<stretch />
<frame label="Plot options" id="frm_Plotptns">
- <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_Gnrcpltp" />
+ <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_rkwrdpltptnG" />
<preview />
</frame>
</column>
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.js
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.js 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.js 2013-02-24 20:17:27 UTC (rev 4560)
@@ -103,9 +103,9 @@
if(frmDrwdndrgChecked) {
echo("\n");
// in case there are generic plot options defined:
- var embGnrcpltpCodePreprocess = getValue("emb_Gnrcpltp.code.preprocess");
- var embGnrcpltpCodePrintout = getValue("emb_Gnrcpltp.code.printout");
- var embGnrcpltpCodeCalculate = getValue("emb_Gnrcpltp.code.calculate");
+ var embRkwrdpltptnGCodePreprocess = getValue("emb_rkwrdpltptnG.code.preprocess");
+ var embRkwrdpltptnGCodePrintout = getValue("emb_rkwrdpltptnG.code.printout");
+ var embRkwrdpltptnGCodeCalculate = getValue("emb_rkwrdpltptnG.code.calculate");
if(full) {
echo("rk.graph.on()\n");
@@ -113,24 +113,24 @@
echo("\ttry({\n");
// insert any option-setting code that should be run before the actual plotting commands:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodePreprocess, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodePreprocess, "\n", "");
// the actual plot:
- if(!embGnrcpltpCodePrintout.match(/sub\s*=/) && frmDtprprtnEnabled != "true") {
+ if(!embRkwrdpltptnGCodePrintout.match(/sub\s*=/) && frmDtprprtnEnabled != "true") {
echo("\t# extract distance computation method from dist object\n\tdistance.computation <- attr(" + varData + ", \"method\")\n\n");
}
echo("\t\tplclust(clust.h.result");
- if(!embGnrcpltpCodePrintout.match(/main\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/main\s*=/)) {
echo(",\n\t\t\tmain=\"Cluster dendrogram\"");
}
- if(!embGnrcpltpCodePrintout.match(/sub\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/sub\s*=/)) {
if(frmDtprprtnEnabled == "true") {
echo(",\n\t\t\tsub=\"Distance computation: " + drpCmpttnmt + ", agglomeration method: " + drpAgglmrtn + "\"");
} else {
echo(",\n\t\t\tsub=paste(\"Distance computation: \", distance.computation, \", agglomeration method: " + drpAgglmrtn + "\", sep=\"\")");
}
}
- if(!embGnrcpltpCodePrintout.match(/xlab\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/xlab\s*=/)) {
echo(",\n\t\t\txlab=\"Data: " + varData + "\"");
}
if(chcPltsplts) {
@@ -142,14 +142,14 @@
if(spnMnmmhght != 0) {
echo(",\n\t\t\thmin=" + spnMnmmhght);
}
- echo(embGnrcpltpCodePrintout.replace(/, /g, ",\n\t\t\t"));
+ echo(embRkwrdpltptnGCodePrintout.replace(/, /g, ",\n\t\t\t"));
echo(")");
if(spnDrwbrdr1 > 1) {
echo("\n\t\trect.hclust(clust.h.result, k=" + spnDrwbrdr1 + ", border=\"red\")");
}
// insert any option-setting code that should be run after the actual plot:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodeCalculate, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodeCalculate, "\n", "");
echo("\n\t})\n");
if(full) {
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
@@ -32,9 +32,9 @@
</script>
<convert id="lgc_drpCmptt" sources="drp_Cmpttnmt.string" mode="equals" standard="minkowski" />
<connect governor="lgc_drpCmptt" client="spn_PwrfMnkw.enabled" />
- <set id="emb_Gnrcpltp.allow_type" to="false" />
- <set id="emb_Gnrcpltp.axistypes.visible" to="false" />
- <set id="emb_Gnrcpltp.scale.visible" to="false" />
+ <set id="emb_rkwrdpltptnG.allow_type" to="false" />
+ <set id="emb_rkwrdpltptnG.axistypes.visible" to="false" />
+ <set id="emb_rkwrdpltptnG.scale.visible" to="false" />
<convert id="lgc_frmDtprp" sources="frm_Dtprprtn.enabled" mode="equals" standard="true" />
<connect governor="lgc_frmDtprp" client="frm_Dstncmtr.enabled" />
</logic>
@@ -84,7 +84,7 @@
<frame id="frm_chckbxdcPP">
<checkbox id="chc_Pltsplts" label="Plot splits at equally-spaced heights (not object height)" value="true" />
</frame>
- <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_Gnrcpltp" />
+ <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_rkwrdpltptnG" />
<preview />
</frame>
</column>
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.js
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.js 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.js 2013-02-24 20:17:27 UTC (rev 4560)
@@ -91,9 +91,9 @@
if(frmPltrsltsChecked) {
echo("\n");
// in case there are generic plot options defined:
- var embGnrcpltpCodePreprocess = getValue("emb_Gnrcpltp.code.preprocess");
- var embGnrcpltpCodePrintout = getValue("emb_Gnrcpltp.code.printout");
- var embGnrcpltpCodeCalculate = getValue("emb_Gnrcpltp.code.calculate");
+ var embRkwrdpltptnGCodePreprocess = getValue("emb_rkwrdpltptnG.code.preprocess");
+ var embRkwrdpltptnGCodePrintout = getValue("emb_rkwrdpltptnG.code.printout");
+ var embRkwrdpltptnGCodeCalculate = getValue("emb_rkwrdpltptnG.code.calculate");
if(full) {
echo("rk.graph.on()\n");
@@ -101,24 +101,24 @@
echo("\ttry({\n");
// insert any option-setting code that should be run before the actual plotting commands:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodePreprocess, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodePreprocess, "\n", "");
// the actual plot:
echo("\t\tplot(" + varData + ",\n\t\t\tcol=clust.k.result$cluster");
- if(!embGnrcpltpCodePrintout.match(/main\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/main\s*=/)) {
echo(",\n\t\t\tmain=\"K-means partitioning\"");
}
- if(!embGnrcpltpCodePrintout.match(/sub\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/sub\s*=/)) {
echo(",\n\t\t\tsub=\"Grouped into " + spnNmbrfcls + " clusters by the " + drpAlgorthm + " algorithm\"");
}
- echo(embGnrcpltpCodePrintout.replace(/, /g, ",\n\t\t\t"));
+ echo(embRkwrdpltptnGCodePrintout.replace(/, /g, ",\n\t\t\t"));
echo(")");
if(chcPltclstr) {
echo("\n\t\tpoints(clust.k.result$centers, col=1:" + spnNmbrfcls + ", pch=8, cex=2)");
}
// insert any option-setting code that should be run after the actual plot:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodeCalculate, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodeCalculate, "\n", "");
echo("\n\t})\n");
if(full) {
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.xml
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Kmeanspartitioning.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
@@ -64,7 +64,7 @@
</frame>
<frame label="Plot results" checkable="true" id="frm_Pltrslts">
<checkbox id="chc_Pltclstr" label="Plot cluster centers" value="true" checked="true" />
- <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_Gnrcpltp" />
+ <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_rkwrdpltptnG" />
<preview />
</frame>
</column>
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/ModelbasedCA.xml
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/ModelbasedCA.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/ModelbasedCA.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,18 +1,22 @@
-<!DOCTYPE rkpluginmap>
+<!DOCTYPE rkpluginmap >
<document
- namespace="rkward"
+ namespace="Kmeanspartitioning"
id="Kmeanspartitioning_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="mclust" />
+ </dependencies>
<about
name="rk.ClusterAnalysis"
shortinfo="RKWard GUI to conduct k-means, model based and hierarchical cluster analyses"
longinfo="RKWard GUI to conduct k-means, model based and hierarchical cluster analyses"
- version="0.01-7"
- releasedate="2012-09-29"
+ version="0.01-8"
+ releasedate="2013-02-24"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
@@ -22,18 +26,11 @@
email="meik.michalke at hhu.de"
role="aut, cre"
/>
- <dependencies rkward_min_version="0.5.6">
- <package name="mclust" />
- <!--
- 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
@@ -41,25 +38,29 @@
label="Hierarchical CA"
type="standard"
file="plugins/HierarchicalCA.xml"
- />
+ >
+ </component>
<component
id="cmp_KmeanspartitionngMdlbsdCA"
label="Model based CA"
type="standard"
file="plugins/ModelbasedCA.xml"
- />
+ >
+ </component>
<component
id="cmp_KmnsprttnngDtrmnnmbrfclst"
label="Determine number of clusters"
type="standard"
file="plugins/Determinenumberofclusters.xml"
- />
+ >
+ </component>
<component
id="cmp_KmeansparttnngKmnsprttnng"
label="K-means partitioning"
type="standard"
file="plugins/Kmeanspartitioning.xml"
- />
+ >
+ </component>
</components>
<hierarchy>
<menu
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rkwarddev_CA_plugin_script.R
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rkwarddev_CA_plugin_script.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rkwarddev_CA_plugin_script.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -9,6 +9,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
about.info <- rk.XML.about(
name="rk.ClusterAnalysis",
@@ -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 k-means, model based and hierarchical cluster analyses",
- version="0.01-7", url="http://rkward.sf.net"),
- dependencies=list(rkward.min="0.5.6"),
+ version="0.01-8", 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="mclust"))
- )
+)
############
## re-used objects
@@ -334,6 +338,7 @@
calculate=clust.h.js.calc,
doPrintout=clust.h.js.dend
),
+ guess.getter=guess.getter,
hierarchy=list("analysis", "Cluster analysis"),
create=c("xml", "js"))
@@ -427,6 +432,7 @@
calculate=clust.m.js.calc,
doPrintout=clust.m.js.plot
),
+ guess.getter=guess.getter,
hierarchy=list("analysis", "Cluster analysis"),
create=c("xml", "js"))
@@ -583,6 +589,7 @@
# require="fcp",
calculate=clust.num.js.calc,
doPrintout=clust.num.js.print),
+ guess.getter=guess.getter,
hierarchy=list("plots", "Cluster analysis"),
create=c("xml", "js"))
@@ -595,6 +602,7 @@
cluster.plugin.dir <<- rk.plugin.skeleton(
about.info,
path=output.dir,
+ guess.getter=guess.getter,
xml=list(
dialog=clust.k.full.dialog,
logic=lgc.sect.k),
@@ -607,6 +615,7 @@
clust.h.component,
clust.m.component,
clust.num.component),
+ dependencies=dependencies.info,
create=c("pmap", "xml", "js", "desc"),
overwrite=overwrite,
tests=FALSE,
Modified: branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -2,15 +2,15 @@
\name{rk.ClusterAnalysis-package}
\alias{rk.ClusterAnalysis}
\alias{rk.ClusterAnalysis-package}
-\title{RKWard GUI to conduct k-means, model based and hierarchical cluster analyses.}
+\title{The rk.ClusterAnalysis Package}
\description{
RKWard GUI to conduct k-means, model based and
hierarchical cluster analyses.
}
\details{
\tabular{ll}{ Package: \tab rk.ClusterAnalysis\cr Type:
- \tab Package\cr Version: \tab 0.01-7\cr Date: \tab
- 2012-09-29\cr Depends: \tab rkward (>= 0.5.6)\cr
+ \tab Package\cr Version: \tab 0.01-8\cr Date: \tab
+ 2013-02-24\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 }
Modified: branches/external_plugins/rk.CohenKappa/ChangeLog
===================================================================
--- branches/external_plugins/rk.CohenKappa/ChangeLog 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/ChangeLog 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,9 @@
ChangeLog for package rk.CohenKappa
+changes in version 0.01-4 (2013-02-24)
+changed:
+ - updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+
changes in version 0.01-3 (2012-04-07)
changes:
- added a ChangeLog file
Modified: branches/external_plugins/rk.CohenKappa/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.CohenKappa/DESCRIPTION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/DESCRIPTION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,8 +1,8 @@
Package: rk.CohenKappa
Type: Package
Title: RKWard GUI to calculate Cohen's Kappa
-Version: 0.01-3
-Date: 2012-04-07
+Version: 0.01-4
+Date: 2013-02-24
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
Depends:
Modified: branches/external_plugins/rk.CohenKappa/R/rk.CohenKappa-package.R
===================================================================
--- branches/external_plugins/rk.CohenKappa/R/rk.CohenKappa-package.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/R/rk.CohenKappa-package.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rk.CohenKappa\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.01-3\cr
-#' Date: \tab 2012-04-07\cr
+#' Version: \tab 0.01-4\cr
+#' Date: \tab 2013-02-24\cr
#' Depends: \tab rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' License: \tab GPL (>= 3)\cr
@@ -17,7 +17,7 @@
#' @aliases rk.CohenKappa-package rk.CohenKappa
#' @name rk.CohenKappa-package
#' @docType package
-#' @title RKWard GUI to calculate Cohen's Kappa.
+#' @title The rk.CohenKappa Package
#' @author Meik Michalke \email{meik.michalke@@hhu.de}
#' @keywords package
NULL
Modified: branches/external_plugins/rk.CohenKappa/inst/CITATION
===================================================================
--- branches/external_plugins/rk.CohenKappa/inst/CITATION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/inst/CITATION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,13 +1,13 @@
bibentry("Manual",
title="rk.CohenKappa: RKWard GUI to calculate Cohen's Kappa",
author="Meik Michalke",
- year="2012",
- note="(Version 0.01-3)",
+ year="2013",
+ note="(Version 0.01-4)",
url="http://rkward.sf.net",
textVersion =
- paste("Michalke, M. (2012). ",
- "rk.CohenKappa: RKWard GUI to calculate Cohen's Kappa (Version 0.01-3). ",
+ paste("Michalke, M. (2013). ",
+ "rk.CohenKappa: RKWard GUI to calculate Cohen's Kappa (Version 0.01-4). ",
"Available from http://rkward.sf.net",
sep=""),
Modified: branches/external_plugins/rk.CohenKappa/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.CohenKappa/inst/NEWS.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/inst/NEWS.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,12 @@
\name{NEWS}
\title{News for Package 'rk.CohenKappa'}
+\section{Changes in rk.CohenKappa version 0.01-4 (2013-02-24)}{
+ \subsection{changed}{
+ \itemize{
+ \item updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+ }
+ }
+}
\section{Changes in rk.CohenKappa version 0.01-3 (2012-04-07)}{
\subsection{changes}{
\itemize{
Modified: branches/external_plugins/rk.CohenKappa/inst/rkward/rk.CohenKappa.pluginmap
===================================================================
--- branches/external_plugins/rk.CohenKappa/inst/rkward/rk.CohenKappa.pluginmap 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/inst/rkward/rk.CohenKappa.pluginmap 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,18 +1,22 @@
<!DOCTYPE rkpluginmap >
<document
- namespace="rkward"
+ namespace="CohensKappa"
id="CohensKappa_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="psych" />
+ </dependencies>
<about
name="rk.CohenKappa"
shortinfo="RKWard GUI to calculate Cohen's Kappa"
longinfo="RKWard GUI to calculate Cohen's Kappa, i.e., the agreement of two raters (using the psych package)"
version="0.01-4"
- releasedate="2012-11-08"
+ releasedate="2013-02-24"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
@@ -22,18 +26,11 @@
email="meik.michalke at hhu.de"
role="aut, cre"
/>
- <dependencies rkward_min_version="0.5.6">
- <package name="psych" />
- <!--
- 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
@@ -41,7 +38,8 @@
label="Cohen's Kappa"
type="standard"
file="plugins/CohensKappa.xml"
- />
+ >
+ </component>
</components>
<hierarchy>
<menu
Modified: branches/external_plugins/rk.CohenKappa/inst/rkward/rkwarddev_plugin_script_kappa.R
===================================================================
--- branches/external_plugins/rk.CohenKappa/inst/rkward/rkwarddev_plugin_script_kappa.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/inst/rkward/rkwarddev_plugin_script_kappa.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -9,6 +9,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
about.info <- rk.XML.about(
name="rk.CohenKappa",
@@ -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 calculate Cohen's Kappa",
- version="0.01-4", url="http://rkward.sf.net", long.desc="RKWard GUI to calculate Cohen's Kappa, i.e., the agreement of two raters (using the psych package)"),
- dependencies=list(rkward.min="0.5.6"),
+ version="0.01-4", url="http://rkward.sf.net", long.desc="RKWard GUI to calculate Cohen's Kappa, i.e., the agreement of two raters (using the psych package)")
+ )
+dependencies.info <- rk.XML.dependencies(
+ dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6")),
package=list(c(name="psych"))
- )
+)
############
## cohen's kappa
@@ -73,6 +77,7 @@
rk.plugin.skeleton(
about.info,
path=output.dir,
+ guess.getter=guess.getter,
xml=list(
dialog=kappa.full.dialog),
js=list(results.header="\"Cohen's Kappa and weighted Kappa\"",
@@ -80,6 +85,7 @@
calculate=kappa.js.calc,
printout=kappa.js.print),
pluginmap=list(name="Cohen's Kappa", hierarchy=list("analysis")),
+ dependencies=dependencies.info,
create=c("pmap", "xml", "js", "desc"),
overwrite=overwrite,
tests=FALSE,
Modified: branches/external_plugins/rk.CohenKappa/man/rk.CohenKappa-package.Rd
===================================================================
--- branches/external_plugins/rk.CohenKappa/man/rk.CohenKappa-package.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.CohenKappa/man/rk.CohenKappa-package.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -2,14 +2,14 @@
\name{rk.CohenKappa-package}
\alias{rk.CohenKappa}
\alias{rk.CohenKappa-package}
-\title{RKWard GUI to calculate Cohen's Kappa.}
+\title{The rk.CohenKappa Package}
\description{
RKWard GUI to calculate Cohen's Kappa.
}
\details{
\tabular{ll}{ Package: \tab rk.CohenKappa\cr Type: \tab
- Package\cr Version: \tab 0.01-3\cr Date: \tab
- 2012-04-07\cr Depends: \tab rkward (>= 0.5.6)\cr
+ Package\cr Version: \tab 0.01-4\cr Date: \tab
+ 2013-02-24\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 }
Modified: branches/external_plugins/rk.FactorAnalysis/ChangeLog
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/ChangeLog 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/ChangeLog 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,9 @@
ChangeLog for package rk.FactorAnalysis
+changes in version 0.01-10 (2013-02-24)
+changed:
+ - updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+
changes in version 0.01-9 (2012-10-08)
fixed:
- bug in testing for rotation method led to errors when trying to compute
Modified: branches/external_plugins/rk.FactorAnalysis/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/DESCRIPTION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/DESCRIPTION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,8 +1,8 @@
Package: rk.FactorAnalysis
Type: Package
Title: RKWard GUI to conduct principal component and factor analysis
-Version: 0.01-9
-Date: 2012-10-08
+Version: 0.01-10
+Date: 2013-02-24
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
Depends:
Modified: branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/R/rk.FactorAnalysis-package.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rk.FactorAnalysis\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.01-9\cr
-#' Date: \tab 2012-10-08\cr
+#' Version: \tab 0.01-10\cr
+#' Date: \tab 2013-02-24\cr
#' Depends: \tab rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' License: \tab GPL (>= 3)\cr
@@ -17,7 +17,7 @@
#' @aliases rk.FactorAnalysis-package rk.FactorAnalysis
#' @name rk.FactorAnalysis-package
#' @docType package
-#' @title RKWard GUI to conduct principal component and factor analysis.
+#' @title The rk.FactorAnalysis Package
#' @author Meik Michalke \email{meik.michalke@@hhu.de}
#' @keywords package
NULL
Modified: branches/external_plugins/rk.FactorAnalysis/inst/CITATION
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/CITATION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/CITATION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,13 +1,13 @@
bibentry("Manual",
title="rk.FactorAnalysis: RKWard GUI to conduct principal component and factor analysis",
author="Meik Michalke",
- year="2012",
- note="(Version 0.01-9)",
+ year="2013",
+ note="(Version 0.01-10)",
url="http://rkward.sf.net",
textVersion =
- paste("Michalke, M. (2012). ",
- "rk.FactorAnalysis: RKWard GUI to conduct principal component and factor analysis (Version 0.01-9). ",
+ paste("Michalke, M. (2013). ",
+ "rk.FactorAnalysis: RKWard GUI to conduct principal component and factor analysis (Version 0.01-10). ",
"Available from http://rkward.sf.net",
sep=""),
Modified: branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/NEWS.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,12 @@
\name{NEWS}
\title{News for Package 'rk.FactorAnalysis'}
+\section{Changes in rk.FactorAnalysis version 0.01-10 (2013-02-24)}{
+ \subsection{changed}{
+ \itemize{
+ \item updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+ }
+ }
+}
\section{Changes in rk.FactorAnalysis version 0.01-9 (2012-10-08)}{
\subsection{fixed}{
\itemize{
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Correlationplot.xml
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Correlationplot.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Correlationplot.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Factoranalysis.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/ParallelanalysisHorn.xml
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/ParallelanalysisHorn.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/ParallelanalysisHorn.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Screeplot.xml
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Screeplot.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/Screeplot.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/VerySimpleStructureMinimumAveragePartial.xml
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/VerySimpleStructureMinimumAveragePartial.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/plugins/VerySimpleStructureMinimumAveragePartial.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/rk.FactorAnalysis.pluginmap 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,18 +1,25 @@
-<!DOCTYPE rkpluginmap>
+<!DOCTYPE rkpluginmap >
<document
- namespace="rkward"
+ namespace="Factoranalysis"
id="Factoranalysis_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="psych"
+ min="1.1.10"
+ />
+ </dependencies>
<about
name="rk.FactorAnalysis"
shortinfo="RKWard GUI to conduct principal component and factor analysis"
longinfo="RKWard GUI to conduct principal component and factor analysis (using the psych package). Also includes dialogs for scree plots, correlation plots, VSS/MAP and parallel analysis."
- version="0.01-9"
- releasedate="2012-10-08"
+ version="0.01-10"
+ releasedate="2013-02-24"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
@@ -22,21 +29,11 @@
email="meik.michalke at hhu.de"
role="aut, cre"
/>
- <dependencies rkward_min_version="0.5.6">
- <package
- name="psych"
- min="1.1.10"
- />
- <!--
- 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
@@ -44,31 +41,36 @@
label="Scree plot"
type="standard"
file="plugins/Screeplot.xml"
- />
+ >
+ </component>
<component
id="cmp_FactoranalysisCorreltnplt"
label="Correlation plot"
type="standard"
file="plugins/Correlationplot.xml"
- />
+ >
+ </component>
<component
id="cmp_FactoranlyssPrlllnlyssHrn"
label="Parallel analysis (Horn)"
type="standard"
file="plugins/ParallelanalysisHorn.xml"
- />
+ >
+ </component>
<component
id="cmp_FctrnlyssVrySmplStrctrMAP"
label="Very Simple Structure/Minimum Average Partial"
type="standard"
file="plugins/VerySimpleStructureMinimumAveragePartial.xml"
- />
+ >
+ </component>
<component
id="cmp_FactoranalysisFactornlyss"
label="Factor analysis"
type="standard"
file="plugins/Factoranalysis.xml"
- />
+ >
+ </component>
</components>
<hierarchy>
<menu
Modified: branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/inst/rkward/rkwarddev_plugin_script_FA.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -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 principal component and factor analysis",
- version="0.01-9", url="http://rkward.sf.net", long.desc="RKWard GUI to conduct principal component and factor analysis (using the psych package). Also includes dialogs for scree plots, correlation plots, VSS/MAP and parallel analysis."),
- dependencies=list(rkward.min="0.5.6"),
+ version="0.01-10", url="http://rkward.sf.net", long.desc="RKWard GUI to conduct principal component and factor analysis (using the psych package). Also includes dialogs for scree plots, correlation plots, VSS/MAP and parallel analysis.")
+ )
+dependencies.info <- rk.XML.dependencies(
+ dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6")),
package=list(c(name="psych", min="1.1.10"))
- )
+)
#############
@@ -394,6 +398,7 @@
js=list(
require="psych",
doPrintout=scree.js.print),
+ guess.getter=guess.getter,
hierarchy=list("analysis", "Factor analysis","Number of factors"),
create=c("xml", "js"))
@@ -481,6 +486,7 @@
js=list(
require="psych",
doPrintout=prll.js.print),
+ guess.getter=guess.getter,
hierarchy=list("analysis", "Factor analysis","Number of factors"),
create=c("xml", "js"))
@@ -591,6 +597,7 @@
require="psych",
calculate=vss.js.calc,
doPrintout=vss.js.print),
+ guess.getter=guess.getter,
hierarchy=list("analysis", "Factor analysis","Number of factors"),
create=c("xml", "js"))
@@ -664,6 +671,7 @@
js=list(results.header="\"Correlation plot\"",
require="psych",
doPrintout=crplt.js.print),
+ guess.getter=guess.getter,
hierarchy=list("plots", "Factor analysis"),
create=c("xml", "js"))
@@ -676,6 +684,7 @@
rk.FactorAnalysis.dir <<- rk.plugin.skeleton(
about.info,
path=output.dir,
+ guess.getter=guess.getter,
xml=list(
logic=lgc.sect,
dialog=full.dialog),
@@ -691,6 +700,7 @@
crplt.component,
prll.component,
vss.component),
+ dependencies=dependencies.info,
create=c("pmap", "xml", "js", "desc"),
overwrite=overwrite,
tests=FALSE,
Modified: branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd
===================================================================
--- branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.FactorAnalysis/man/rk.FactorAnalysis-package.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -2,15 +2,15 @@
\name{rk.FactorAnalysis-package}
\alias{rk.FactorAnalysis}
\alias{rk.FactorAnalysis-package}
-\title{RKWard GUI to conduct principal component and factor analysis.}
+\title{The rk.FactorAnalysis Package}
\description{
RKWard GUI to conduct principal component and factor
analysis.
}
\details{
\tabular{ll}{ Package: \tab rk.FactorAnalysis\cr Type:
- \tab Package\cr Version: \tab 0.01-9\cr Date: \tab
- 2012-10-08\cr Depends: \tab rkward (>= 0.5.6)\cr
+ \tab Package\cr Version: \tab 0.01-10\cr Date: \tab
+ 2013-02-24\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 }
Modified: branches/external_plugins/rk.MultidimensionalScaling/ChangeLog
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/ChangeLog 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/ChangeLog 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,9 @@
ChangeLog for package rk.MultidimensionalScaling
+changes in version 0.01-5 (2013-02-24)
+changed:
+ - updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+
changes in version 0.01-4 (2012-09-29)
fixed:
- added generic pre/post plot options
Modified: branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,8 +1,8 @@
Package: rk.MultidimensionalScaling
Type: Package
Title: RKWard GUI for multidimensional scaling
-Version: 0.01-4
-Date: 2012-09-29
+Version: 0.01-5
+Date: 2013-02-24
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
Depends:
Modified: branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rk.MultidimensionalScaling\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.01-4\cr
-#' Date: \tab 2012-09-29\cr
+#' Version: \tab 0.01-5\cr
+#' Date: \tab 2013-02-24\cr
#' Depends: \tab rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' License: \tab GPL (>= 3)\cr
@@ -17,7 +17,7 @@
#' @aliases rk.MultidimensionalScaling-package rk.MultidimensionalScaling
#' @name rk.MultidimensionalScaling-package
#' @docType package
-#' @title RKWard GUI for multidimensional scaling.
+#' @title The rk.MultidimensionalScaling Package
#' @author Meik Michalke \email{meik.michalke@@hhu.de}
#' @keywords package
NULL
Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,13 +1,13 @@
bibentry("Manual",
title="rk.MultidimensionalScaling: RKWard GUI for multidimensional scaling",
author="Meik Michalke",
- year="2012",
- note="(Version 0.01-4)",
+ year="2013",
+ note="(Version 0.01-5)",
url="http://rkward.sf.net",
textVersion =
- paste("Michalke, M. (2012). ",
- "rk.MultidimensionalScaling: RKWard GUI for multidimensional scaling (Version 0.01-4). ",
+ paste("Michalke, M. (2013). ",
+ "rk.MultidimensionalScaling: RKWard GUI for multidimensional scaling (Version 0.01-5). ",
"Available from http://rkward.sf.net",
sep=""),
Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,12 @@
\name{NEWS}
\title{News for Package 'rk.MultidimensionalScaling'}
+\section{Changes in rk.MultidimensionalScaling version 0.01-5 (2013-02-24)}{
+ \subsection{changed}{
+ \itemize{
+ \item updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+ }
+ }
+}
\section{Changes in rk.MultidimensionalScaling version 0.01-4 (2012-09-29)}{
\subsection{fixed}{
\itemize{
Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.js
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.js 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.js 2013-02-24 20:17:27 UTC (rev 4560)
@@ -103,10 +103,11 @@
var frmPltlblsfChecked = getValue("frm_Pltlblsf.checked");
if(chcPltrslts) {
echo("\n");
+ var embRkwrdclrchsGCodePrintout = getValue("emb_rkwrdclrchsG.code.printout");
// in case there are generic plot options defined:
- var embGnrcpltpCodePreprocess = getValue("emb_Gnrcpltp.code.preprocess");
- var embGnrcpltpCodePrintout = getValue("emb_Gnrcpltp.code.printout");
- var embGnrcpltpCodeCalculate = getValue("emb_Gnrcpltp.code.calculate");
+ var embRkwrdpltptnGCodePreprocess = getValue("emb_rkwrdpltptnG.code.preprocess");
+ var embRkwrdpltptnGCodePrintout = getValue("emb_rkwrdpltptnG.code.printout");
+ var embRkwrdpltptnGCodeCalculate = getValue("emb_rkwrdpltptnG.code.calculate");
if(full) {
echo("rk.graph.on()\n");
@@ -114,25 +115,24 @@
echo("\ttry({\n");
// insert any option-setting code that should be run before the actual plotting commands:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodePreprocess, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodePreprocess, "\n", "");
// the actual plot:
// label text color:
- var embOptnsrkwCodePrintout = getValue("emb_Optnsrkw.code.printout");
echo("\t\tplot(mds.result");
if(drpSclngmth == "isoMDS" || drpSclngmth == "sammon") {
echo("[[\"points\"]]");
}
- if(!embGnrcpltpCodePrintout.match(/main\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/main\s*=/)) {
echo(",\n\t\t\tmain=\"Multidimensional scaling\"");
}
- if(!embGnrcpltpCodePrintout.match(/sub\s*=/)) {
+ if(!embRkwrdpltptnGCodePrintout.match(/sub\s*=/)) {
echo(",\n\t\t\tsub=\"Solution with " + spnMxmmdmns + " dimensions (" + drpSclngmth + ")\"");
}
if(frmPltlblsfChecked && drpTextpstn == 0) {
echo(",\n\t\t\ttype=\"n\"");
}
- echo(embGnrcpltpCodePrintout.replace(/, /g, ",\n\t\t\t"));
+ echo(embRkwrdpltptnGCodePrintout.replace(/, /g, ",\n\t\t\t"));
echo(")");
if(frmPltlblsfChecked) {
echo("\n\t\ttext(mds.result");
@@ -147,11 +147,11 @@
if(drpTextpstn != 0) {
echo(",\n\t\t\tpos=" + drpTextpstn);
}
- echo(embOptnsrkwCodePrintout + ")");
+ echo(embRkwrdclrchsGCodePrintout + ")");
}
// insert any option-setting code that should be run after the actual plot:
- printIndentedUnlessEmpty("\t\t", embGnrcpltpCodeCalculate, "\n", "");
+ printIndentedUnlessEmpty("\t\t", embRkwrdpltptnGCodeCalculate, "\n", "");
echo("\n\t})\n");
if(full) {
Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
@@ -33,10 +33,10 @@
</script>
<convert id="lgc_drpCmptt" sources="drp_Cmpttnmt.string" mode="equals" standard="minkowski" />
<connect governor="lgc_drpCmptt" client="spn_PwrfMnkw.enabled" />
- <connect governor="chc_Pltrslts.state" client="row_cPPOTT08TT.enabled" />
+ <connect governor="chc_Pltrslts.state" client="row_cPPGTT08TT.enabled" />
<convert id="lgc_frmDtprp" sources="frm_Dtprprtn.enabled" mode="equals" standard="true" />
<connect governor="lgc_frmDtprp" client="frm_Dstncmtr.enabled" />
- <set id="emb_Optnsrkw.color.string" to="red" />
+ <set id="emb_rkwrdclrchsG.color.string" to="red" />
</logic>
<dialog label="Multidimensional scaling">
<tabbook>
@@ -97,10 +97,10 @@
</row>
</tab>
<tab label="Plot" id="tab_Plot">
- <row id="row_cPPOTT08TT">
- <column id="clm_fPPOTT08TT">
+ <row id="row_cPPGTT08TT">
+ <column id="clm_fPPGTT08TT">
<frame label="Plot labels (from row names of data)" checkable="true" id="frm_Pltlblsf">
- <embed component="rkward::color_chooser" id="emb_Optnsrkw" />
+ <embed component="rkward::color_chooser" id="emb_rkwrdclrchsG" />
<spinbox label="Text size" id="spn_Textsize" initial="0.8" />
<dropdown id="drp_Textpstn" label="Text position">
<option label="Instead of point" value="0" />
@@ -111,7 +111,7 @@
</dropdown>
</frame>
<stretch />
- <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_Gnrcpltp" />
+ <embed component="rkward::plot_options" as_button="true" label="Generic plot options" id="emb_rkwrdpltptnG" />
<preview />
</column>
</row>
Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,18 +1,22 @@
-<!DOCTYPE rkpluginmap>
+<!DOCTYPE rkpluginmap >
<document
- namespace="rkward"
+ namespace="Multidimensionalscaling"
id="Multidimensionalscaling_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="MASS" />
+ </dependencies>
<about
name="rk.MultidimensionalScaling"
shortinfo="RKWard GUI for multidimensional scaling"
longinfo="RKWard GUI for multidimensional scaling"
- version="0.01-4"
- releasedate="2012-09-29"
+ version="0.01-5"
+ releasedate="2013-02-24"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
@@ -22,18 +26,11 @@
email="meik.michalke at hhu.de"
role="aut, cre"
/>
- <dependencies rkward_min_version="0.5.6">
- <package name="MASS" />
- <!--
- 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
@@ -41,7 +38,8 @@
label="Multidimensional scaling"
type="standard"
file="plugins/Multidimensionalscaling.xml"
- />
+ >
+ </component>
</components>
<hierarchy>
<menu
Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -9,6 +9,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
about.info <- rk.XML.about(
name="rk.MultidimensionalScaling",
@@ -16,10 +18,12 @@
person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut","cre"))),
about=list(desc="RKWard GUI for multidimensional scaling",
- version="0.01-4", url="http://rkward.sf.net"),
- dependencies=list(rkward.min="0.5.6"),
+ version="0.01-5", 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="MASS"))
- )
+)
############
## prepare data
@@ -238,6 +242,7 @@
mds.plugin.dir <<- rk.plugin.skeleton(
about.info,
path=output.dir,
+ guess.getter=guess.getter,
xml=list(
dialog=mds.full.dialog,
logic=lgc.sect.mds),
@@ -247,6 +252,7 @@
calculate=mds.js.calc,
doPrintout=mds.js.plot),
pluginmap=list(name="Multidimensional scaling", hierarchy=list("analysis")),
+ dependencies=dependencies.info,
create=c("pmap", "xml", "js", "desc"),
overwrite=overwrite,
tests=FALSE,
Modified: branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -2,14 +2,14 @@
\name{rk.MultidimensionalScaling-package}
\alias{rk.MultidimensionalScaling}
\alias{rk.MultidimensionalScaling-package}
-\title{RKWard GUI for multidimensional scaling.}
+\title{The rk.MultidimensionalScaling Package}
\description{
RKWard GUI for multidimensional scaling.
}
\details{
\tabular{ll}{ Package: \tab rk.MultidimensionalScaling\cr
- Type: \tab Package\cr Version: \tab 0.01-4\cr Date: \tab
- 2012-09-29\cr Depends: \tab rkward (>= 0.5.6)\cr
+ Type: \tab Package\cr Version: \tab 0.01-5\cr Date: \tab
+ 2013-02-24\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 }
Modified: branches/external_plugins/rk.subset/ChangeLog
===================================================================
--- branches/external_plugins/rk.subset/ChangeLog 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/ChangeLog 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,9 @@
ChangeLog for package rk.subset
+changes in version 0.01-2 (2013-02-24)
+changed:
+ - updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+
changes in version 0.01-1 (2012-10-20)
changed:
- initial release
Modified: branches/external_plugins/rk.subset/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.subset/DESCRIPTION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/DESCRIPTION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,8 +1,8 @@
Package: rk.subset
Type: Package
Title: RKWard GUI to define subsets of data objects
-Version: 0.01-1
-Date: 2012-10-20
+Version: 0.01-2
+Date: 2013-02-24
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
Depends:
Modified: branches/external_plugins/rk.subset/R/rk.subset-package.R
===================================================================
--- branches/external_plugins/rk.subset/R/rk.subset-package.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/R/rk.subset-package.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -3,9 +3,9 @@
#' \tabular{ll}{
#' Package: \tab rk.subset\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.01-1\cr
-#' Date: \tab 2012-10-20\cr
-#' Depends: \tab rkward (>= 0.5.6)\cr
+#' Version: \tab 0.01-2\cr
+#' Date: \tab 2013-02-24\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.subset-package rk.subset
#' @name rk.subset-package
#' @docType package
-#' @title RKWard GUI to define subsets of data objects.
+#' @title The rk.subset Package
#' @author Meik Michalke \email{meik.michalke@@hhu.de}
#' @keywords package
NULL
Modified: branches/external_plugins/rk.subset/inst/CITATION
===================================================================
--- branches/external_plugins/rk.subset/inst/CITATION 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/inst/CITATION 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,13 +1,13 @@
bibentry("Manual",
title="rk.subset: RKWard GUI to define subsets of data objects",
author="Meik Michalke",
- year="2012",
- note="(Version 0.01-1)",
+ year="2013",
+ note="(Version 0.01-2)",
url="http://rkward.sf.net",
textVersion =
- paste("Michalke, M. (2012). ",
- "rk.subset: RKWard GUI to define subsets of data objects (Version 0.01-1). ",
+ paste("Michalke, M. (2013). ",
+ "rk.subset: RKWard GUI to define subsets of data objects (Version 0.01-2). ",
"Available from http://rkward.sf.net",
sep=""),
Modified: branches/external_plugins/rk.subset/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.subset/inst/NEWS.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/inst/NEWS.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,5 +1,12 @@
\name{NEWS}
\title{News for Package 'rk.subset'}
+\section{Changes in rk.subset version 0.01-2 (2013-02-24)}{
+ \subsection{changed}{
+ \itemize{
+ \item updated rkwarddev generator script (compatibility with 0.06-2) and regenerated plugin code
+ }
+ }
+}
\section{Changes in rk.subset version 0.01-1 (2012-10-20)}{
\subsection{changed}{
\itemize{
Modified: branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml
===================================================================
--- branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,4 +1,4 @@
-<!DOCTYPE rkplugin>
+<!DOCTYPE rkplugin >
<document>
<!-- this code was generated using the rkwarddev package.
perhaps don't make changes here, but in the rkwarddev script instead! -->
Modified: branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap
===================================================================
--- branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap 2013-02-24 20:17:27 UTC (rev 4560)
@@ -1,18 +1,21 @@
-<!DOCTYPE rkpluginmap>
+<!DOCTYPE rkpluginmap >
<document
- namespace="rkward"
- id="Subsetofdata.frame_rkward"
+ namespace="Subsetofdata.frame"
+ id="Subsetofdataframe_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">
+ </dependencies>
<about
name="rk.subset"
shortinfo="RKWard GUI to define subsets of data objects"
longinfo="RKWard GUI to define subsets of data objects"
- version="0.01-1"
- releasedate="2012-10-20"
+ version="0.01-2"
+ releasedate="2013-02-24"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
@@ -22,25 +25,11 @@
email="meik.michalke at hhu.de"
role="aut, cre"
/>
- <dependencies rkward_min_version="0.5.6">
- <!--
- <package
- name="CHANGE_ME_OR_DELETE_ME"
- min_version="CHANGE_ME_OR_DELETE_ME"
- max_version="CHANGE_ME_OR_DELETE_ME"
- repository="CHANGE_ME_OR_DELETE_ME"
- />
- -->
- <!--
- 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
@@ -48,7 +37,8 @@
label="Subset of data.frame"
type="standard"
file="plugins/Subsetofdata.frame.xml"
- />
+ >
+ </component>
</components>
<hierarchy>
<menu
Modified: branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R
===================================================================
--- branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R 2013-02-24 20:17:27 UTC (rev 4560)
@@ -9,6 +9,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
about.info <- rk.XML.about(
name="rk.subset",
@@ -16,9 +18,11 @@
person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut","cre"))),
about=list(desc="RKWard GUI to define subsets of data objects",
- version="0.01-1", url="http://rkward.sf.net"),
- dependencies=list(rkward.min="0.5.6")
+ version="0.01-2", url="http://rkward.sf.net")
)
+dependencies.info <- rk.XML.dependencies(
+ dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6"))
+)
############
## re-usable objects
@@ -195,6 +199,7 @@
sset.plugin.dir <<- rk.plugin.skeleton(
about.info,
path=output.dir,
+ guess.getter=guess.getter,
xml=list(
dialog=sset.full.dialog,
logic=lgc.sect.sset
@@ -202,6 +207,7 @@
js=list(results.header=FALSE,
calculate=sset.js.calc),
pluginmap=list(name="Subset of data.frame", hierarchy=list("data")),
+ dependencies=dependencies.info,
create=c("pmap", "xml", "js", "desc"),
overwrite=overwrite,
tests=FALSE,
Modified: branches/external_plugins/rk.subset/man/rk.subset-package.Rd
===================================================================
--- branches/external_plugins/rk.subset/man/rk.subset-package.Rd 2013-02-24 18:57:34 UTC (rev 4559)
+++ branches/external_plugins/rk.subset/man/rk.subset-package.Rd 2013-02-24 20:17:27 UTC (rev 4560)
@@ -2,14 +2,14 @@
\name{rk.subset-package}
\alias{rk.subset}
\alias{rk.subset-package}
-\title{RKWard GUI to define subsets of data objects.}
+\title{The rk.subset Package}
\description{
RKWard GUI to define subsets of data objects.
}
\details{
\tabular{ll}{ Package: \tab rk.subset\cr Type: \tab
- Package\cr Version: \tab 0.01-1\cr Date: \tab
- 2012-10-20\cr Depends: \tab rkward (>= 0.5.6)\cr
+ Package\cr Version: \tab 0.01-2\cr Date: \tab
+ 2013-02-24\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