Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improving aggregate #47

Closed
wants to merge 31 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cc8b5c1
updating aggregate features
jreps Apr 26, 2024
c8ef131
Update ViewShiny.R
jreps Apr 26, 2024
bddcfb0
fixing issue 38 and addressing issue 13
jreps Apr 26, 2024
4d8e60d
Update DESCRIPTION
jreps Apr 26, 2024
2d61bb0
Update AggregateCovariates.R
jreps Apr 26, 2024
f53acfc
Update test-aggregateCovariate.R
jreps Apr 29, 2024
8d192e6
adding during covariates
jreps Apr 30, 2024
160596f
fixing checks
jreps Apr 30, 2024
91891f0
Update createDuringCovariateSettings.Rd
jreps Apr 30, 2024
92489d1
example check
jreps May 1, 2024
6aa7efc
website and doc updates
jreps May 1, 2024
56e4705
updating aggregate characterization
jreps May 1, 2024
0b7dc43
updating docs
jreps May 1, 2024
27b9c07
Rename createTargetOutcomeCombinations.sql to CreateTargetOutcomeComb…
chrisknoll May 2, 2024
4091854
Update AggregateCovariates.R
chrisknoll May 2, 2024
323a311
Reduce number of rows in table so vignettes can build.
chrisknoll May 2, 2024
a1b01ec
Merge branch 'improving_aggregate' of https://github.com/OHDSI/Charac…
chrisknoll May 2, 2024
b7b98a6
WIP
anthonysena May 2, 2024
8eceef2
fixing primary keys for test to pass
jreps May 3, 2024
fbfb385
Updating resultsDataModelSpecification.csv to use Yes/No vs Y/N
anthonysena May 3, 2024
00e94e2
Merge pull request #48 from OHDSI/improving_aggregate_results_model
jreps May 3, 2024
d39c178
editing exports (#49)
jreps May 3, 2024
a06588f
Fixing typos
anthonysena May 3, 2024
8a476c8
minor fixes
jreps May 14, 2024
ef7f9b1
supporting multiple TARs
jreps May 16, 2024
22c02b0
Update RunCharacterization.R
jreps May 16, 2024
9e2e281
fixing time_at_risk tables
jreps May 16, 2024
d97b243
Update AggregateCovariates.R
jreps May 17, 2024
a7ba719
Update AggregateCovariates.R
jreps May 17, 2024
356a0e2
incremental and unique fix
jreps May 21, 2024
67657b1
Update Database.R
jreps May 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Package: Characterization
Type: Package
Title: Characterizations of Cohorts
Version: 0.2.0
Date: 2024-04-03
Version: 0.3.1
Date: 2024-04-25
Authors@R: c(
person("Jenna", "Reps", , "[email protected]", role = c("aut", "cre")),
person("Patrick", "Ryan", , "[email protected]", role = c("aut"))
person("Patrick", "Ryan", , "[email protected]", role = c("aut")),
person("Chris", "Knoll", , "[email protected]", role = c("aut"))
)
Maintainer: Jenna Reps <[email protected]>
Description: Various characterizations of target and outcome cohorts.
Expand All @@ -17,30 +18,32 @@ Depends:
Imports:
Andromeda,
DatabaseConnector (>= 6.3.1),
digest,
FeatureExtraction (>= 3.5.0),
SqlRender (>= 1.9.0),
ParallelLogger (>= 3.0.0),
ResultModelManager,
checkmate,
dplyr,
readr,
rlang
Suggests:
devtools,
formatR,
testthat,
Eunomia,
kableExtra,
knitr,
markdown,
ResultModelManager,
rmarkdown,
ShinyAppBuilder,
shiny,
withr
Remotes:
ohdsi/FeatureExtraction,
ohdsi/Eunomia,
ohdsi/ResultModelManager,
ohdsi/ShinyAppBuilder,
ohdsi/DatabaseConnector
ohdsi/ShinyAppBuilder
NeedsCompilation: no
RoxygenNote: 7.3.1
Encoding: UTF-8
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ export(createAggregateCovariateSettings)
export(createCharacterizationSettings)
export(createCharacterizationTables)
export(createDechallengeRechallengeSettings)
export(createDuringCovariateSettings)
export(createSqliteDatabase)
export(createTimeToEventSettings)
export(exportAggregateCovariateToCsv)
export(exportDatabaseToCsv)
export(exportDechallengeRechallengeToCsv)
export(exportRechallengeFailCaseSeriesToCsv)
export(exportTimeToEventToCsv)
export(getDbDuringCovariateData)
export(loadAggregateCovariateAnalyses)
export(loadCharacterizationSettings)
export(loadDechallengeRechallengeAnalyses)
Expand Down
16 changes: 16 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
Characterization 0.3.1
======================
- Removed DatabaseConnector from Remotes in DESCRIPTION. Fixes GitHb issue 38.
- Added check to covariateSettings input in createAggregateCovariateSettings to error if temporal is T
- adding during cohort covariate settings
- added a case covariate settings inputs to aggregate covariates
- added casePreTargetDuration and casePostTreatmentDuration integer inputs to aggregate covariates

Characterization 0.3.0
======================
- Added new outcomeWashoutDays parameter to createAggregateCovariateSettings to remove outcome occurances that are continuations of a prior outcome occurrence
- Changed the way cohort definition ids are created in createAggregateCovariateSettings to use hash of target id, outcome id and type. This lets users combine different studies into a single result database.
- Added database migration capability and created new migrations for the recent updates.



Characterization 0.2.0
======================
Updated dependency to FeatureExtraction (>= 3.5.0) to support minCharacterizationMean paramater.
Expand Down
Loading
Loading