Skip to content

Commit a439ed9

Browse files
committed
feat: temporary remove TMLE methods to make CRAN happy
1 parent 0f39f2a commit a439ed9

18 files changed

+59
-653
lines changed

DESCRIPTION

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: adjustedCurves
22
Title: Confounder-Adjusted Survival Curves and Cumulative Incidence
33
Functions
4-
Version: 0.11.0.9000
4+
Version: 0.11.1
55
Authors@R:
66
person("Robin", "Denz", , "robin.denz@rub.de", role = c("aut", "cre"))
77
Maintainer: Robin Denz <robin.denz@rub.de>
@@ -51,7 +51,6 @@ Suggests:
5151
vdiffr (>= 1.0.7),
5252
covr,
5353
data.table,
54-
concrete (>= 1.0.5),
5554
numDeriv,
5655
cowplot (>= 1.1.3)
5756
VignetteBuilder:

NAMESPACE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export(cif_direct_pseudo)
3232
export(cif_iptw)
3333
export(cif_iptw_pseudo)
3434
export(cif_matching)
35-
export(cif_tmle)
3635
export(plot_curve_diff)
3736
export(plot_curve_ratio)
3837
export(plot_rmst_curve)
@@ -55,7 +54,6 @@ export(surv_prox_iptw)
5554
export(surv_strat_amato)
5655
export(surv_strat_cupples)
5756
export(surv_strat_nieto)
58-
export(surv_tmle)
5957
importFrom(doRNG,"%dorng%")
6058
importFrom(dplyr,"%>%")
6159
importFrom(foreach,"%dopar%")

NEWS.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,26 @@ Documentation
4949

5050
# adjustedCurves 0.11.1
5151

52-
* Added the `difference` and `ratio` arguments to `plot_rmst_curve()` and `plot_rmtl_curve()`
53-
* Added the `difference` and `ratio` functionality to the `adjusted_surv_quantile()` function
52+
Enhancements
53+
5454
* Re-factored internal code to vastly increase speed of bootstrapping related computations
55-
* Added risk table functionality for `plot.adjustedsurv()`
55+
56+
New features
57+
58+
* Added risk table functionality for `plot.adjustedsurv()` (all arguments starting with `risk_table`)
59+
* Allow estimation of difference and ratios in `plot_rmst_curve()` function
60+
* Allow estimation of difference and ratios in `plot_rmtl_curve()` function
61+
* Allow estimation of difference and ratios in `adjusted_surv_quantile()` function
62+
63+
Refactored
64+
65+
* Re-factored examples to only be executed if suggested packages are installed
5666
* Renamed `adjsurv` and `adjcif` output objects of `adjustedsurv()` and `adjsutedcif()` respectively to `adj`
67+
* Put functionality of `difference` and `ratio` arguments into one `contrast` argument in `adjusted_rmst()`, `adjusted_rmtl()`, `adjusted_surv_quantile()`, `plot_rmst_curve()` and `plot_rmtl_curve()` functions
68+
* Temporarily removed support for `tmle` in `adjustedsurv()` and `adjustedcif()` due to `concrete` being removed from CRAN
69+
70+
Documentation
71+
5772
* Re-worked introduction vignette
5873
* Added FAQ vignette
5974
* Added Group Comparison vignette
60-
* Re-factored examples to only be executed if suggested packages are installed

R/helper_functions.r

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ load_needed_packages <- function(method, kind, treatment_model,
380380

381381
# concrete
382382
if (method=="tmle") {
383-
requireNamespace("concrete")
383+
#requireNamespace("concrete")
384384
}
385385

386386
# data.table
@@ -428,7 +428,7 @@ load_needed_packages <- function(method, kind, treatment_model,
428428

429429
# concrete
430430
if (method=="tmle") {
431-
requireNamespace("concrete")
431+
#requireNamespace("concrete")
432432
}
433433

434434
# data.table

R/method_tmle.r

Lines changed: 0 additions & 168 deletions
This file was deleted.

codemeta.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"codeRepository": "https://github.com/RobinDenz1/adjustedCurves",
99
"issueTracker": "https://github.com/RobinDenz1/adjustedCurves/issues",
1010
"license": "https://spdx.org/licenses/GPL-3.0",
11-
"version": "0.11.0",
11+
"version": "0.11.1",
1212
"programmingLanguage": {
1313
"@type": "ComputerLanguage",
1414
"name": "R",
@@ -229,24 +229,11 @@
229229
},
230230
"sameAs": "https://CRAN.R-project.org/package=rmarkdown"
231231
},
232-
{
233-
"@type": "SoftwareApplication",
234-
"identifier": "survival",
235-
"name": "survival",
236-
"version": ">= 3.0.0",
237-
"provider": {
238-
"@id": "https://cran.r-project.org",
239-
"@type": "Organization",
240-
"name": "Comprehensive R Archive Network (CRAN)",
241-
"url": "https://cran.r-project.org"
242-
},
243-
"sameAs": "https://CRAN.R-project.org/package=survival"
244-
},
245232
{
246233
"@type": "SoftwareApplication",
247234
"identifier": "testthat",
248235
"name": "testthat",
249-
"version": ">= 3.0.0",
236+
"version": ">= 3.2.1",
250237
"provider": {
251238
"@id": "https://cran.r-project.org",
252239
"@type": "Organization",
@@ -284,7 +271,7 @@
284271
"@type": "SoftwareApplication",
285272
"identifier": "vdiffr",
286273
"name": "vdiffr",
287-
"version": ">= 1.0.0",
274+
"version": ">= 1.0.7",
288275
"provider": {
289276
"@id": "https://cran.r-project.org",
290277
"@type": "Organization",
@@ -319,28 +306,28 @@
319306
},
320307
{
321308
"@type": "SoftwareApplication",
322-
"identifier": "concrete",
323-
"name": "concrete",
324-
"version": ">= 1.0.5",
309+
"identifier": "numDeriv",
310+
"name": "numDeriv",
325311
"provider": {
326312
"@id": "https://cran.r-project.org",
327313
"@type": "Organization",
328314
"name": "Comprehensive R Archive Network (CRAN)",
329315
"url": "https://cran.r-project.org"
330316
},
331-
"sameAs": "https://CRAN.R-project.org/package=concrete"
317+
"sameAs": "https://CRAN.R-project.org/package=numDeriv"
332318
},
333319
{
334320
"@type": "SoftwareApplication",
335-
"identifier": "numDeriv",
336-
"name": "numDeriv",
321+
"identifier": "cowplot",
322+
"name": "cowplot",
323+
"version": ">= 1.1.3",
337324
"provider": {
338325
"@id": "https://cran.r-project.org",
339326
"@type": "Organization",
340327
"name": "Comprehensive R Archive Network (CRAN)",
341328
"url": "https://cran.r-project.org"
342329
},
343-
"sameAs": "https://CRAN.R-project.org/package=numDeriv"
330+
"sameAs": "https://CRAN.R-project.org/package=cowplot"
344331
}
345332
],
346333
"softwareRequirements": {
@@ -417,9 +404,22 @@
417404
},
418405
"sameAs": "https://CRAN.R-project.org/package=rlang"
419406
},
407+
"7": {
408+
"@type": "SoftwareApplication",
409+
"identifier": "survival",
410+
"name": "survival",
411+
"version": ">= 3.0.0",
412+
"provider": {
413+
"@id": "https://cran.r-project.org",
414+
"@type": "Organization",
415+
"name": "Comprehensive R Archive Network (CRAN)",
416+
"url": "https://cran.r-project.org"
417+
},
418+
"sameAs": "https://CRAN.R-project.org/package=survival"
419+
},
420420
"SystemRequirements": null
421421
},
422-
"fileSize": "2694.877KB",
422+
"fileSize": "3158.658KB",
423423
"citation": [
424424
{
425425
"@type": "ScholarlyArticle",

man/adjustedCurves.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ where \eqn{T_z} is the survival time that would have been observed if treatment
2020

2121
\strong{\emph{What features are included in this package?}}
2222

23-
This package includes 16 methods to estimate confounder-adjusted survival curves (single event) and 8 methods to estimate confounder adjusted cumulative incidence functions (possibly with multiple competing events). It provides \code{plot} functions to easily produce highly customizable and publication-ready graphics. It also allows the user to easily calculate relevant statistics, such as confidence intervals, p-values, and adjusted restricted mean survival time estimates. Multiple Imputation is directly supported.
23+
This package includes 15 methods to estimate confounder-adjusted survival curves (single event) and 7 methods to estimate confounder adjusted cumulative incidence functions (possibly with multiple competing events). It provides \code{plot} functions to easily produce highly customizable and publication-ready graphics. It also allows the user to easily calculate relevant statistics, such as confidence intervals, p-values, and adjusted restricted mean survival time estimates. Multiple Imputation is directly supported.
2424

2525
\strong{\emph{What does a typical workflow using this package look like?}}
2626

@@ -34,7 +34,7 @@ When competing risks are present, the cause-specific confounder-adjusted surviva
3434

3535
\strong{\emph{What features are missing from this package?}}
3636

37-
In a former version, this package included two targeted maximum likelihood based methods for the estimation of adjusted survival curves and one for the estimation of adjusted cumulative incidence functions based on discrete-time data. These methods have been removed because the \pkg{survtmle} package has been removed from CRAN and there is currently no other available implementation of these estimators on CRAN. However, since version 0.10.2 this package contains an implementation of targeted maximum likelihood estimation for continuous time-to-event data (a wrapper function for the \pkg{concrete} package).
37+
In a former version, this package included two targeted maximum likelihood based methods for the estimation of adjusted survival curves and one for the estimation of adjusted cumulative incidence functions based on discrete-time data. These methods have been removed because the \pkg{survtmle} package has been removed from CRAN and there is currently no other available implementation of these estimators on CRAN. From version 0.10.2 tp 0.11.0 this package then contained an implementation of targeted maximum likelihood estimation for continuous time-to-event data (a wrapper function for the \pkg{concrete} package). This is currently unavailable due to the package being removed from CRAN, but will probably be supported again soon.
3838

3939
This package also currently does not support time-varying treatments or covariates. It also does not support left-censoring, interval-censoring or left-truncation. These features may be added in future releases.
4040

man/adjusted_surv_quantile.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ If more than two groups are present in \code{variable}, all other comparisons ex
6868

6969
\strong{\emph{Multiple Imputation}}
7070

71-
If multiple imputation was used in the original function call, the survival time quantiles are read off the final pooled survival curves directly. This also works when using \code{contrast="diff"} or \code{contrast="ratio"}. When using either \code{contrast="diff"} or \code{contrast="ratio"} in conunction with \code{conf_int=TRUE} (plus bootstrapping), the standard errors of the difference or ratio are estimated for each imputed dataset separately and pooled using Rubins Rule afterwards. The pooled standard errors are then used to perform the same calculations as described above.
71+
If multiple imputation was used in the original function call, the survival time quantiles are read off the final pooled survival curves directly. This also works when using \code{contrast="diff"} or \code{contrast="ratio"}. When using either \code{contrast="diff"} or \code{contrast="ratio"} in conjunction with \code{conf_int=TRUE} (plus bootstrapping), the standard errors of the difference or ratio are estimated for each imputed dataset separately and pooled using Rubins Rule afterwards. The pooled standard errors are then used to perform the same calculations as described above.
7272

7373
}
7474
\value{

man/adjustedcif.Rd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ The primary purpose of the \code{adjustedcif} function is to provide a convenien
8484
\item{"\link[=cif_matching]{matching}": Using Propensity Score Matching to estimate the adjusted CIFs.}
8585
\item{"\link[=cif_aiptw]{aiptw}": An Augmented Inverse Probability of Treatment Weighting estimator.}
8686
\item{"\link[=cif_aiptw_pseudo]{aiptw_pseudo}": An Augmented Inverse Probability of Treatment Weighting estimator using Pseudo-Values.}
87-
\item{"\link[=cif_tmle]{tmle}": Targeted Maximum Likelihood Estimation for continuous time time-to-event data with competing events.}
8887
\item{"\link[=cif_aalen_johansen]{aalen_johansen}": A simple stratified Aalen-Johansen estimator without any form of adjustment.}
8988
}
9089

man/adjustedsurv.Rd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ The primary purpose of the \code{adjustedsurv} function is to provide a convenie
8383
\item{"\link[=surv_emp_lik]{emp_lik}": An Empirical Likelihood based estimator.}
8484
\item{"\link[=surv_aiptw]{aiptw}": An Augmented Inverse Probability of Treatment Weighting estimator.}
8585
\item{"\link[=surv_aiptw_pseudo]{aiptw_pseudo}": An Augmented Inverse Probability of Treatment Weighting estimator using Pseudo-Values.}
86-
\item{"\link[=surv_tmle]{tmle}": Targeted Maximum Likelihood Estimation for continuously distributed time-to-event data.}
8786
\item{"\link[=surv_strat_amato]{strat_amato}": A method based on stratification and weighting by Amato (1988).}
8887
\item{"\link[=surv_strat_nieto]{strat_nieto}": A method based on stratification and weighting by Gregory (1988) and Nieto & Coresh (1996).}
8988
\item{"\link[=surv_strat_cupples]{strat_cupples}": A method based on stratification and weighting by Cupples et al. (1995).}

0 commit comments

Comments
 (0)