-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ci skip] Integrate new version of the model that jointly models the …
…competing risk incidences (#53) * removing Incidence * adding MultiIncidence to hazardosu * reinserting example for multiincidence * Hardcode uniform time sampler to simplify estimator * Remove any reference to the dataset-specific oracle scorer * Rename to SurvivalBoost * Update the .score method to work in the any event setting * Rename test file * Fix test_gradient_boosting_incidence_parameter_tuning * Simplify code * Raise error if hard-zero resampling censors too many events * adding test * Refactor survival boost tests * Fix missing assertion * fix TODO * fix linter * Fix LaTeX * More informative error message for bad value for hard_zero_fraction * Remove untested code related to Cox PH based conditional censoring estimation * Avoid using 'Est' as a short hand for 'Estimator' * FIX accept both float and array-like for time_horizon in predict_proba * DOC update predict_proba docstring * TST add a test that check the behaviour of predict_proba * DOC add docstring to test * TST check that probability sum to one for all events * DOC fix docstring type for time_horizon * Rename BaseIPCW to KaplanMeierIPCW. Adding some documentation. * API correct the API of predict_proba * Use arturo formulation * Silence 'DeprecationWarning: invalid escape sequence' by using raw docstrings with LaTeX expressions * update docstring * Simplify KaplanMeierIPCW and improve its docstring * adding some documentation to SurvivalBoost * More docstring fixes * Apply suggestions from code review Co-authored-by: Olivier Grisel <[email protected]> * TST update test and code to follow scikit-learn convention * TST check that we override properly * Apply suggestions from code review Co-authored-by: Olivier Grisel <[email protected]> * DOC start documenting parameter * DOC documents parameters in SurvivalBoost docstring * DOC add ipcw estimator docstring * DOC add attributes, reference, and examples * DOC document some parameters and attributes of WeightedMultiClassTargetSampler * API change the shape of the incidence curves * DOC Use data generator in marginal cumulative incidence example * FIX slice properly the prediction * fix install instructions with flit * MAINT Remove old python version in black config (#57) * MAINT activate doctest check with pytest by default * Fix a pandas warning in load_seer * FIX do not pytest collect outside of the hazardous module folder * FIX update the example to integrate on the right columns * Apply suggestions from code review Co-authored-by: Olivier Grisel <[email protected]> * Set explicit value for n_events * Improve variable names and comments in WeightedMultiClassTargetSampler * Use n_horizons_per_observation=3 by default * Update hazardous/_survival_boost.py * Remove reference to "column" to describe the second axis of a 3D array. * Improve docstrings for SurvivalBoost * Make sure to use zero-width param ranges in marginal example * Silence AJ warning on tied events * Small improvements * Use a string in the public API of SurvivalBoost to select the censoring estimator * Keep IPCW estimator private API for now * replacing any occurence of _est to _estimator * fixing math, harmonising different notations. * Example survival analysis (#70) * survival analysis example * change the `predict_cumutive_incidence` function to `predict_survival_function` * fix the example and adapt it to sphinx * add torch to doc deps because because pycox doesn't require it * clean example --------- Co-authored-by: LeoGrin <[email protected]> Co-authored-by: Vincent Maladiere <[email protected]> * enhance documentation --------- Co-authored-by: Julie Alberge <[email protected]> Co-authored-by: Guillaume Lemaitre <[email protected]> Co-authored-by: ArturoAmorQ <[email protected]> Co-authored-by: Judith Abecassis <[email protected]> Co-authored-by: Jovan Stojanovic <[email protected]> Co-authored-by: Julie <[email protected]> Co-authored-by: LeoGrin <[email protected]> Co-authored-by: Vincent Maladiere <[email protected]> 5e581d5
- Loading branch information
1 parent
7376fd6
commit f972960
Showing
67 changed files
with
4,000 additions
and
1,465 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Sphinx build info version 1 | ||
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. | ||
config: e3800b2185b6bf6d86ab083fedf1fa5d | ||
config: fb4d4fb8638e781e53ce9360531dfb3f | ||
tags: 645f666f9bcd5a90fca523b33c5a78b7 |
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
-3.43 KB
(91%)
.doctrees/auto_examples/plot_marginal_cumulative_incidence_estimation.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
-2 Bytes
(100%)
.doctrees/generated/hazardous.data.make_synthetic_competing_weibull.doctree
Binary file not shown.
Binary file modified
BIN
+12 Bytes
(100%)
.doctrees/generated/hazardous.metrics.brier_score_incidence.doctree
Binary file not shown.
Binary file modified
BIN
+2 Bytes
(100%)
.doctrees/generated/hazardous.metrics.brier_score_survival.doctree
Binary file not shown.
Binary file modified
BIN
+2 Bytes
(100%)
.doctrees/generated/hazardous.metrics.integrated_brier_score_incidence.doctree
Binary file not shown.
Binary file modified
BIN
+2 Bytes
(100%)
.doctrees/generated/hazardous.metrics.integrated_brier_score_survival.doctree
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+11.6 KB
(220%)
_downloads/07fcc19ba03226cd3d83d4e40ec44385/auto_examples_python.zip
Binary file not shown.
52 changes: 8 additions & 44 deletions
52
...oads/2932d6ac7842b6d781c27c5737ae52fa/plot_marginal_cumulative_incidence_estimation.ipynb
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file added
BIN
+27.8 KB
_downloads/3f8c903e544072e7ce4b9fd8dc2dee36/plot_survival_analysis.zip
Binary file not shown.
Binary file added
BIN
+21 KB
...nloads/4f05ecd626e67565b19d5038f03572d5/plot_marginal_cumulative_incidence_estimation.zip
Binary file not shown.
Binary file modified
BIN
+14.6 KB
(220%)
_downloads/6f1e7a639e0699d6164445b55e6c116d/auto_examples_jupyter.zip
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.