X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=R%2Fagghoo.R;h=92d061f0a13790fc8ec5460b6619f4f60b63a51b;hb=cca5f1c67bd622fb7bc1279dfe4c3336d1446efd;hp=4a25b170e18636aa94789b15cb0697f7feaf4d7b;hpb=c5946158cae8f7b9400f107c533e745f835eb20f;p=agghoo.git

diff --git a/R/agghoo.R b/R/agghoo.R
index 4a25b17..92d061f 100644
--- a/R/agghoo.R
+++ b/R/agghoo.R
@@ -16,9 +16,9 @@
 #'        Default: see R6::Model.
 #' @param quality A function assessing the quality of a prediction.
 #'        Arguments are y1 and y2 (comparing a prediction to known values).
-#'        Default: see R6::Agghoo.
+#'        Default: see R6::AgghooCV.
 #'
-#' @return An R6::Agghoo object.
+#' @return An R6::AgghooCV object.
 #'
 #' @examples
 #' # Regression:
@@ -50,7 +50,7 @@ agghoo <- function(data, target, task = NA, gmodel = NA, params = NA, quality =
     params <- as.list(params)
   if (!is.na(params) && !is.list(params))
     stop("params: numerical, character, or list (passed to model)")
-  if (!is.na(gmodel) && !is.character(model) && is.na(params))
+  if (!is.na(gmodel) && !is.character(gmodel) && is.na(params))
     stop("params must be provided when using a custom model")
   if (is.na(gmodel) && !is.na(params))
     stop("model must be provided when using custom params")
@@ -66,8 +66,8 @@ agghoo <- function(data, target, task = NA, gmodel = NA, params = NA, quality =
   }
   # Build Model object (= list of parameterized models)
   model <- Model$new(data, target, task, gmodel, params)
-  # Return Agghoo object, to run and predict
-  Agghoo$new(data, target, task, model, quality)
+  # Return AgghooCV object, to run and predict
+  AgghooCV$new(data, target, task, model, quality)
 }
 
 #' compareToStandard