Skip to content

Commit

Permalink
version 1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
smouksassi authored and cran-robot committed Sep 18, 2023
1 parent dc3f99f commit 561ca41
Show file tree
Hide file tree
Showing 46 changed files with 6,376 additions and 3,969 deletions.
18 changes: 11 additions & 7 deletions DESCRIPTION
@@ -1,33 +1,37 @@
Package: coveffectsplot
Title: Produce Forest Plots to Visualize Covariate Effects
Version: 1.0.2
Version: 1.0.4
Authors@R: c(
person("Samer", "Mouksassi", email = "samermouksassi@gmail.com",
role = c("aut", "cre"),comment = c(ORCID = "https://orcid.org/0000-0002-7152-6654")),
person("Benjamin", "Rich", email = "mail@benjaminrich.net",
role = c("aut")),
person("Dean", "Attali", email = "daattali@gmail.com",
role = c("ctb"))
)
Description: Produce forest plots to visualize covariate effects using either
the command line or an interactive 'Shiny' application.
URL: https://github.com/smouksassi/coveffectsplot
URL: https://smouksassi.github.io/coveffectsplot/,
https://github.com/smouksassi/coveffectsplot
BugReports: https://github.com/smouksassi/coveffectsplot/issues
Depends: R (>= 3.6.0), data.table (>= 1.9.8)
Depends: R (>= 4.0.0), data.table (>= 1.9.8)
Imports: colourpicker, egg, grid, ggplot2 (>= 3.3.2), shiny, stats,
utils
Suggests: markdown, dplyr, tidyr, shinyjs, shinymeta, table1, clipr,
formatR, MASS, knitr, rmarkdown, mrgsolve, GGally, ggridges,
ggrepel, ggstance, patchwork, plotly, scales, shinyAce, Rcpp,
gamlss.dist, ggh4x, ggpmisc, quantreg
gamlss.dist, ggdist, ggh4x, ggpmisc, quantreg
License: MIT + file LICENSE
SystemRequirements: pandoc with https support
LazyData: true
VignetteBuilder: knitr
RoxygenNote: 7.2.0
RoxygenNote: 7.2.3
Encoding: UTF-8
NeedsCompilation: no
Packaged: 2022-05-30 10:23:30 UTC; smouksas
Packaged: 2023-09-18 08:51:27 UTC; smouksas
Author: Samer Mouksassi [aut, cre] (<https://orcid.org/0000-0002-7152-6654>),
Benjamin Rich [aut],
Dean Attali [ctb]
Maintainer: Samer Mouksassi <samermouksassi@gmail.com>
Repository: CRAN
Date/Publication: 2022-05-30 10:50:02 UTC
Date/Publication: 2023-09-18 12:40:16 UTC
80 changes: 45 additions & 35 deletions MD5
@@ -1,57 +1,67 @@
12181eb36caff057fb03c81460669b5c *DESCRIPTION
964f22d587133060a80d50f1bee010cb *DESCRIPTION
3cca4895befbf1b8025c378d28af69db *LICENSE
59d87eb46bf8044f0cf52e201bc576e1 *NAMESPACE
322f40645ccdb233d1427a5aee5f6ae6 *NEWS.md
19eb055e2d0c7a92c6400acc5471209b *NAMESPACE
20e8594a50df4df8d5e2297aa2eb0bd8 *NEWS.md
10a4f6850c84b254472a1c620044d60b *R/data.R
db7ecc5ca429688d5da5e453992f72e2 *R/forest_plot.R
2282b1c63d02c51f55126604570d7cbc *R/expand_modelframe.R
3a443de8164ff01f033eca287e0f713d *R/forest_plot.R
7afa8b1fdc9b17a122f6a0f9a350864e *R/get_sample_data.R
2ef4b8aa1dff6b313176be430c7b513c *R/run_interactiveforestplot.R
012eb26de2356f28c13959e6340465d2 *README.md
1ea459c2867a19ad27cd4eb10e65bb57 *build/vignette.rds
7d4f8b71c56e508471c47890ed960c2b *R/run_interactiveforestplot.R
6996c8709243ca1d7bb26e6160c1b849 *README.md
8bca8deeaaad1cb931e6e65df6a04059 *build/vignette.rds
3ab983cabf81913cd1c731815bfc9ede *data/covdatasim.rda
89a97e7e049d8c4814671a7dfad10da8 *data/prezista.rda
0e72a516c4dc70cde61114e5e7ab50f7 *data/wtage.rda
873c480232288edd8b691197b730506b *inst/doc/Exposure_Response_Example.R
64d26a1bdaa0415d2d3a38801ee50307 *inst/doc/Exposure_Response_Example.Rmd
2b64411675ebfee028bf956b5c9947b5 *inst/doc/Exposure_Response_Example.html
4c095899a0c883e7a232f9374d477e14 *inst/doc/PKPD_Example.R
2b0dcb722f294cc9bb68d00a39e784ad *inst/doc/PKPD_Example.Rmd
428df0fac87189a6f1e25d1be4c414c9 *inst/doc/PKPD_Example.html
0cd16a8aaf74bec5d02bb99d6f34628f *inst/doc/PK_Example.R
236e7fbc7f6416f6fa49fc995d62cc1f *inst/doc/PK_Example.Rmd
5a174fdf0b6e36ef982c66898852e2e1 *inst/doc/PK_Example.html
2a5b997061baf933ca54021660e38998 *inst/doc/PK_Example_full.R
69ab1d15b5da14d01bd08ea59e208ca4 *inst/doc/PK_Example_full.Rmd
0a487d8ba6993198b7248c125fdf5dec *inst/doc/PK_Example_full.html
07ddd605eed8ad310d5ed5ccaea8a1ad *inst/doc/Pediatric_Cov_Sim.R
ddcc4f6f3c5d0c97c2d0c876b5637d46 *inst/doc/Pediatric_Cov_Sim.Rmd
648cc8f85c380fc2d0979a4dedd3d284 *inst/doc/Pediatric_Cov_Sim.html
2a95816a6d7565dc14addaff94f227c7 *inst/CITATION
6229898531b1b8832650690fd561c2c2 *inst/doc/Exposure_Response_Example.R
bde504f48a7b9cf97be28be6e52da7c2 *inst/doc/Exposure_Response_Example.Rmd
ceb8a70a041689a28fc61aa09c938cab *inst/doc/Exposure_Response_Example.html
b024582aab0cc667b37d65d20f67cd39 *inst/doc/PKPD_Example.R
d31ccc738b927b4c0ae7060725807fbd *inst/doc/PKPD_Example.Rmd
0506487a6614156e7cd0abea33278eae *inst/doc/PKPD_Example.html
28230ad7931611372da407a51e199c29 *inst/doc/PK_Example.R
98c3b42337855050c64bfb41308c6abf *inst/doc/PK_Example.Rmd
d38f187a58669c5b8cfb1a0425e32e2b *inst/doc/PK_Example.html
0e82a5808066e30a6c33f49906074bfc *inst/doc/PK_Example_full.R
9d41a5cb9d2bdefc48f34d47db91a14d *inst/doc/PK_Example_full.Rmd
09d4fed6d1c0f72f5a9eac6a1a371c26 *inst/doc/PK_Example_full.html
a779681af0f86cd57a3bb20e0a609dda *inst/doc/Pediatric_Cov_Sim.R
7b04d45388215bd4f75ef167b26aecdb *inst/doc/Pediatric_Cov_Sim.Rmd
e4c1d0ecc12689b3b22fb169f49de59c *inst/doc/Pediatric_Cov_Sim.html
9e4153fc1dd78e4081dbeb468ec0c533 *inst/doc/app.Rmd
7a79e41ddfa67341c8289bc34fdf1bbb *inst/doc/app.html
9c98a4326c291e40ac927a9101607632 *inst/doc/introduction_to_coveffectsplot.R
3f4513a0bf100a3367f942c8225a976a *inst/doc/introduction_to_coveffectsplot.Rmd
2819507f621bfc3b0f186e56cf94a528 *inst/doc/introduction_to_coveffectsplot.html
dfebbd0d525d83413e580d2129e3e3c1 *inst/doc/introduction_to_coveffectsplot.Rmd
e00e79a920167805bc694cd2aeced6cf *inst/doc/introduction_to_coveffectsplot.html
114f202c6c21e15069e08aab97368712 *inst/sample_data/dataforest.csv
f0a4125b49cd38f70a761b07be0434f1 *inst/sample_data/dfall.csv
149a748ad2f05a4075ec1c10fc41f660 *inst/sample_data/forest-plot-table.csv
60ba0e3a14475a7e0e787427a6f62d1f *inst/sample_data/forestplotdatacpidata.csv
aa9c4260a6ea90fe4b1c10c4088bdef7 *inst/shiny/global.r
58b566af0c8dee410e5c09017231a2ba *inst/shiny/global.r
44ff40cdb28a33e99e672423a21ee127 *inst/shiny/img/prezista.png
1b72cdf1fc07943a257c1f623b074586 *inst/shiny/img/snapshotforest.png
ab0efd2d019205799f5b7c05733e7193 *inst/shiny/img/snapshottable.png
e9025bf8b6c2054a45c170ad8a47c2b0 *inst/shiny/rsconnect/shinyapps.io/pharmacometrics/coveffectsplot.dcf
c6689f4e9fb11be618751a269676ad77 *inst/shiny/server.R
827d71c19a8c76070be699c467dfecf6 *inst/shiny/rsconnect/shinyapps.io/pharmacometrics/coveffectsplot.dcf
a627bb5492d664fdf8c1e1602c513e52 *inst/shiny/server.R
b06e12d8e8ed3b6fc4958b8f2516c8ab *inst/shiny/text/howto.md
47e8a311401ca94330996b7cff06b1b2 *inst/shiny/ui.R
3f712f6c6181e718788e71eb7889161f *inst/shiny/ui.R
5997ca1b82c344a6f0358b7452654cd7 *man/covdatasim.Rd
45bf0cfba83ac4c106b5ef24b71ea901 *man/draw_key.Rd
4d2a1473562d63fe11a781660e39b47d *man/forest_plot.Rd
c7bfd3a61d5261d851f3161d891a7686 *man/expand_modelframe.Rd
6b45bb3137d51f311a1759bbbbfcc4b7 *man/forest_plot.Rd
ad5f49d7c4c13d715661593f13a67053 *man/get_sample_data.Rd
e48f57b19a6f8eb26dd3d4d1334acaaf *man/prezista.Rd
099bad5dbc59b9de66874bcc6c89c32e *man/run_interactiveforestplot.Rd
c8715b8e7207ff745aa1dfdf5f5003cf *man/wtage.Rd
64d26a1bdaa0415d2d3a38801ee50307 *vignettes/Exposure_Response_Example.Rmd
2b0dcb722f294cc9bb68d00a39e784ad *vignettes/PKPD_Example.Rmd
236e7fbc7f6416f6fa49fc995d62cc1f *vignettes/PK_Example.Rmd
69ab1d15b5da14d01bd08ea59e208ca4 *vignettes/PK_Example_full.Rmd
ddcc4f6f3c5d0c97c2d0c876b5637d46 *vignettes/Pediatric_Cov_Sim.Rmd
bde504f48a7b9cf97be28be6e52da7c2 *vignettes/Exposure_Response_Example.Rmd
d31ccc738b927b4c0ae7060725807fbd *vignettes/PKPD_Example.Rmd
98c3b42337855050c64bfb41308c6abf *vignettes/PK_Example.Rmd
9d41a5cb9d2bdefc48f34d47db91a14d *vignettes/PK_Example_full.Rmd
7b04d45388215bd4f75ef167b26aecdb *vignettes/Pediatric_Cov_Sim.Rmd
9e4153fc1dd78e4081dbeb468ec0c533 *vignettes/app.Rmd
70db5fc25a073be70c890b91d5ad608f *vignettes/covdatasim.csv
3f4513a0bf100a3367f942c8225a976a *vignettes/introduction_to_coveffectsplot.Rmd
7f4ed30068a5b762599bb2f30a856eb3 *vignettes/img/logo_coveffectsplot.png
44ff40cdb28a33e99e672423a21ee127 *vignettes/img/prezista.png
1b72cdf1fc07943a257c1f623b074586 *vignettes/img/snapshotforest.png
ab0efd2d019205799f5b7c05733e7193 *vignettes/img/snapshottable.png
dfebbd0d525d83413e580d2129e3e3c1 *vignettes/introduction_to_coveffectsplot.Rmd
2 changes: 2 additions & 0 deletions NAMESPACE
Expand Up @@ -2,7 +2,9 @@

export(draw_key_hpath)
export(draw_key_pointrangeh)
export(expand_modelframe)
export(forest_plot)
export(get_sample_data)
export(run_interactiveforestplot)
import(data.table, except = c(last,between,first))
importFrom(colourpicker,colourInput)
22 changes: 20 additions & 2 deletions NEWS.md
@@ -1,7 +1,25 @@
# coveffectsplot 1.0.4
* updated vignettes and examples
* added citation and start up message
* added `major_x_labels` argument for custom x labels
* added `interval_linewidth` argument to control interval linewidth
* added and exported `expand_modelframe` function
* added the possibility to select the shapes manually via `interval_shape` and `bsv_shape`
* added capability for user to reverse color legend separately via `legend_color_reverse`
* added capability for user to specify text for legend titles via `interval_legend_title` and `shape_legend_title` as well as to control legend title text size via `legend_title_size`
* added capability for user to specify facet text color via `x_facet_text_col` and `y_facet_text_col` for improved theming support
* added possibility to add different ref line(s)/area(s) by parameter via
`ref_value_by_panel` and `ref_value_by_panel_data` function arguments (not in the shiny, app)

# coveffectsplot 1.0.3
* fixed a bug when ref_value when not equal 1 affecting y axis limits
* fixed a bug when the guides for color and shape were not merged
* updated the UI to be able to specify user-defined color for parameters

# coveffectsplot 1.0.2
* vignettes updated to reflect latest addition for the tutorial CPT:PSP paper
* Added a function arguments `paramname_color` and `combine_interval_shape_legend` to enable color by paramname
* Added a function arguments `combine_interval_shape_legend` to enable merging of color and pointinterval legends
* Added function arguments `paramname_color` and `combine_interval_shape_legend` to enable color by paramname
* Added function arguments `combine_interval_shape_legend` to enable merging of color and pointinterval legends
* Added `covdatasim` as a dataset

# coveffectsplot 1.0.1
Expand Down
29 changes: 29 additions & 0 deletions R/expand_modelframe.R
@@ -0,0 +1,29 @@
#' Expand covariate values choices and reference values varying one at a time
#'
#' @param rv a data.frame with columns names of covariate(s) and values equal reference
#' @param covcol column name for the covariate being varied
#' @param ... Arguments to be passed to methods
#' @return A data.frame with combination of covariates
#' @examples
#' reference.values <- data.frame(WT = 85, ALB = 45, SEX = 0)
#' covcomb <- expand_modelframe(
#' WT = c(56, 72, 98, 128), # P05, P25, P75, P95 # ref is P50
#' ALB = c(40, 50), # P05, P95 # ref is P50
#' SEX = c(1), # Reference is for SEX=0 (female)
#' rv = reference.values)
#' covcomb
#' @export
expand_modelframe <- function( rv, covcol="covname", ...) {
args <- list(...)
df <- lapply(args, function(x) x[[1]])
df[names(rv)] <- rv
res <- lapply(seq_along(rv), function(i) {
df[[covcol]] <- names(rv)[i]
df[[names(rv)[i]]] <- args[[names(rv)[i]]]
as.data.frame(df)
})
do.call(rbind, res)
}



0 comments on commit 561ca41

Please sign in to comment.