Fix randomSample default value for transformer and add error messages…

… if randomSamples is higher than amount of hyperparameters
OHDSI · Sep 7, 2022 · 4430e13 · 4430e13
1 parent 59446fc
commit 4430e13
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/R/MLP.R b/R/MLP.R
@@ -66,7 +66,12 @@ setMultiLayerPerceptron <- function(numLayers = c(1:8),
   )
 
   param <- PatientLevelPrediction::listCartesian(paramGrid)
-
+  if (randomSamples>length(param)) {
+    stop(paste("\n Chosen amount of randomSamples is higher than the amount of possible hyperparameter combinations.", 
+               "\n randomSamples:", randomSamples,"\n Possible hyperparameter combinations:", length(param),
+               "\n Please lower the amount of randomSamples"))
+  }
+
   if (hyperParamSearch == "random") {
     param <- param[sample(length(param), randomSample)]
   }

diff --git a/R/ResNet.R b/R/ResNet.R
@@ -73,6 +73,12 @@ setResNet <- function(numLayers = c(1:8),
 
   param <- PatientLevelPrediction::listCartesian(paramGrid)
 
+  if (randomSamples>length(param)) {
+    stop(paste("\n Chosen amount of randomSamples is higher than the amount of possible hyperparameter combinations.", 
+               "\n randomSamples:", randomSamples,"\n Possible hyperparameter combinations:", length(param),
+               "\n Please lower the amount of randomSamples"))
+  }
+
   if (hyperParamSearch == "random") {
     param <- param[sample(length(param), randomSample)]
   }

diff --git a/R/Transformer.R b/R/Transformer.R
@@ -26,7 +26,7 @@ setTransformer <- function(numBlocks = 3, dimToken = 96, dimOut = 1,
                            resDropout = 0, dimHidden = 512, weightDecay = 1e-6,
                            learningRate = 3e-4, batchSize = 1024,
                            epochs = 10, device = "cpu", hyperParamSearch = "random",
-                           randomSamples = 100, seed = NULL) {
+                           randomSamples = 1, seed = NULL) {
   if (is.null(seed)) {
     seed <- as.integer(sample(1e5, 1))
   }
@@ -54,6 +54,12 @@ setTransformer <- function(numBlocks = 3, dimToken = 96, dimOut = 1,
 
   param <- PatientLevelPrediction::listCartesian(paramGrid)
 
+  if (randomSamples>length(param)) {
+    stop(paste("\n Chosen amount of randomSamples is higher than the amount of possible hyperparameter combinations.", 
+               "\n randomSamples:", randomSamples,"\n Possible hyperparameter combinations:", length(param),
+               "\n Please lower the amount of randomSamples"))
+  }
+
   if (hyperParamSearch == "random") {
     param <- param[sample(length(param), randomSamples)]
   }