Skip to content

Commit d6f5645

Browse files
cthunesmadison-feshukkpaulfriedmanAshley-Ko
authored
First pass vignette updates for v3.2 release (#271)
* 210 intro vignette conc -> logc change * 210 new mc4 cols added to intro vignette mc4 table * 210 updated titles and removed data retrieval v2 vignette * 210 added link to URL line in DESCRIPTION * 210 updated tcplVarMat appendix section to reflect updates * 210 updated tcplConf section * 210 remove level 6 processing not possible * 210 added sections in data retrieval vignette covering new 'ow' mthds * 210 update data retrieval title * 210 remove line about removing well types * 210 update summary values list in processing vignette * 210 update existing tcplPlot text and examples with updated parameters * 210 added new tcplPlot examples showing new parameters and use-cases * 210 added single conc plotting examples to data retrieval vignette * 210 data retrieval add tcplConf, backwards compatibility, fix headers * 210 update tcplLoadClib to tcplLoadChemList in data retrieval vignette * clean up mc4 and mc6 mthd documentation * Reformat Rmds style, add hex, edits throughout * fix model_type in mc5 table * fix cytotox * Update Data_interpretation.Rmd I edited text throughout in minor ways to clarify. * Update Introduction_Appendices.Rmd Minor textual changes * Update Data_processing.Rmd Minor edits throughout - tcplfit2 (case sensitive), POD to potency estimates (so as not to confused with in vivo PODs), and some other textual edits. * Update Data_processing.Rmd More minor text updates on flag filtering. * Update Data_retrieval.Rmd Minor typos fixed * Update Data_retrieval_via_API.Rmd Minor grammatical changes * minor vignette updates, clean up README and DESC * update readme as Rmd for badges * add DOI and hex * additional badges * update hex for better alignment * fix badges * final badge update * hyperlink hex to CRAN * Update Data_interpretation.Rmd delete "provided for the Hill and Gain Loss models" from ac50 explanation * update hit call, ac50, and cutoff paragraphs Clarified some text around definitions of hit call, ac50, and cutoff * Update Data_interpretation.Rmd minor grammar edits * Changes to activity concentration text Updates to text for activity concentration at specified response and cutoff for read-ability. * Update representative sample and tcplVarMat sections text updates for clarity. * Updates to burst cytotox text Minor updates to burst cytotox text * text edits to potency metric section * cytotox burst edits * Update Data_interpretation.Rmd Updated cytotox burst text, see lines 304-309 * combine vignettes into 1 * fix some typos and remove orig JSON file * final edits before handing off to Ashley to review * Corrected in text links, cleaned up code spacing for consistancy, other small formatting changes corrected to text for consistancy, added better description of nmed_gtbl_pos/neg and related level 6 flags. * Corrected in text links, cleaned up code spacing for consistancy, other small formatting changes corrected to text for consistancy, added better description of nmed_gtbl_pos/neg and related level 6 flags. * Removed extra spaces and aligned lists. * Repaired broken link * Updated data.table requirements to reflect new 1.15.0 requirement * Removing extra space from version requirement to data.table * Update Introduction_Appendices.Rmd Switching package load from devtools to library(tcpl) * switch to new hex that includes link and EPA logo --------- Co-authored-by: Feshuk <[email protected]> Co-authored-by: kpaulfriedman <[email protected]> Co-authored-by: Ko <[email protected]> Co-authored-by: Madison Feshuk <[email protected]>
1 parent e0b112d commit d6f5645

33 files changed

+3386
-113788
lines changed

Diff for: .Rbuildignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
^inst/sql/create_sql_files\.R$
77
man-roxygen
88
tcpl.Rcheck
9-
README.md
9+
^README\.Rmd$
1010
CONTRIBUTING.md
1111
cran-comments.md
1212
^CRAN-RELEASE$

Diff for: DESCRIPTION

+11-13
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,28 @@ Package: tcpl
22
Title: ToxCast Data Analysis Pipeline
33
Version: 3.1.0
44
Authors@R: c(
5-
person("Richard S", "Judson",role = c("ctb","ths"), email = "[email protected]"),
6-
person("Dayne L", "Filer", role = "aut",email = "[email protected]"),
7-
person("Jason","Brown",role = "cre", email = "[email protected]"),
8-
person("Sarah E","Davidson-Fritz",role = "ctb",email = "[email protected]", comment = c(ORCID = "0000-0002-2891-9380")),
5+
person("Richard S", "Judson",role = c("ctb","ths"), comment = c(ORCID = "0000-0002-2348-9633")),
6+
person("Dayne L", "Filer", role = "aut"),
7+
person("Jason","Brown", role = "cre", email = "[email protected]", comment = c(ORCID = "0009-0000-2294-641X")),
8+
person("Sarah E","Davidson-Fritz", role = "ctb",email = "[email protected]", comment = c(ORCID = "0000-0002-2891-9380")),
99
person("Madison","Feshuk",role = "ctb",email = "[email protected]", comment = c(ORCID = "0000-0002-1390-6405")),
10-
person("Lori","Kolaczkowski",role = "ctb",email = "[email protected]"),
11-
person("Kurt", "Dunham", role = "ctb", email = "[email protected]"),
1210
person("Carter", "Thunes", role = "ctb", email = "[email protected]"),
1311
person("Ashley", "Ko", role = "ctb", email = "[email protected]"),
14-
person("Todd", "Zurlinden", role="ctb"),
12+
person("Kelly", "Carstens", role = "ctb", email = "[email protected]", comment = c(ORCID = "0000-0002-1746-5379")),
13+
person("Todd", "Zurlinden", role="ctb", comment = c(ORCID = "0000-0003-1372-3913")),
14+
person("Lori","Kolaczkowski",role = "ctb"),
15+
person("Kurt", "Dunham", role = "ctb"),
1516
person("Parth", "Kothiya", role = "ctb"),
1617
person("Woodrow R", "Setzer", role = "ctb"),
1718
person("Matthew T", "Martin", role = c("ctb", "ths")),
1819
person("Katie", "Paul Friedman", role=c("ctb"), email = "[email protected]", comment = c(ORCID = "0000-0002-2710-1691"))
1920
)
20-
Description: A set of tools for processing and modeling high-throughput and
21-
high-content chemical screening data. The package was developed for the
22-
the chemical screening data generated by the US EPA ToxCast program, but
23-
can be used for diverse chemical screening efforts.
24-
URL: https://github.com/USEPA/CompTox-ToxCast-tcpl
21+
Description: The ToxCast Data Analysis Pipeline (tcpl) is an R package that manages, curve-fits, plots, and stores ToxCast data to populate its linked MySQL database, invitrodb. The package was developed for the chemical screening data curated by the US EPA's Toxicity Forecaster (ToxCast) program, but tcpl can be used to support diverse chemical screening efforts.
22+
URL: https://github.com/USEPA/CompTox-ToxCast-tcpl, https://www.epa.gov/comptox-tools/toxicity-forecasting-toxcast
2523
Depends:
2624
R (>= 3.5.0)
2725
Imports:
28-
data.table (>= 1.9.4),
26+
data.table (>= 1.15.0),
2927
DBI,
3028
RMariaDB,
3129
numDeriv,

Diff for: R/mc4_mthds.R

+8-9
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,22 @@
3535
#'
3636
#' \describe{
3737
#' \item{bmad.aeid.lowconc.twells}{Calculate the baseline median absolute value (bmad) as the
38-
#' median absolute deviation of normalized response values (rep) for test compound wells
39-
#' (wllt = t) with concentration index (cndx) equal to 1 or 2.}
38+
#' median absolute deviation of normalized response values (rep) for test compound wells (wllt = t)
39+
#' with concentration index (cndx) equal to 1 or 2. Calculate one standard deviation of the normalized
40+
#' response for test compound wells (wllt = t) with a concentration index (cndx) of 1 or 2;
41+
#' onesd = sqrt(sum((resp - mean resp)^2)/sample size - 1). Onesd is used to establish BMR and therefore required for tcplfit2 processing.}
4042
#' \item{bmad.aeid.lowconc.nwells}{Calculate the baseline median absolute value (bmad) as the
41-
#' median absolute deviation of normalized response values (resp) for neutral control wells
42-
#' (wllt = n).}
43-
#' \item{onesd.aeid.lowconc.twells}{Calculate one standard deviation of the normalized response
44-
#' for test compound wells (wllt = t) with a concentration index (cndx) of 1 or 2;
45-
#' \eqn{onesd=\sqrt{\sum{(resp-mean(resp))^{2}}/(n-1)}}{onesd = sqrt(sum((resp - mean
46-
#' resp)^2)/sample size - 1)}. Used to establish BMR and therefore required for tcplfit2
47-
#' processing.}
43+
#' median absolute deviation of normalized response values (resp) for neutral control wells (wllt = n).
44+
#' Calculate one standard deviation of the normalized response for neutral control wells (wllt = n);
45+
#' onesd = sqrt(sum((resp - mean resp)^2)/sample size - 1). Onesd is used to establish BMR and therefore required for tcplfit2 processing.}
4846
#' \item{bidirectional.false}{Limits bidirectional fitting and processes data in positive
4947
#' analysis direction only. Use for gain-of-signal or inverted data.}
5048
#' \item{bmad5.onesd16.static}{Replace baseline median absolute deviation
5149
#' (bmad) with 5 and one standard deviation (osd) of the normalized response
5250
#' for test compound wells (wllt = t) with a concentration index (cndx) of 1
5351
#' or 2 with 16. Typically used for binary data where values would otherwise
5452
#' be 0; non-zero values are required for tcplfit2 processing.}
53+
#' \item{no.unbounded.models}{Exclude unbounded models and only fit data to bounded models (hill, gnls, exp4 and exp5).}
5554
#' }
5655
#'
5756
#' @note

Diff for: R/mc6_mthds.R

-5
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@
6767
#' defined by 3 times the baseline median absolute deviation (bmad); nmed_gtbl_pos and
6868
#' nmed_gtbl_neg both = 0, where nmed_gtbl_pos/_neg is the number of medians greater than 3 *
6969
#' bmad/less than -3 * bmad.}
70-
#' \item{no.med.single.dir.gt.3bmad}{Flag series where no median response values in the intended
71-
#' fit direction are greater than baseline as defined by 3 times the baseline median absolute
72-
#' deviation (bmad); Depending on intended direction, either nmed_gtbl_pos or nmed_gtbl_neg are
73-
#' = 0, where nmed_gtbl_pos/_neg is the number of medians greater than 3 * bmad/less than -3
74-
#' * bmad.}
7570
#' }
7671
#'
7772
#' @note

Diff for: R/tcplSubsetChid.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#' To select a single sample, first a "consensus hit-call" is made by majority
2424
#' rule, with ties defaulting to active. After the chemical-wise hit call is
2525
#' made, the samples corresponding to to chemical-wise hit call are logically
26-
#' ordered using the fit category, the number of the flags, and the modl_ga,
26+
#' ordered using the fit category, the number of the flags, and AC50 (or modl_ga),
2727
#' then the first sample for every chemical is selected.
2828
#'
2929
#' The \code{flag} param can be used to specify a subset of flags to be used in

Diff for: README.Rmd

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
output: github_document
3+
---
4+
5+
<!-- README.md is generated from README.Rmd. Please edit that file -->
6+
7+
```{r, include = FALSE}
8+
knitr::opts_chunk$set(
9+
collapse = TRUE,
10+
comment = "#>",
11+
fig.path = "man/figures/README-",
12+
out.width = "100%"
13+
)
14+
```
15+
16+
# tcpl: The ToxCast Data Analysis Pipeline Supporting Accessible Bioactivity Data for Toxicology
17+
18+
<!-- badges: start -->
19+
20+
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/tcpl)](https://cran.r-project.org/package=tcpl)
21+
[![Active](http://img.shields.io/badge/Status-Active-green.svg)](https://cran.r-project.org/package=tcpl)
22+
[![Monthly Downloads](https://cranlogs.r-pkg.org/badges/last-month/tcpl?color=7BAFD4)](https://cranlogs.r-pkg.org/badges/last-month/tcpl?color=7BAFD4)
23+
[![DOI](https://zenodo.org/badge/doi/ 10.32614/CRAN.package.tcpl.svg)](http://dx.doi.org/10.32614/CRAN.package.tcpl)
24+
25+
<!-- badges: end -->
26+
27+
## Welcome to the GitHub repository for the tcpl package.
28+
29+
<a href="https://cran.r-project.org/web/packages/tcpl/index.html"><img src="vignettes/img/tcpl_hex.png" width="200" align="right" /></a>
30+
31+
The ToxCast Data Analysis Pipeline (tcpl) is an R package that manages, curve-fits, plots, and stores ToxCast data to populate its linked MySQL database, invitrodb. The package was developed for the chemical screening data generated by the [US EPA's Toxicity Forecaster (ToxCast) program](https://www.epa.gov/chemical-research/toxicity-forecasting). tcpl can be used to support diverse chemical screening efforts.
32+
33+
If you are interested in contributing or want to report a bug, please submit a issue or start a discussion. See [CONTRIBUTING](CONTRIBUTING.md) for more information.
34+
35+
To install the current development version, run the following command:
36+
37+
devtools::install_github("USEPA/CompTox-ToxCast-tcpl")
38+

Diff for: README.md

+27-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,33 @@
1-
### tcpl: An R package for processing high-throughput chemical screening data
21

3-
Welcome to the GitHub repository for the tcpl package.
2+
<!-- README.md is generated from README.Rmd. Please edit that file -->
43

5-
The tcpl package provides a set of tools for processing and modeling high-throughput and high-content chemical screening data. The package was developed for the chemical screening data generated by the US EPA [ToxCast program](https://www.epa.gov/chemical-research/toxicity-forecasting), but can be used for diverse chemical screening efforts.
4+
# tcpl: The ToxCast Data Analysis Pipeline Supporting Accessible Bioactivity Data for Toxicology
65

7-
If you are interested in contributing or want to report a bug, please see [CONTRIBUTING](CONTRIBUTING.md) for more information.
6+
<!-- badges: start -->
87

9-
To install the current development version run the following command:
8+
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/tcpl)](https://cran.r-project.org/package=tcpl)
9+
[![Active](http://img.shields.io/badge/Status-Active-green.svg)](https://cran.r-project.org/package=tcpl)
10+
[![Monthly
11+
Downloads](https://cranlogs.r-pkg.org/badges/last-month/tcpl?color=7BAFD4)](https://cranlogs.r-pkg.org/badges/last-month/tcpl?color=7BAFD4)
12+
[![DOI](https://zenodo.org/badge/doi/%2010.32614/CRAN.package.tcpl.svg)](http://dx.doi.org/10.32614/CRAN.package.tcpl)
13+
14+
<!-- badges: end -->
15+
16+
## Welcome to the GitHub repository for the tcpl package.
17+
18+
<a href="https://cran.r-project.org/web/packages/tcpl/index.html"><img src="vignettes/img/tcpl_hex.png" width="200" align="right" /></a>
19+
20+
The ToxCast Data Analysis Pipeline (tcpl) is an R package that manages,
21+
curve-fits, plots, and stores ToxCast data to populate its linked MySQL
22+
database, invitrodb. The package was developed for the chemical
23+
screening data generated by the [US EPA’s Toxicity Forecaster (ToxCast)
24+
program](https://www.epa.gov/chemical-research/toxicity-forecasting).
25+
tcpl can be used to support diverse chemical screening efforts.
26+
27+
If you are interested in contributing or want to report a bug, please
28+
submit a issue or start a discussion. See
29+
[CONTRIBUTING](CONTRIBUTING.md) for more information.
30+
31+
To install the current development version, run the following command:
1032

1133
devtools::install_github("USEPA/CompTox-ToxCast-tcpl")

0 commit comments

Comments
 (0)