[rkward-cvs] SF.net SVN: rkward:[4384] branches/external_plugins/rk.subset

m-eik at users.sourceforge.net m-eik at users.sourceforge.net
Sat Oct 20 13:32:51 UTC 2012


Revision: 4384
          http://rkward.svn.sourceforge.net/rkward/?rev=4384&view=rev
Author:   m-eik
Date:     2012-10-20 13:32:51 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
updates to subset plugin; limited to data.frames and subsetting by variables of the same object, but it's a start

Modified Paths:
--------------
    branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R

Added Paths:
-----------
    branches/external_plugins/rk.subset/DESCRIPTION
    branches/external_plugins/rk.subset/NAMESPACE
    branches/external_plugins/rk.subset/R/
    branches/external_plugins/rk.subset/inst/rkward/plugins/
    branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.js
    branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml
    branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap

Added: branches/external_plugins/rk.subset/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.subset/DESCRIPTION	                        (rev 0)
+++ branches/external_plugins/rk.subset/DESCRIPTION	2012-10-20 13:32:51 UTC (rev 4384)
@@ -0,0 +1,15 @@
+Package: rk.subset
+Type: Package
+Title: RKWard GUI to define subsets of data objects
+Version: 0.01-1
+Date: 2012-10-20
+Author: Meik Michalke <meik.michalke at hhu.de>
+Maintainer: Meik Michalke <meik.michalke at hhu.de>
+Depends: rkward (>= 0.5.6)
+Enhances: rkward
+Description: RKWard GUI to define subsets of data objects
+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"))

Added: branches/external_plugins/rk.subset/NAMESPACE
===================================================================
Added: branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.js
===================================================================
--- branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.js	                        (rev 0)
+++ branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.js	2012-10-20 13:32:51 UTC (rev 4384)
@@ -0,0 +1,81 @@
+// this code was generated using the rkwarddev package.
+//perhaps don't make changes here, but in the rkwarddev script instead!
+
+
+
+function preprocess(){
+	// add requirements etc. here
+
+}
+
+function calculate(){
+	// read in variables from dialog
+	var varData = getValue("var_data");
+	var vrslSlctdvrb = getValue("vrsl_Slctdvrb");
+	var vrslFilterby = getValue("vrsl_Filterby");
+	var drpFltrAll = getValue("drp_fltr_all");
+	var drpFltrFct = getValue("drp_fltr_fct");
+	var drpFltrLgc = getValue("drp_fltr_lgc");
+	var inpVlpstdss = getValue("inp_Vlpstdss");
+	var svbSvrsltst = getValue("svb_Svrsltst");
+	var frmOnlyssbsChecked = getValue("frm_Onlyssbs.checked");
+	var frmFltrrwsbChecked = getValue("frm_Fltrrwsb.checked");
+
+	// the R code to be evaluated
+	var frmOnlyssbsChecked = getValue("frm_Onlyssbs.checked");
+	var vrslSlctdvrbShortname = getValue("vrsl_Slctdvrb.shortname").split("\n").join("\", \"");
+	var frmFltrrwsbChecked = getValue("frm_Fltrrwsb.checked");
+	var vrslFilterbyShortname = getValue("vrsl_Filterby.shortname").split("\n").join("\", \"");
+	var drpFltrAllVisible = getValue("drp_fltr_all.visible");
+	var drpFltrFctVisible = getValue("drp_fltr_fct.visible");
+	var drpFltrLgcVisible = getValue("drp_fltr_lgc.visible");
+	var frmOnlyssbsChecked = getValue("frm_Onlyssbs.checked");
+	var vrslSlctdvrbShortname = getValue("vrsl_Slctdvrb.shortname").split("\n").join("\", \"");
+	var frmFltrrwsbChecked = getValue("frm_Fltrrwsb.checked");
+	var vrslFilterbyShortname = getValue("vrsl_Filterby.shortname").split("\n").join("\", \"");
+	echo("\tsset.result <- subset(");
+	if(varData) {
+		echo("\n\t\t" + varData);
+	}
+	if(drpFltrAllVisible == "true" && frmFltrrwsbChecked && vrslFilterbyShortname != "") {
+		if(drpFltrAll == "!%in%") {
+			echo(",\n\t\t!" + vrslFilterbyShortname + " %in% " + inpVlpstdss);
+		} else {
+			echo(",\n\t\t" + vrslFilterbyShortname + " " + drpFltrAll + " " + inpVlpstdss);
+		}
+	} else if(drpFltrFctVisible == "true" && frmFltrrwsbChecked && vrslFilterbyShortname != "") {
+		if(drpFltrFct == "!%in%") {
+			echo(",\n\t\t!" + vrslFilterbyShortname + " %in% " + inpVlpstdss);
+		} else {
+			echo(",\n\t\t" + vrslFilterbyShortname + " " + drpFltrFct + " " + inpVlpstdss);
+		}
+	} else if(drpFltrLgcVisible == "true" && frmFltrrwsbChecked) {
+		if(drpFltrLgc == "TRUE") {
+			echo(",\n\t\t" + vrslFilterbyShortname);
+		} else {
+			echo(",\n\t\t!" + vrslFilterbyShortname);
+		}
+	}
+	if(frmOnlyssbsChecked && vrslSlctdvrbShortname != "") {
+		echo(",\n\t\tselect=c(\"" + vrslSlctdvrbShortname + "\")");
+	}
+	echo("\n\t)\n\n");
+}
+
+function printout(){
+	// printout the results
+	echo("rk.header(\"Data subset\")\n");
+
+
+	//// save result object
+	// read in saveobject variables
+	var svbSvrsltst = getValue("svb_Svrsltst");
+	var svbSvrsltstActive = getValue("svb_Svrsltst.active");
+	var svbSvrsltstParent = getValue("svb_Svrsltst.parent");
+	// assign object to chosen environment
+	if(svbSvrsltstActive) {
+		echo(".GlobalEnv$" + svbSvrsltst + " <- sset.result\n");
+	}
+
+}
+

Added: branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml
===================================================================
--- branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml	                        (rev 0)
+++ branches/external_plugins/rk.subset/inst/rkward/plugins/Subsetofdata.frame.xml	2012-10-20 13:32:51 UTC (rev 4384)
@@ -0,0 +1,85 @@
+<!DOCTYPE rkplugin>
+<document>
+	<!-- this code was generated using the rkwarddev package.
+			perhaps don't make changes here, but in the rkwarddev script instead! -->
+	<code file="Subsetofdata.frame.js" />
+	<help file="Subsetofdata.frame.rkh" />
+	<include file="../rk.subset.pluginmap" />
+	<logic>
+		<script>
+			<![CDATA[ 
+				gui.addChangeCommand("vrsl_Filterby.available", "dataChanged()");
+							// this function is called whenever the data was changed
+							dataChanged = function(){
+									var filterFactor = "false";
+									var filterLogical = "false";
+									var filterAll = "true";
+									var enableVarInput = "true";
+									var requireVarInput = "false";
+									var thisObject = makeRObject(gui.getValue("vrsl_Filterby.available"));
+									 if(thisObject.classes()){
+										requireVarInput = "true";
+										if(thisObject.classes().indexOf("factor") != -1){
+											filterAll = "false";
+											filterFactor = "true";
+										} else if(thisObject.classes().indexOf("logical") != -1){
+											filterAll = "false";
+											filterLogical = "true";
+											enableVarInput = "false";
+											requireVarInput = "false";
+										} else {}
+									} else {}
+									gui.setValue("drp_fltr_fct.visible", filterFactor);
+									gui.setValue("drp_fltr_lgc.visible", filterLogical);
+									gui.setValue("drp_fltr_all.visible", filterAll);
+									gui.setValue("inp_Vlpstdss.enabled", enableVarInput);
+									gui.setValue("inp_Vlpstdss.required", requireVarInput);
+								} 
+			]]>
+		</script>
+		<set id="drp_fltr_fct.visible" to="false" />
+		<set id="drp_fltr_lgc.visible" to="false" />
+		<connect governor="current_object" client="var_data.available" />
+		<connect governor="var_data.available" client="vrs_Selectdt.root" />
+		<convert id="lgc_vardata" sources="var_data.available" mode="notequals" />
+		<connect governor="lgc_vardata" client="frm_Onlyssbs.enabled" />
+		<connect governor="lgc_vardata" client="frm_Fltrrwsb.enabled" />
+	</logic>
+	<dialog label="Subset of data">
+		<row id="row_vSSDSOOSSS">
+			<varselector id="vrs_Selectdt" label="Select data" />
+			<column id="clm_vDSOOSSSFF">
+				<varslot id="var_data" label="Data (data.frame)" source="vrs_Selectdt" classes="data.frame" required="true" />
+				<frame label="Only use a subset of variables" checkable="true" checked="false" id="frm_Onlyssbs">
+					<varslot id="vrsl_Slctdvrb" label="Selected variables" source="vrs_Selectdt" multi="true" />
+				</frame>
+				<frame label="Filter rows by variable" checkable="true" checked="false" id="frm_Fltrrwsb">
+					<varslot id="vrsl_Filterby" label="Filter by" source="vrs_Selectdt" />
+					<dropdown id="drp_fltr_all" label="Filter rule">
+						<option label="includes (%in%)" value="%in%" />
+						<option label="does not include (!%in%)" value="!%in%" />
+						<option label="is not equal (!=)" value="!=" />
+						<option label="is less (<)" value="<" />
+						<option label="is less or equal(<=)" value="<=" />
+						<option label="is equal (==)" value="==" checked="true" />
+						<option label="is greater or equal (>=)" value=">=" />
+						<option label="is greater (>)" value=">" />
+					</dropdown>
+					<dropdown id="drp_fltr_fct" label="Filter rule">
+						<option label="includes (%in%)" value="%in%" />
+						<option label="does not include (!%in%)" value="!%in%" />
+						<option label="is not equal (!=)" value="!=" />
+						<option label="is equal (==)" value="==" checked="true" />
+					</dropdown>
+					<dropdown id="drp_fltr_lgc" label="Filter rule">
+						<option label="is TRUE" value="TRUE" checked="true" />
+						<option label="is FALSE" value="FALSE" />
+					</dropdown>
+					<input label="Value (pasted as-is, use proper quoting!)" id="inp_Vlpstdss" />
+				</frame>
+				<stretch />
+				<saveobject label="Save results to workspace" checkable="true" checked="true" initial="sset.result" id="svb_Svrsltst" />
+			</column>
+		</row>
+	</dialog>
+</document>

Added: branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap
===================================================================
--- branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap	                        (rev 0)
+++ branches/external_plugins/rk.subset/inst/rkward/rk.subset.pluginmap	2012-10-20 13:32:51 UTC (rev 4384)
@@ -0,0 +1,69 @@
+<!DOCTYPE rkpluginmap>
+<document 
+	namespace="rkward"
+	id="Subsetofdata.frame_rkward"
+>
+	<!-- 
+		this code was generated using the rkwarddev package.
+			perhaps don't make changes here, but in the rkwarddev script instead! 
+	-->
+	<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"
+		url="http://rkward.sf.net"
+		license="GPL (>= 3)"
+	>
+		<author 
+			given="Meik"
+			family="Michalke"
+			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" /> 
+	-->
+	<components>
+		<component 
+			id="cmp_SubsetofdatafrmSbstfdtfrm"
+			label="Subset of data.frame"
+			type="standard"
+			file="plugins/Subsetofdata.frame.xml"
+		 />
+	</components>
+	<hierarchy>
+		<menu 
+			id="data"
+			label.data="Data"
+		>
+			<entry component="cmp_SubsetofdatafrmSbstfdtfrm" />
+		</menu>
+	</hierarchy>
+	<!-- 
+		<context id="x11">
+			</context> 
+	-->
+	<!-- 
+		<context id="import">
+			</context> 
+	-->
+</document>

Modified: branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R
===================================================================
--- branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R	2012-10-19 16:19:37 UTC (rev 4383)
+++ branches/external_plugins/rk.subset/inst/rkward/rkwarddev_plugin_script.R	2012-10-20 13:32:51 UTC (rev 4384)
@@ -26,58 +26,74 @@
 
 # for data
 var.select <- rk.XML.varselector(label="Select data")
-var.data <- rk.XML.varslot(label="Data (data.frame, matrix or vector)", source=var.select, classes=c("data.frame", "matrix", "vector"), required=TRUE, id.name="var_data")
+var.data <- rk.XML.varslot(label="Data (data.frame)", source=var.select, classes=c("data.frame"), required=TRUE, id.name="var_data")
 
 selected.vars <- rk.XML.varslot(label="Selected variables", source=var.select, multi=TRUE)
 frame.selected.vars <- rk.XML.frame(selected.vars, label="Only use a subset of variables", checkable=TRUE, chk=FALSE)
 
 filter.var <- rk.XML.varslot(label="Filter by", source=var.select)
 sset.filter.drop <- rk.XML.dropdown(label="Filter rule", options=list(
-		"includes (%in%)"=c(val="%in%", chk=TRUE),
-		"does not include (!%in%)"=c(val="!%in%", chk=TRUE),
+		"includes (%in%)"=c(val="%in%"),
+		"does not include (!%in%)"=c(val="!%in%"),
 		"is not equal (!=)"=c(val="!="),
 		"is less (<)"=c(val="<"),
 		"is less or equal(<=)"=c(val="<="),
 		"is equal (==)"=c(val="==", chk=TRUE),
 		"is greater or equal (>=)"=c(val=">="),
 		"is greater (>)"=c(val=">")
-	))
-# sset.spin.filter <- rk.XML.spinbox(label="Value", initial=0, real=TRUE)
+	), id.name="drp_fltr_all")
+sset.filter.drop.factor <- rk.XML.dropdown(label="Filter rule", options=list(
+		"includes (%in%)"=c(val="%in%"),
+		"does not include (!%in%)"=c(val="!%in%"),
+		"is not equal (!=)"=c(val="!="),
+		"is equal (==)"=c(val="==", chk=TRUE)
+	), id.name="drp_fltr_fct")
+sset.filter.drop.logical <- rk.XML.dropdown(label="Filter rule", options=list(
+		"is TRUE"=c(val="TRUE", chk=TRUE),
+		"is FALSE"=c(val="FALSE")
+	), id.name="drp_fltr_lgc")
 sset.input.filter <- rk.XML.input(label="Value (pasted as-is, use proper quoting!)")
 
 frame.filter.var <- rk.XML.frame(
 	filter.var,
 	sset.filter.drop,
-# 	sset.spin.filter,
+	sset.filter.drop.factor,
+	sset.filter.drop.logical,
 	sset.input.filter,
 	label="Filter rows by variable", checkable=TRUE, chk=FALSE)
 
 # # for logic sections
-# lgc.df.script <- rk.comment(id("
-# 	gui.addChangeCommand(\"", var.data, ".available\", \"dataChanged()\");
-# 	// this function is called whenever the data was changed
-# 	dataChanged = function(){
-# 			var prepareFrame = \"true\";
-# 			var selectFrame = \"true\";
-# 			var thisObject = makeRObject(gui.getValue(\"", var.data, ".available\"));
-# 			 if(thisObject.classes()){
-# 				if(!thisObject.isDataFrame()){
-# 					selectFrame = \"false\";
-# 					if(thisObject.classes().indexOf(\"dist\") != -1){
-# 						prepareFrame = \"false\";
-# 					} else {}
-# 				} else {}
-# 			} else {}
-# 			gui.setValue(\"", frame.selected.vars, ".enabled\", selectFrame);
-# 			gui.setValue(\"", clust.pre.frame, ".enabled\", prepareFrame);
-# 		}", js=FALSE))
+lgc.filter.script <- rk.comment(id("
+	gui.addChangeCommand(\"", filter.var, ".available\", \"dataChanged()\");
+	// this function is called whenever the data was changed
+	dataChanged = function(){
+			var filterFactor = \"false\";
+			var filterLogical = \"false\";
+			var filterAll = \"true\";
+			var enableVarInput = \"true\";
+			var requireVarInput = \"false\";
+			var thisObject = makeRObject(gui.getValue(\"", filter.var, ".available\"));
+			 if(thisObject.classes()){
+				requireVarInput = \"true\";
+				if(thisObject.classes().indexOf(\"factor\") != -1){
+					filterAll = \"false\";
+					filterFactor = \"true\";
+				} else if(thisObject.classes().indexOf(\"logical\") != -1){
+					filterAll = \"false\";
+					filterLogical = \"true\";
+					enableVarInput = \"false\";
+					requireVarInput = \"false\";
+				} else {}
+			} else {}
+			gui.setValue(\"", sset.filter.drop.factor, ".visible\", filterFactor);
+			gui.setValue(\"", sset.filter.drop.logical, ".visible\", filterLogical);
+			gui.setValue(\"", sset.filter.drop, ".visible\", filterAll);
+			gui.setValue(\"", sset.input.filter, ".enabled\", enableVarInput);
+			gui.setValue(\"", sset.input.filter, ".required\", requireVarInput);
+		}", js=FALSE))
 
-js.frm.subset <- rk.JS.vars(frame.selected.vars, modifiers="checked") # see if the frame is checked
-js.selected.vars <- rk.JS.vars(selected.vars, modifiers="shortname", join="\\\", \\\"") # get selected vars
-js.frm.filter <- rk.JS.vars(frame.filter.var, modifiers="checked") # see if the frame is checked
+save.results.sset <- rk.XML.saveobj("Save results to workspace", initial="sset.result", chk=TRUE)
 
-save.results.sset <- rk.XML.saveobj("Save results to workspace", initial="sset.result")
-
 tab.sset.data <- rk.XML.row(
 		var.select,
 		rk.XML.col(
@@ -94,42 +110,56 @@
 	label="Subset of data")
 
 ## logic section
-#  lgc.sect.sset <- rk.XML.logic(
-# 		gov.filter.lt <- rk.XML.convert(sources=list(string=sset.filter.drop), mode=c(equals="<"), id.name="lgc_flt_lt"),
-# 		gov.filter.le <- rk.XML.convert(sources=list(string=sset.filter.drop), mode=c(equals="<="), id.name="lgc_flt_le"),
-# 		gov.filter.gt <- rk.XML.convert(sources=list(string=sset.filter.drop), mode=c(equals=">"), id.name="lgc_flt_gt"),
-# 		gov.filter.ge <- rk.XML.convert(sources=list(string=sset.filter.drop), mode=c(equals=">="), id.name="lgc_flt_ge"),
-# 		gov.filter.numeric <- rk.XML.convert(sources=list(gov.filter.lt, gov.filter.le, gov.filter.gt, gov.filter.ge), mode=c(or="")),
-# 		lgc.enable.filter.spin <- rk.XML.connect(governor=gov.filter.numeric, client=sset.spin.filter, set="visible"),
-# 		lgc.enable.filter.spin <- rk.XML.connect(governor=gov.filter.numeric, client=sset.input.filter, set="visible", not=TRUE)
-#  	)
+  lgc.sect.sset <- rk.XML.logic(
+		lgc.filter.script,
+		rk.XML.set(sset.filter.drop.factor, set="visible", to="false"),
+		rk.XML.set(sset.filter.drop.logical, set="visible", to="false"),
+		rk.XML.connect(governor="current_object", client=var.data, set="available"),
+		rk.XML.connect(governor=var.data, client=var.select, get="available", set="root"),
+		sset.gov.data <- rk.XML.convert(sources=list(available=var.data), mode=c(notequals="")),
+ 		rk.XML.connect(governor=sset.gov.data, client=frame.selected.vars, set="enabled"),
+ 		rk.XML.connect(governor=sset.gov.data, client=frame.filter.var, set="enabled")
+  	)
 
 ## JavaScript
 
 sset.js.calc <- rk.paste.JS(
+	js.frm.subset <- rk.JS.vars(frame.selected.vars, modifiers="checked"), # see if the frame is checked
+	js.selected.vars <- rk.JS.vars(selected.vars, modifiers="shortname", join="\\\", \\\""), # get selected vars
+	js.frm.filter <- rk.JS.vars(frame.filter.var, modifiers="checked"), # see if the frame is checked
+	js.filter.var <- rk.JS.vars(filter.var, modifiers="shortname", join="\\\", \\\""), # get selected vars
+	js.filter.mode.all <- rk.JS.vars(sset.filter.drop, modifiers="visible"),
+	js.filter.mode.fct <- rk.JS.vars(sset.filter.drop.factor, modifiers="visible"),
+	js.filter.mode.lgc <- rk.JS.vars(sset.filter.drop.logical, modifiers="visible"),
 	js.frm.subset,
 	js.selected.vars,
 	js.frm.filter,
-# 	js.data.preparation,
+	js.filter.var,
 	echo("\tsset.result <- subset("),
 	ite(var.data, echo("\n\t\t", var.data)),
-	ite(id(js.frm.filter, " && ", sset.filter.drop, " != \"!%in%\""),
-		echo(",\n\t\t", filter.var, " ", sset.filter.drop, " ", sset.input.filter),
-		echo(",\n\t\t!", filter.var, " %in% ", sset.input.filter)
+	ite(id(js.filter.mode.all, " == \"true\" && ", js.frm.filter, " && ", js.filter.var, " != \"\""),
+		ite(id(sset.filter.drop, " == \"!%in%\""),
+			echo(",\n\t\t!", js.filter.var, " %in% ", sset.input.filter),
+			echo(",\n\t\t", js.filter.var, " ", sset.filter.drop, " ", sset.input.filter)
+		),
+		ite(id(js.filter.mode.fct, " == \"true\" && ", js.frm.filter, " && ", js.filter.var, " != \"\""),
+			ite(id(sset.filter.drop.factor, " == \"!%in%\""),
+				echo(",\n\t\t!", js.filter.var, " %in% ", sset.input.filter),
+				echo(",\n\t\t", js.filter.var, " ", sset.filter.drop.factor, " ", sset.input.filter)
+			),
+			ite(id(js.filter.mode.lgc, " == \"true\" && ", js.frm.filter),
+				ite(id(sset.filter.drop.logical, " == \"TRUE\""),
+					echo(",\n\t\t", js.filter.var),
+					echo(",\n\t\t!", js.filter.var)
+				)
+			)
+		)
 	),
 	ite(id(js.frm.subset, " && ", js.selected.vars, " != \"\""), echo(",\n\t\tselect=c(\"", js.selected.vars, "\")")),
-# 	echo(",\n\t\tcenters=", clust.k.spin.numcl),
-# 	ite(id(clust.k.drop.meth, " != \"Hartigan-Wong\""), echo(",\n\t\talgorithm=\"", clust.k.drop.meth,"\"")),
-# 	ite(id(clust.k.spin.maxiter, " != 10"), echo(",\n\t\titer.max=", clust.k.spin.maxiter)),
-# 	ite(id(clust.k.spin.nstart, " != 1"), echo(",\n\t\tnstart=", clust.k.spin.nstart)),
 	echo("\n\t)\n\n")
 )
 
 
-# # print selected subsets, if needed
-# js.prt.subset <- ite(id(js.frm.subset, " & ", js.selected.vars, " != \"\""),
-# 	echo("\nrk.header(\"Subset of variables included the analysis\", level=3)\nrk.print(list(\"", js.selected.vars, "\"))\n\n"))
-
 #############
 ## if you run the following function call, files will be written to tempdir!
 #############
@@ -139,12 +169,12 @@
 	about.info,
 	path=output.dir,
 	xml=list(
- 		dialog=sset.full.dialog#,
-#  		logic=lgc.sect.sset
+ 		dialog=sset.full.dialog,
+  		logic=lgc.sect.sset
 		),
 	js=list(results.header="\"Data subset\"",
 		calculate=sset.js.calc),
-	pluginmap=list(name="Subset of data objects", hierarchy=list("data")),
+	pluginmap=list(name="Subset of data.frame", hierarchy=list("data")),
 	create=c("pmap", "xml", "js", "desc"),
 	overwrite=overwrite,
 	tests=FALSE,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the rkward-tracker mailing list