Update cohort definition set defs

NAMESPACE

@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(rbind,cohortDefinitionSet)
 export(CohortSubsetDefinition)
 export(CohortSubsetOperator)
 export(DemographicSubsetOperator)

R/CohortConstruction.R

@@ -58,16 +58,17 @@
 #'    }
 #'
 #' @export
-generateCohortSet <- function(connectionDetails = NULL,
+generateCohortSet <- function(cohortDefinitionSet,
+                              connectionDetails = NULL,
                               connection = NULL,
                               cdmDatabaseSchema,
                               tempEmulationSchema = getOption("sqlRenderTempEmulationSchema"),
                               cohortDatabaseSchema = cdmDatabaseSchema,
                               cohortTableNames = getCohortTableNames(),
-                              cohortDefinitionSet = NULL,
                               stopOnError = TRUE,
                               incremental = FALSE,
                               incrementalFolder = NULL) {
+  cohortDefinitionSet <- as.cohortDefinitionSet(cohortDefinitionSet)
   checkmate::assertDataFrame(cohortDefinitionSet, min.rows = 1, col.names = "named")
   checkmate::assertNames(colnames(cohortDefinitionSet),
     must.include = c(

R/CohortDefinitionSet.R

@@ -21,22 +21,14 @@ as.cohortDefinitionSet <- function(df) {
   invisible(df)
 }
 
-# Define the cohortDefinitionSet class
-setClass("cohortDefinitionSet", contains = "data.frame")
+#' @export
+rbind.cohortDefinitionSet <- function(...) {
+  print('foo')
+  base::rbind.default(...)
 
-# Create a constructor for cohortDefinitionSet
-cohortDefinitionSet <- function(...) {
-  obj <- new("cohortDefinitionSet", ...)
-  obj
+  return(NULL)
 }
 
-# Override the rbind method for cohortDefinitionSet
-setMethod("rbind", signature(x = "cohortDefinitionSet", y = "cohortDefinitionSet"), function(x, y, ...) {
-  # Custom logic to combine two cohortDefinitionSet objects
-  combined_set <- data.frame(rbind(as.data.frame(x), as.data.frame(y)))
-  return(combined_set)
-})
-
 #' Create an empty cohort definition set
 #'
 #' @description