Skip to content

Commit

Permalink
cleaned up NAMESPACE and Generics.
Browse files Browse the repository at this point in the history
  • Loading branch information
mhahsler committed Apr 14, 2016
1 parent 5349128 commit 9c44eb5
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 32 deletions.
8 changes: 6 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ useDynLib(arules,
)

import("methods")

importFrom("stats", "predict", "aggregate", "as.dist", "cor",
"rpois", "p.adjust") ## we want to add methods
importFrom("utils", "head", "tail", "write.table") ## we want to add methods

importFrom("utils", "write.table") ## we want to add methods

import("graphics")

importFrom("Matrix", "summary", "image", "t") ## we need generics and methods
importFrom("Matrix", "summary", "image", "t",
"head", "tail") ## we need generics and methods
importFrom("Matrix", "drop0") ## we need functions
importClassesFrom("Matrix", "dgCMatrix", "ngCMatrix")
importMethodsFrom("Matrix", "crossprod", "rowSums", "colSums")
Expand Down
52 changes: 22 additions & 30 deletions R/AllGenerics.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.


## create generics
## create new generics
## FIXME: this complains because we add ...
setGeneric("abbreviate", function(names.arg, ...)
base::abbreviate(names.arg, ...))
Expand All @@ -27,9 +27,6 @@ setGeneric("abbreviate", function(names.arg, ...)
setGeneric("write",
function(x, file = "", ...) base::write(x, file, ...))


setGeneric("%in%")

setGeneric("%pin%",
function(x, table) standardGeneric("%pin%"))

Expand All @@ -42,8 +39,6 @@ setGeneric("LIST",
setGeneric("addComplement",
function(x, labels, complementLabels=NULL) standardGeneric("addComplement"))

setGeneric("aggregate")

setGeneric("coverage",
function(x, transactions = NULL, reuse = TRUE) standardGeneric("coverage"))

Expand All @@ -52,17 +47,12 @@ setGeneric("crossTable", function(x, ...) standardGeneric("crossTable"))
setGeneric("decode",
function(x, ...) standardGeneric("decode"))

setGeneric("duplicated")

setGeneric("encode",
function(x, ...) standardGeneric("encode"))

setGeneric("generatingItemsets",
function(x) standardGeneric("generatingItemsets"))

setGeneric("head")
setGeneric("tail")

setGeneric("info",
function(x) standardGeneric("info"))

Expand All @@ -72,8 +62,6 @@ setGeneric("info<-",
setGeneric("inspect",
function(x, ...) standardGeneric("inspect"))

setGeneric("intersect")

setGeneric("itemInfo",
function(object) standardGeneric("itemInfo"))

Expand Down Expand Up @@ -104,8 +92,6 @@ setGeneric("itemFrequency",
setGeneric("itemFrequencyPlot",
function(x, ...) standardGeneric("itemFrequencyPlot"))

setGeneric("is.element")

setGeneric("is.superset",
function(x, y = NULL, proper = FALSE, sparse = FALSE, ...) standardGeneric("is.superset"))

Expand All @@ -118,8 +104,6 @@ setGeneric("is.significant",
setGeneric("is.redundant",
function(x, ...) standardGeneric("is.redundant"))

setGeneric("labels")

setGeneric("lhs",
function(x) standardGeneric("lhs"))

Expand All @@ -130,9 +114,6 @@ setGeneric("interestMeasure",
function(x, measure, transactions = NULL, reuse = TRUE, ...)
standardGeneric("interestMeasure"))

setGeneric("match")
setGeneric("merge")

setGeneric("nitems",
function(x, ...) standardGeneric("nitems"))

Expand Down Expand Up @@ -169,11 +150,6 @@ setGeneric("rhs<-",
setGeneric("ruleInduction",
function(x, ...) standardGeneric("ruleInduction"))

setGeneric("sample")
setGeneric("sort")
setGeneric("setdiff")
setGeneric("setequal")

setGeneric("support",
function(x, transactions, ...) standardGeneric("support"))

Expand All @@ -184,9 +160,6 @@ setGeneric("supportingTransactions",
setGeneric("size",
function(x, ...) standardGeneric("size"))

setGeneric("subset")
setGeneric("summary")

setGeneric("tidLists", function(x) standardGeneric("tidLists"))

setGeneric("transactionInfo",
Expand All @@ -195,6 +168,26 @@ setGeneric("transactionInfo",
setGeneric("transactionInfo<-",
function(x, value) standardGeneric("transactionInfo<-"))

### make existing functions generic

#setGeneric("head") # generic in Matrix
#setGeneric("tail") # generic in Matrix
setGeneric("%in%")
setGeneric("aggregate")
setGeneric("duplicated")
setGeneric("intersect")
setGeneric("is.element")
# setGeneric("image") # is generic in Matrix
setGeneric("labels")
setGeneric("match")
setGeneric("merge")
setGeneric("sample")
setGeneric("setdiff")
setGeneric("setequal")
setGeneric("sort")
setGeneric("subset")
# setGeneric("summary") # is generic in Matrix
# setGeneric("t") # is generic in Matrix
setGeneric("union")
setGeneric("unique")

Expand All @@ -208,7 +201,6 @@ setGeneric("dissimilarity",
function(x, y = NULL, method = NULL, args = NULL, ...)
standardGeneric("dissimilarity"))

#setGeneric("predict",
# function(object, ...) standardGeneric("predict"))
setGeneric("predict")


0 comments on commit 9c44eb5

Please sign in to comment.