Further speeding up creation of reference table

OHDSI · Nov 2, 2023 · bcd6320 · bcd6320
1 parent 5886fb1
commit bcd6320
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -41,7 +41,8 @@ Imports:
 	checkmate,
 	readr,
 	ResultModelManager,
-	zip
+	zip,
+	jsonlite
 Suggests:
 	testthat,
 	knitr,

diff --git a/R/RunAnalyses.R b/R/RunAnalyses.R
@@ -574,16 +574,16 @@ createReferenceTable <- function(sccsAnalysisList,
       )
     )
   }
-
   # Compute unions of concept sets
-  uniqueLoads <- unique(loads)
+  loadStrings <- sapply(loads, jsonlite::toJSON)
+  uniqueLoadStrings <- unique(loadStrings)
   referenceTable$sccsDataFile <- ""
   referenceTable$loadId <- NA
   loadConceptsPerLoad <- list()
-  for (loadId in seq_along(uniqueLoads)) {
-    uniqueLoad <- uniqueLoads[[loadId]]
+  for (loadId in seq_along(uniqueLoadStrings)) {
+    uniqueLoadString <- uniqueLoadStrings[[loadId]]
     # groupables <- ParallelLogger::matchInList(instantiatedArgsPerRow, uniqueLoad)
-    rowIds <- which(sapply(loads, function(x) isTRUE(all.equal(uniqueLoad, x))))
+    rowIds <- which(loadStrings == uniqueLoadString)
     groupables <-instantiatedArgsPerRow[rowIds]
     outcomeIds <- unique(unlist(ParallelLogger::selectFromList(groupables, "outcomeId")))
     exposureIds <- lapply(groupables, function(x) x$exposureIds)