[Subgroup-commits] r62 - in pkg/rsubgroup: . R inst/java man

[noreply at r-forge.r-project.org]

Author: atzmueller
Date: 2015-06-19 09:12:54 +0200 (Fri, 19 Jun 2015)
New Revision: 62

Modified:
   pkg/rsubgroup/DESCRIPTION
   pkg/rsubgroup/NEWS
   pkg/rsubgroup/R/classes.R
   pkg/rsubgroup/R/subgroup.R
   pkg/rsubgroup/inst/java/subgroup.jar
   pkg/rsubgroup/man/SDTaskConfig-class.Rd
Log:
  * In SDTaskConfig, postfilter can be a single filter or a vector of filters,
  that are then applied in order on the results. This allows e.g., the combination
  of minimal improvement filtering with weighted covering post-processing. 

Modified: pkg/rsubgroup/DESCRIPTION
===================================================================
--- pkg/rsubgroup/DESCRIPTION	2015-06-18 14:48:11 UTC (rev 61)
+++ pkg/rsubgroup/DESCRIPTION	2015-06-19 07:12:54 UTC (rev 62)
@@ -2,7 +2,7 @@
 Type: Package
 Title: Subgroup Discovery and Analytics
 Version: 0.7
-Date: 2015-06-18
+Date: 2015-06-19
 Author: Martin Atzmueller
 Maintainer: Martin Atzmueller <martin at atzmueller.net>
 Description: A collection of efficient and effective tools and

Modified: pkg/rsubgroup/NEWS
===================================================================
--- pkg/rsubgroup/NEWS	2015-06-18 14:48:11 UTC (rev 61)
+++ pkg/rsubgroup/NEWS	2015-06-19 07:12:54 UTC (rev 62)
@@ -14,7 +14,10 @@
   very effective for pruning.
   * The Pattern class now contains a list of selection expressions (selectors)
   for the subgroup, not only the description. Using the is.pattern.matching
-  function, a match of a pattern and a data instance can be checked now. 
+  function, a match of a pattern and a data instance can be checked now.
+  * In SDTaskConfig, postfilter can be a single filter or a vector of filters,
+  that are then applied in order on the results. This allows e.g., the combination
+  of minimal improvement filtering with weighted covering post-processing. 
 
 * Bug fixes:
   * fix providing attributes=NULL (i.e., automatically include all attributes)

Modified: pkg/rsubgroup/R/classes.R
===================================================================
--- pkg/rsubgroup/R/classes.R	2015-06-18 14:48:11 UTC (rev 61)
+++ pkg/rsubgroup/R/classes.R	2015-06-19 07:12:54 UTC (rev 62)
@@ -29,6 +29,7 @@
 }
 
 setClassUnion(".vectorOrNull", members=c("vector", "NULL"))
+setClassUnion(".vectorOrCharacter", members=c("vector", "character"))
 
 setClass("SDTaskConfig",
     representation(
@@ -41,7 +42,7 @@
         maxlen      = "numeric",
         nodefaults  = "logical",
         relfilter   = "logical",
-        postfilter  = "character",
+        postfilter  = ".vectorOrCharacter",
         attributes  = ".vectorOrNull"
     ),
     prototype(qf="ps", method="sdmap", k = as.integer(20),

Modified: pkg/rsubgroup/R/subgroup.R
===================================================================
--- pkg/rsubgroup/R/subgroup.R	2015-06-18 14:48:11 UTC (rev 61)
+++ pkg/rsubgroup/R/subgroup.R	2015-06-19 07:12:54 UTC (rev 62)
@@ -99,8 +99,10 @@
   J(task, "setMaxSGDSize", as.integer(config at maxlen))
   J(task, "setSuppressStrictlyIrrelevantSubgroups", config at relfilter)
   J(task, "setIgnoreDefaultValues", config at nodefaults)
-  if (config at postfilter != "") {
-    J(task, "setPostFilter", config at postfilter)
+  if ((length(config at postfilter) > 1) || (nchar(config at postfilter) > 0)) {
+    for (filter in config at postfilter) {
+      J(task, "setPostFilter", filter)
+    }
   }
   if (is.null(config at attributes)) {
     attributesArrayObject <- .GetAllAttributesAsJArray(ontology = ontology)

Modified: pkg/rsubgroup/inst/java/subgroup.jar
===================================================================
(Binary files differ)

Modified: pkg/rsubgroup/man/SDTaskConfig-class.Rd
===================================================================
--- pkg/rsubgroup/man/SDTaskConfig-class.Rd	2015-06-18 14:48:11 UTC (rev 61)
+++ pkg/rsubgroup/man/SDTaskConfig-class.Rd	2015-06-19 07:12:54 UTC (rev 62)
@@ -48,7 +48,7 @@
 	patterns are filtered during pattern mining; negatively
 	impacts performance (default \code{relfilter = FALSE})).}
 	\item{\code{postfilter}:}{Controls, whether a post-processing
-	filter is applied; one of:
+	filter is applied; one (or a vector) of:
 	Minimum Improvement (Global) \code{min-improve-global},
 	checks the patterns against all possible generalizations,
 	Minimum Improvement (Pattern Set) \code{min-improve-set},
@@ -61,7 +61,10 @@
 	(0.05 level) w.r.t. all their possible generalizations,
 	Significant Improvement (Set) \code{sig-improve-set},
 	removes patterns that do not significantly improve
-	(0.05 level) w.r.t. all generalizations in the result set.
+	(0.05 level) w.r.t. all generalizations in the result set,
+	Weighted Covering \code{weighted-covering}, performs weighted
+	covering on the data in order to select a covering set of
+	subgroups while reducing the overlap on the data. 
 	By default no postfilter is set, i.e., \code{postfilter = ""}.
 	}
 	\item{\code{attributes}:}{The list of attributes to consider for mining.