fixing FeatureEngineering bug

the FeatureEngineering was getting the featureEngineering settings from the trainData rather than the trainData$covariateData
OHDSI · Dec 17, 2024 · ab80872 · ab80872
1 parent fbea755
commit ab80872
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/R/CyclopsModels.R b/R/CyclopsModels.R
@@ -188,7 +188,7 @@ fitCyclopsModel <- function(
     model = modelTrained,
 
     preprocessing = list(
-      featureEngineering = attr(trainData, "metaData")$featureEngineering,#learned mapping
+      featureEngineering = attr(trainData$covariateData, "metaData")$featureEngineering,#learned mapping
       tidyCovariates = attr(trainData$covariateData, "metaData")$tidyCovariateDataSettings,  #learned mapping
       requireDenseMatrix = F
     ),

diff --git a/R/KNN.R b/R/KNN.R
@@ -123,7 +123,7 @@ fitKNN <- function(trainData, modelSettings, search = 'none', analysisId, ...){
     model = indexFolder,
 
     preprocessing = list(
-      featureEngineering = attr(trainData, "metaData")$featureEngineering,#learned mapping
+      featureEngineering = attr(trainData$covariateData, "metaData")$featureEngineering,#learned mapping
       tidyCovariates = attr(trainData$covariateData, "metaData")$tidyCovariateDataSettings,  #learned mapping
       requireDenseMatrix = F
     ),

diff --git a/R/RClassifier.R b/R/RClassifier.R
@@ -60,7 +60,7 @@ fitRclassifier <- function(
     model = cvResult$model,
 
     preprocessing = list(
-      featureEngineering = attr(trainData, "metaData")$featureEngineering,
+      featureEngineering = attr(trainData$covariateData, "metaData")$featureEngineering,
       tidyCovariates = attr(trainData$covariateData, "metaData")$tidyCovariateDataSettings, 
       requireDenseMatrix = F
     ),

diff --git a/R/SklearnClassifier.R b/R/SklearnClassifier.R
@@ -91,7 +91,7 @@ fitSklearn <- function(trainData,
   result <- list(
     model = file.path(outLoc),
     preprocessing = list(
-      featureEngineering = attr(trainData, "metaData")$featureEngineering,
+      featureEngineering = attr(trainData$covariateData, "metaData")$featureEngineering,
       tidyCovariates = attr(trainData$covariateData, "metaData")$tidyCovariateDataSettings,
       requireDenseMatrix = attr(param, "settings")$requiresDenseMatrix
     ),