Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jakobbossek/ecr
Browse files Browse the repository at this point in the history
  • Loading branch information
jakobbossek committed Dec 9, 2015
2 parents dfa6704 + af75c70 commit 12e8eeb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
11 changes: 8 additions & 3 deletions R/makeGenerator.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,21 @@
#' Name of the generator.
#' @param description [\code{character(1)}]\cr
#' Short description of how the generator works.
#' @param params [\code{list}]\cr
#' Named list of the parameters the generator has been initialized with.
#' Default is the empty list.
#' @param supported [\code{character}]\cr
#' Vector of strings/names of supported parameter representations, i.e.,
#' 'permutation', 'float', 'binary' or 'custom'.
#' @return [\code{ecr_generator}]
#' Generator object.
#' @export
makeGenerator = function(generator, name, description,
supported = getAvailableRepresentations()) {
makeGenerator = function(
generator, name, description,
supported = getAvailableRepresentations(),
params = list()) {
assertFunction(generator, args = c("size", "task", "control"), ordered = TRUE)
generator = makeOperator(generator, name, description, supported)
generator = makeOperator(generator, name, description, supported, params)
generator = addClasses(generator, c("ecr_generator"))
return(generator)
}
6 changes: 5 additions & 1 deletion man/makeGenerator.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 12e8eeb

Please sign in to comment.