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

Imputation #513

Merged
merged 35 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4e834fc
more work on imputations
egillax Dec 4, 2024
d17223c
more imputation work
egillax Dec 5, 2024
098a44a
more imputation work
egillax Dec 9, 2024
6b27f8e
add files
egillax Dec 9, 2024
0506537
docs
egillax Dec 9, 2024
220a74f
merge with develop
egillax Dec 12, 2024
c17ae5e
new docs
egillax Dec 12, 2024
362898c
refactoring and fix dependancies
egillax Dec 12, 2024
4387432
add simple imputer for mean and median imputation
egillax Dec 12, 2024
ee07148
fix fe bug
egillax Jan 13, 2025
8bfe7fd
fix docs
egillax Jan 13, 2025
42036e1
initial tests and checks
egillax Jan 13, 2025
92d74e8
fix typo in test
egillax Jan 13, 2025
9d10867
add tests and fix bugs
egillax Jan 13, 2025
6a106df
merge with develop
egillax Jan 13, 2025
c5b9674
fix DESCRIPTION
egillax Jan 13, 2025
7169aba
fix DESCRIPTION
egillax Jan 13, 2025
bf0c6c4
fix notes
egillax Jan 13, 2025
682ad9d
fix not
egillax Jan 13, 2025
1db334a
add test for applying imputation and logging
egillax Jan 14, 2025
935f448
add normalization tests
egillax Jan 14, 2025
9b51550
docs
egillax Jan 14, 2025
761ef5a
add docs
egillax Jan 14, 2025
31a7db0
add tests for applying normalization
egillax Jan 17, 2025
272205c
fix tests
egillax Jan 17, 2025
bdfd5db
test feature remover
egillax Jan 17, 2025
aa88866
Merge branch 'develop' into imputation
egillax Jan 17, 2025
77d961a
fix logging
egillax Jan 17, 2025
2ebc4ea
merge with develop
egillax Jan 28, 2025
4dbdff0
better tests and warning message
egillax Jan 29, 2025
e7b118c
better tests for normalizers
egillax Jan 30, 2025
d37b9b7
tests
egillax Jan 30, 2025
fd3aa84
tests
egillax Jan 30, 2025
411b756
merge with develop
egillax Jan 30, 2025
503e303
setup file
egillax Jan 30, 2025
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
1 change: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Imports:
Suggests:
curl,
Eunomia (>= 2.0.0),
glmnet,
ggplot2,
gridExtra,
IterativeHardThresholding,
Expand Down
4 changes: 4 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@ export(createExecuteSettings)
export(createExistingSplitSettings)
export(createFeatureEngineeringSettings)
export(createGlmModel)
export(createIterativeImputer)
export(createLearningCurve)
export(createLogSettings)
export(createModelDesign)
export(createNormalizer)
export(createPlpResultTables)
export(createPreprocessSettings)
export(createRandomForestFeatureSelection)
export(createRareFeatureRemover)
export(createRestrictPlpDataSettings)
export(createSampleSettings)
export(createSimpleImputer)
export(createSklearnModel)
export(createSplineSettings)
export(createStratifiedImputationSettings)
Expand Down
10 changes: 4 additions & 6 deletions R/CyclopsModels.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @file CyclopsModels.R
# @file lassoLogisticRegression.R
#
# Copyright 2025 Observational Health Data Sciences and Informatics
# Copyright 2021 Observational Health Data Sciences and Informatics
#
# This file is part of PatientLevelPrediction
#
Expand All @@ -19,7 +19,7 @@

fitCyclopsModel <- function(
trainData,
modelSettings,
modelSettings, # old:param,
search = "adaptive",
analysisId,
...) {
Expand Down Expand Up @@ -240,7 +240,7 @@ fitCyclopsModel <- function(



#' Predict risk for a population using a Cyclops model
#' Create predictive probabilities
#'
#' @details
#' Generates predictions for the population specified in plpData given the model.
Expand All @@ -253,8 +253,6 @@ fitCyclopsModel <- function(
#' \code{\link{fitPlp}}.
#' @param data The new plpData containing the covariateData for the new population
#' @param cohort The cohort to calculate the prediction for
#'
#' @return The cohort dataframe with a new column "value" containing the predicted risk
#' @export
predictCyclops <- function(plpModel, data, cohort) {
start <- Sys.time()
Expand Down
Loading
Loading