From fe5c03c53ad20d7ee84237b1e9b578fe868f10bf Mon Sep 17 00:00:00 2001 From: ginberg Date: Wed, 11 Sep 2024 15:45:16 +0200 Subject: [PATCH] fix minCharacterizationMean in query (#275) --- DESCRIPTION | 4 ++-- inst/csv/jarChecksum.txt | 2 +- ...r => featureExtraction-3.7.1-SNAPSHOT.jar} | Bin 84854 -> 84855 bytes .../featureExtraction/FeatureExtraction.java | 2 +- pom.xml | 2 +- tests/testthat/test-query-no-fail.R | 6 ++++-- 6 files changed, 9 insertions(+), 7 deletions(-) rename inst/java/{featureExtraction-3.7.0-SNAPSHOT.jar => featureExtraction-3.7.1-SNAPSHOT.jar} (74%) diff --git a/DESCRIPTION b/DESCRIPTION index 87316597..22914037 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: FeatureExtraction Type: Package Title: Generating Features for a Cohort -Version: 3.7.0 -Date: 2024-09-02 +Version: 3.7.1 +Date: 2024-09-11 Authors@R: c( person("Martijn", "Schuemie", , "schuemie@ohdsi.org", role = c("aut")), person("Marc", "Suchard", role = c("aut")), diff --git a/inst/csv/jarChecksum.txt b/inst/csv/jarChecksum.txt index 33a07226..cb7ae632 100644 --- a/inst/csv/jarChecksum.txt +++ b/inst/csv/jarChecksum.txt @@ -1 +1 @@ -d9f6ed460fb4a758786965f83b3c18f85dcdf3a1c9cb1b12319b1f7af243f9ef +b7c50aec30a5ec21a39c02253133a4e9607c9630010123844a75d858c0ec684a diff --git a/inst/java/featureExtraction-3.7.0-SNAPSHOT.jar b/inst/java/featureExtraction-3.7.1-SNAPSHOT.jar similarity index 74% rename from inst/java/featureExtraction-3.7.0-SNAPSHOT.jar rename to inst/java/featureExtraction-3.7.1-SNAPSHOT.jar index 41248b42da8aed77cf7f14f95a3e3513444d0e4e..7d34c87f6a86d77a3cdeeeb5680dc00c87e94917 100644 GIT binary patch delta 14952 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 " + minCharacterizationMean); + sql.append(" WHERE all_covariates.sum_value / (1.0 * total.total_count) >= " + minCharacterizationMean); } sql.append(";"); } else { diff --git a/pom.xml b/pom.xml index b419e8a7..12ef5036 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.ohdsi featureExtraction jar - 3.7.0-SNAPSHOT + 3.7.1-SNAPSHOT featureExtraction scm:git:https://github.com/OHDSI/featureExtraction diff --git a/tests/testthat/test-query-no-fail.R b/tests/testthat/test-query-no-fail.R index d9b950a4..6fdc2eb8 100644 --- a/tests/testthat/test-query-no-fail.R +++ b/tests/testthat/test-query-no-fail.R @@ -318,7 +318,8 @@ runExtractionAggregated <- function(connection, cdmDatabaseSchema, ohdsiDatabase cohortIds = c(1124300), rowIdField = "subject_id", covariateSettings = settings, - aggregated = TRUE + aggregated = TRUE, + minCharacterizationMean = 0.001 )) return(covariateData) } @@ -531,7 +532,8 @@ runExtractionTemporalAggregated <- function(connection, cdmDatabaseSchema, ohdsi cohortIds = c(1124300), rowIdField = "subject_id", covariateSettings = settings, - aggregated = TRUE + aggregated = TRUE, + minCharacterizationMean = 0.001 )) return(covariateData) }