use correct object type

some autocomplete were using the wrong objects

Author: grlloyd

NAMESPACE

@@ -1,6 +1,8 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method(.DollarNames,chart)
+S3method(.DollarNames,iterator)
+S3method(.DollarNames,metric)
 S3method(.DollarNames,model)
 S3method(.DollarNames,optimiser)
 S3method(.DollarNames,preprocess)
@@ -146,6 +148,7 @@ importFrom(graphics,plot)
 importFrom(knitr,purl)
 importFrom(ontologyIndex,get_ontology)
 importFrom(stats,runif)
+importFrom(utils,.DollarNames)
 importFrom(utils,as.person)
 importFrom(utils,bibentry)
 importFrom(utils,capture.output)

R/chart_class.R

@@ -26,7 +26,7 @@
 #' @param ... named slots and their values that get passed to struct_class
 chart = function(...) {
     # new object
-    out = .chart(...)
+    out = new_struct('chart',...)
     return(out)
 }
 

R/generics.R

@@ -677,3 +677,6 @@ setGeneric("libraries",function(obj)standardGeneric("libraries"))
 #' @rdname ontology
 #' @export
 setGeneric("ontology",function(obj,cache=NULL)standardGeneric("ontology"))
+
+#' @importFrom utils .DollarNames
+setGeneric('.DollarNames', package='utils')

R/iterator_class.R

@@ -18,7 +18,7 @@
 #' @rdname iterator
 iterator = function(...) {
     # new object
-    out = .iterator(...)
+    out = new_struct('iterator',...)
     return(out)
 }
 
@@ -278,7 +278,7 @@ setMethod(f = 'as.code',
 
 # autocompletion, return sample_meta column names
 #' @export
-#' @method .DollarNames chart
+#' @method .DollarNames iterator
 #' @rdname autocompletion
 .DollarNames.iterator<- function(x, pattern = "") {
   .DollarNames.struct_class(x,pattern)

R/metric_class.R

@@ -16,7 +16,7 @@
 #' @rdname metric
 metric = function(...) {
     # new object
-    out = .metric(...)
+    out = new_struct('metric',...)
     return(out)
 }
 
@@ -114,7 +114,7 @@ setMethod(f = "show",
 # autocompletion, return sample_meta column names
 #' @export
 #' @rdname autocompletion
-#' @method .DollarNames chart
+#' @method .DollarNames metric
 .DollarNames.metric<- function(x, pattern = "") {
     .DollarNames.struct_class(x,pattern)
 }

R/model_class.R

@@ -37,7 +37,8 @@
 #' @rdname model
 model = function(predicted=character(0),seq_in='data',seq_fcn=function(x){return(x)},...) {
     # new object
-    out = .model(predicted = predicted,
+    out = new_struct('model',
+        predicted = predicted,
         seq_in = seq_in,
         seq_fcn = seq_fcn,
         ...)

R/model_list_class.R

@@ -20,7 +20,7 @@
 #' @rdname model_seq
 model_seq = function(...) {
     # new object
-    out = .model_seq(...)
+    out = new_struct('model_seq',...)
     return(out)
 }
 

R/optimiser_class.R

@@ -13,7 +13,7 @@
 #' @return an optimiser object
 optimiser = function(...) {
     # new object
-    out = .optimiser(...)
+    out = new_struct('optimiser',...)
     return(out)
 }
 

R/preprocess_class.R

@@ -13,7 +13,7 @@
 #' @rdname preprocessing
 preprocess = function(...) {
     # new object
-    out = .preprocess(...)
+    out = new_struct('preprocess',...)
     return(out)
 }
 

R/resampler_class.R

@@ -11,7 +11,7 @@
 #' @return a resampler object
 resampler = function(...) {
     # new object
-    out = .resampler(...)
+    out = new_struct('resampler',...)
     return(out)
 }