don't call classiFunc:: within makeParamSet() -> triggers rev dep failures

Author: pat-s

R/RLearner_classif_classiFunc.kernel.R

@@ -7,12 +7,14 @@ makeRLearner.classif.classiFunc.kernel = function() {
       makeNumericLearnerParam(id = "h",
         lower = 0, upper = Inf,
         default = 1),
-      # Using metricChoices since there are so many options and this 
+      # Using metricChoices since there are so many options and this
       # keeps stuff flexible.
+      # metric.choices: defined in helpers_fda.R
       makeDiscreteLearnerParam(id = "metric", default = "Euclidean",
-        values = classiFunc::metricChoices()),
+        values = metric.choices),
+      # kernel.choices: defined in helpers_fda.R
       makeDiscreteLearnerParam(id = "ker", default = "Ker.norm",
-        values = classiFunc::kerChoices()),
+        values = kernel.choices),
       makeIntegerLearnerParam(id = "nderiv", default = 0L, lower = 0L),
       makeLogicalLearnerParam(id = "derived", default = FALSE, tunable = FALSE),
       makeDiscreteLearnerParam(id = "deriv.method", default = "base.diff",

R/RLearner_classif_classiFunc.knn.R

@@ -5,10 +5,10 @@ makeRLearner.classif.classiFunc.knn = function() {
     package = "classiFunc",
     par.set = makeParamSet(
       makeIntegerLearnerParam(id = "knn", lower = 1L, default = 1L),
-      # Using metricChoices since there are so many options and this 
+      # Using metricChoices since there are so many options and this
       # keeps stuff flexible.
       makeDiscreteLearnerParam(id = "metric", default = "Euclidean",
-        values = classiFunc::metricChoices()),
+        values = metric.choices),
       makeIntegerLearnerParam(id = "q?", default = 0L, lower = 0L),
       makeIntegerLearnerParam(id = "nderiv", default = 0L, lower = 0L),
       makeLogicalLearnerParam(id = "derived", default = FALSE, tunable = FALSE),

R/helpers_fda.R

@@ -43,3 +43,6 @@ checkFDCols = function(data, col) {
   assertNumeric(data)
   return(data)
 }
+
+metric.choices = classiFunc::metricChoices()
+kernel.choices = classiFunc::kerChoices()