Skip to content

Commit

Permalink
revert changes on old createSql method
Browse files Browse the repository at this point in the history
  • Loading branch information
ginberg committed Aug 22, 2024
1 parent fdcce55 commit e60e62d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion inst/csv/jarChecksum.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3aa4b6bdae3b098051bf7025fcf5d78d4e8b159c4ed2c20bb281db5664635e94
669197148343d2f9137137a75b207c1bcf6e103629b83386ae5ec7e4351885d9
Binary file modified inst/java/FeatureExtraction.jar
Binary file not shown.
12 changes: 5 additions & 7 deletions java/org/ohdsi/featureExtraction/FeatureExtraction.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ public static void main(String[] args) {
//String settings = getDefaultPrespecTemporalAnalyses();
// String settings = getDefaultPrespecTemporalSequenceAnalyses();
// String settings = convertSettingsPrespecToDetails(getDefaultPrespecTemporalAnalyses());
// System.out.println(convertSettingsPrespecToDetails(getDefaultPrespecAnalyses()));
// System.out.println(convertSettingsPrespecToDetails(getDefaultPrespecAnalyses()));
String settings =
"{\"temporal\":true,\"temporalSequence\":false,\"ConditionEraGroupOverlap\":true,\"temporalStartDays\":0,\"temporalEndDays\":0,\"includedCovariateConceptIds\":[],\"addDescendantsToInclude\":false,\"excludedCovariateConceptIds\":[],\"addDescendantsToExclude\":false,\"includedCovariateIds\":[]}";
//String settings =
//"{\"temporal\":false,\"temporalSequence\":false,\"analyses\":[{\"analysisId\":999,\"sqlFileName\":\"CohortBasedBinaryCovariates.sql\",\"parameters\":{\"covariateCohortTable\":\"cohort\",\"analysisId\":999,\"analysisName\":\"Cohort\",\"startDay\":-365,\"endDay\":0},\"includedCovariateConceptIds\":[],\"addDescendantsToInclude\":false,\"excludedCovariateConceptIds\":[],\"addDescendantsToExclude\":false,\"includedCovariateIds\":[]}]}";
// String settings = convertSettingsPrespecToDetails(getDefaultPrespecAnalyses());
System.out.println(createSql(settings, true, "#temp_cohort", "row_id", -1, "cdm_synpuf", 0.0));
System.out.println(createSql(settings, true, "#temp_cohort", "row_id", -1, "cdm_synpuf"));
// System.out.println(createSql(getDefaultPrespecAnalyses(), true, "#temp_cohort", "row_id", -1, "cdm_synpuf"));
// System.out.println(createSql(getDefaultPrespecTemporalAnalyses(), false, "#temp_cohort", "row_id", -1, "cdm_synpuf"));
}
Expand Down Expand Up @@ -524,14 +524,12 @@ public static String createSql(String settings, boolean aggregated, String cohor
* The ID of the cohort to characterize. If set to -1, all entries in the cohort table will be used.
* @param cdmDatabaseSchema
* The name of the database schema that contains the OMOP CDM instance. Requires read permissions to this database. On SQL Server, this should
* specify both the database and the schema, so for example 'cdm_instance.dbo'.
* @param minCharacterizationMean The minimum mean value for characterization output. Values below this will be cut off from output. This will help reduce
* the file size of the characterization output, but will remove information on covariates that have very low values.
* specify both the database and the schema, so for example 'cdm_instance.dbo'.
* @return A JSON object.
*/
public static String createSql(String settings, boolean aggregated, String cohortTable, String rowIdField, int cohortDefinitionId,
String cdmDatabaseSchema, double minCharacterizationMean) {
return createSql(settings, aggregated, cohortTable, rowIdField, new long[]{cohortDefinitionId}, cdmDatabaseSchema, minCharacterizationMean);
String cdmDatabaseSchema) {
return createSql(settings, aggregated, cohortTable, rowIdField, new long[]{cohortDefinitionId}, cdmDatabaseSchema, 0.0d);
}

/**
Expand Down

0 comments on commit e60e62d

Please sign in to comment.