[rkward-cvs] SF.net SVN: rkward-code:[4696] branches/external_plugins/rk.ClusterAnalysis
m-eik at users.sf.net
m-eik at users.sf.net
Sat Apr 13 21:39:25 UTC 2013
Revision: 4696
http://sourceforge.net/p/rkward/code/4696
Author: m-eik
Date: 2013-04-13 21:39:25 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
fixed cluster analysis plugin (broken since 0.6.0)
Modified Paths:
--------------
branches/external_plugins/rk.ClusterAnalysis/ChangeLog
branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap
branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rkwarddev_CA_plugin_script.R
Modified: branches/external_plugins/rk.ClusterAnalysis/ChangeLog
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/ChangeLog 2013-04-12 18:08:16 UTC (rev 4695)
+++ branches/external_plugins/rk.ClusterAnalysis/ChangeLog 2013-04-13 21:39:25 UTC (rev 4696)
@@ -1,5 +1,10 @@
ChangeLog for package rk.ClusterAnalysis
+changes in version 0.01-10 (2013-04-12)
+fixed:
+ - corrected logic sections in hierarchical CA and determine number of clusters dialogs
+ (distance calculation was not correctly enabled/disabled)
+
changes in version 0.01-9 (2013-04-04)
added:
- debianized the plugin
Modified: branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION 2013-04-12 18:08:16 UTC (rev 4695)
+++ branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION 2013-04-13 21:39:25 UTC (rev 4696)
@@ -1,22 +1,18 @@
Package: rk.ClusterAnalysis
Type: Package
-Title: RKWard GUI to conduct k-means, model based and hierarchical cluster
- analyses
-Version: 0.01-9
-Date: 2013-04-04
+Title: RKWard GUI to conduct k-means, model based and hierarchical
+ cluster analyses
+Version: 0.01-10
+Date: 2013-04-13
Author: Meik Michalke <meik.michalke at hhu.de>
Maintainer: Meik Michalke <meik.michalke at hhu.de>
-Depends:
- rkward (>= 0.5.6)
-Suggests:
- mclust
+Depends: rkward (>= 0.5.6)
+Suggests: mclust
Enhances: rkward
-Description: RKWard GUI to conduct k-means, model based and hierarchical
- cluster analyses
+Description: RKWard GUI to conduct k-means, model based and
+ hierarchical cluster analyses
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"))
-Collate:
- 'rk.ClusterAnalysis-package.R'
+ email="meik.michalke at hhu.de", role=c("aut", "cre"))
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml 2013-04-12 18:08:16 UTC (rev 4695)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/Determinenumberofclusters.xml 2013-04-13 21:39:25 UTC (rev 4696)
@@ -33,11 +33,10 @@
</script>
<convert id="lgc_drpCmptt" sources="drp_Cmpttnmt.string" mode="equals" standard="minkowski" />
<connect governor="lgc_drpCmptt" client="spn_PwrfMnkw.enabled" />
- <convert id="lgc_frmDtprp" sources="frm_Dtprprtn.enabled" mode="equals" standard="true" />
- <connect governor="lgc_frmDtprp" client="frm_Dstncmtr.enabled" />
- <connect governor="lgc_frmDtprp" client="rad_Method.enabled" />
+ <connect governor="frm_Dtprprtn.enabled" client="frm_Dstncmtr.enabled" />
+ <connect governor="frm_Dtprprtn.enabled" client="rad_Method.enabled" />
<convert id="lgc_rdMthdhc" sources="rad_Method.string" mode="equals" standard="hclust" />
- <convert id="lgc_lgcrdMtD" sources="lgc_rdMthdhc;lgc_frmDtprp" mode="and" />
+ <convert id="lgc_lgcrdMtD" sources="lgc_rdMthdhc;frm_Dtprprtn.enabled" mode="and" />
<connect governor="lgc_lgcrdMtD" client="frm_Dstncmtr.enabled" />
<connect governor="lgc_rdMthdhc" client="frm_Clustrng.enabled" />
</logic>
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml 2013-04-12 18:08:16 UTC (rev 4695)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/plugins/HierarchicalCA.xml 2013-04-13 21:39:25 UTC (rev 4696)
@@ -35,8 +35,7 @@
<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" />
+ <connect governor="frm_Dtprprtn.enabled" client="frm_Dstncmtr.enabled" />
</logic>
<dialog label="Cluster analysis: Hierarchical">
<row id="row_vSSDSUUSSS">
Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap 2013-04-12 18:08:16 UTC (rev 4695)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap 2013-04-13 21:39:25 UTC (rev 4696)
@@ -15,8 +15,8 @@
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-9"
- releasedate="2013-04-04"
+ version="0.01-10"
+ releasedate="2013-04-13"
url="http://rkward.sf.net"
license="GPL (>= 3)"
>
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-04-12 18:08:16 UTC (rev 4695)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rkwarddev_CA_plugin_script.R 2013-04-13 21:39:25 UTC (rev 4696)
@@ -18,7 +18,7 @@
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-9", url="http://rkward.sf.net")
+ version="0.01-10", url="http://rkward.sf.net")
)
dependencies.info <- rk.XML.dependencies(
dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6")),
@@ -92,8 +92,7 @@
gov.data <- rk.XML.convert(sources=list(available=var.data), mode=c(notequals=""))
lgc.enable.selected <- rk.XML.connect(governor=gov.data, client=frame.selected.vars, set="enabled")
# disable distance computation, if dist object given
-gov.isntDistData <- rk.XML.convert(sources=list(enabled=clust.pre.frame), mode=c(equals="true"))
-lgc.isntDistData <- rk.XML.connect(governor=gov.isntDistData, client=clust.h.frame.dist, set="enabled")
+lgc.isntDistData <- rk.XML.connect(governor=clust.pre.frame, get="enabled", client=clust.h.frame.dist, set="enabled")
# for JavaScript
js.frm.subset <- rk.JS.vars(frame.selected.vars, modifiers="checked") # see if the frame is checked
@@ -266,7 +265,6 @@
rk.XML.set(generic.plot.options, set="allow_type", to=FALSE),
rk.XML.set(generic.plot.options, set="axistypes.visible", to=FALSE),
rk.XML.set(generic.plot.options, set="scale.visible", to=FALSE),
- gov.isntDistData,
lgc.isntDistData
)
@@ -497,11 +495,10 @@
}", js=FALSE)),
CA.gov.dist.num <- rk.XML.convert(sources=list(string=clust.h.drop.dist), mode=c(equals="minkowski")),
rk.XML.connect(governor=CA.gov.dist.num, client=clust.h.spin.pwmink, set="enabled"),
- gov.isntDistData,
lgc.isntDistData,
- rk.XML.connect(governor=gov.isntDistData, client=clust.num.radio.type, set="enabled"),
+ rk.XML.connect(governor=clust.pre.frame, get="enabled", client=clust.num.radio.type, set="enabled"),
CA.gov.dist.num.type <- rk.XML.convert(sources=list(string=clust.num.radio.type), mode=c(equals="hclust")),
- CA.gov.dist.notDistData <- rk.XML.convert(sources=list(CA.gov.dist.num.type, gov.isntDistData), mode=c(and="")),
+ CA.gov.dist.notDistData <- rk.XML.convert(sources=list(CA.gov.dist.num.type, enabled=clust.pre.frame), mode=c(and="")),
rk.XML.connect(governor=CA.gov.dist.notDistData, client=clust.num.frm.dist, set="enabled"),
rk.XML.connect(governor=CA.gov.dist.num.type, client=clust.num.frm.clst, set="enabled")
)
More information about the rkward-tracker
mailing list