Skip to content
Open
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
aea299a
Adding class sero_mod_output to run_mod output
sschildhauer Jun 25, 2025
a13db94
Specifying class in run_mod
sschildhauer Jun 25, 2025
eef3d8e
creating default print function method for sero_mod_output objects
sschildhauer Jun 25, 2025
147ae9e
Adding S3 method to NameSpace
sschildhauer Jun 25, 2025
ea74517
Documentation for default print method
sschildhauer Jun 25, 2025
4af5d36
Merging with main
sschildhauer Jul 9, 2025
102cb80
Creating default print for run_mod objects
sschildhauer Jul 9, 2025
7323fda
Creating a test for default run_mod object print
sschildhauer Jul 9, 2025
88b96af
Updating example for print default
sschildhauer Jul 9, 2025
91a887f
Updating documentation for default print
sschildhauer Jul 9, 2025
a7afd63
Arranging data by Iso_type to allow for easy comparison between strat…
sschildhauer Jul 9, 2025
f5be2b3
Adding test snap for run_mod object default print
sschildhauer Jul 9, 2025
ba5973f
Updating default sr_model print documentation
sschildhauer Jul 9, 2025
4ed27e6
Updating example for print.sr_model
sschildhauer Jul 9, 2025
8e5eba7
Increment version number to 0.0.0.9035
sschildhauer Jul 9, 2025
f377d5c
Updating news
sschildhauer Jul 9, 2025
9711df6
Adding print.sr_model to pkgdown
sschildhauer Jul 9, 2025
ff9ee85
Deleting a previous default print method that was being created
sschildhauer Jul 9, 2025
8eed4a7
Updating function for pivot_wider
sschildhauer Jul 9, 2025
7a5ec62
Updating documentation to take out old print function
sschildhauer Jul 9, 2025
eb4e282
Updating wordlist
sschildhauer Jul 10, 2025
141ba3c
Updating lint
sschildhauer Jul 10, 2025
f95a88a
Fixing no lint.
sschildhauer Jul 10, 2025
4dcd890
Updating test lint
sschildhauer Jul 14, 2025
ee0a73c
Changing review recommended test code
sschildhauer Jul 14, 2025
0dbc9a2
Updating test code based on review recommendations
sschildhauer Jul 14, 2025
a22ed27
Adding .data$ back in to code
sschildhauer Jul 14, 2025
29ec557
Update NEWS.md
sschildhauer Jul 16, 2025
9de64b0
Updating parameter inputs to refelct x, ...
sschildhauer Jul 17, 2025
b1d15c4
Fixing column call for taking out Stratification
sschildhauer Jul 17, 2025
0dcac18
Fixing column Stratification exclusion
sschildhauer Jul 17, 2025
86e9965
Changing object call in function to "x"
sschildhauer Jul 17, 2025
d97e4b2
Updating test for default print
sschildhauer Jul 17, 2025
3665740
Merge branch 'default_print' of https://github.com/UCD-SERG/serodynam…
sschildhauer Jul 17, 2025
afc12a7
Merging with main after plot_predicted_curve update
sschildhauer Jul 17, 2025
42b1810
Increment version number to 0.0.0.9036
sschildhauer Jul 17, 2025
5c9fe1c
Updating visible binding
sschildhauer Jul 17, 2025
1252e18
Merged origin/main into default_print
sschildhauer Jul 31, 2025
9a6931e
Updating output description and documentation
sschildhauer Jul 31, 2025
6dda0ca
Increment version number to 0.0.0.9037
sschildhauer Jul 31, 2025
d72bedc
Deleting snap
sschildhauer Jul 31, 2025
26c7800
Updating test and snapshot
sschildhauer Jul 31, 2025
27b1c52
Fixing lint in test
sschildhauer Aug 1, 2025
e6b54c1
Fixing for closure
sschildhauer Aug 1, 2025
1657ff1
Fixing data call in if statement
sschildhauer Aug 1, 2025
571bf16
Updating snap.
sschildhauer Aug 1, 2025
95a91c9
making output table a dataframe to get rid of tibble descriptors
sschildhauer Aug 3, 2025
3915ec2
Updating print test
sschildhauer Aug 4, 2025
4233b52
Updating snap
sschildhauer Aug 4, 2025
37f451e
Making model output median value
sschildhauer Aug 7, 2025
3f8c706
Updating test snap
sschildhauer Aug 7, 2025
afbb88a
Merge branch 'main' into default_print
sschildhauer Aug 7, 2025
ff21aa3
Increment version number to 0.0.0.9038
sschildhauer Aug 8, 2025
47ab5b0
Redoing snap
sschildhauer Aug 8, 2025
0c2a6bd
Updating snap to suppress warnings
sschildhauer Aug 8, 2025
04c7200
Updating snap
sschildhauer Aug 8, 2025
87dd5c7
troubleshooting snap
sschildhauer Aug 8, 2025
9f2fd61
Fixing lint
sschildhauer Aug 8, 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 NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generated by roxygen2: do not edit by hand

S3method(autoplot,case_data)
S3method(print,sr_model)
export(as_case_data)
export(autoplot)
export(get_biomarker_levels)
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

## New features

* Creating default print.sr_model function for sr_model class (#114)
* Added `plot_predicted_curve()` (#68)
* Replacing old data object with new run_mod output (#102)
* Adding class assignment to run_mod output (#76)
Expand Down
1 change: 1 addition & 0 deletions R/Run_Mod.R
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,5 @@ run_mod <- function(data,
jags_out <- jags_out |>
structure(class = union("sr_model", class(jags_out)))
jags_out

}
28 changes: 28 additions & 0 deletions R/print.sr_model.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#' @title Default print for [serodynamics::run_mod()] output object of class
#' `sr_model`
#' @description
#' A default print method for class `sr_model` that includes the mean posterior
#' distribution for antibody kinetic curve parameters by `Iso_type` and
#' `Stratification` (if specified).
#' @param x An `sr_model` output object from [run_mod()].
#' @param ... Additional arguments affecting the summary produced.
#' [serodynamics::run_mod()] function.
#' @returns A [dplyr::grouped_df] that
#' contains the mean posterior distribution for antibody kinetic curve
#' parameters by `Iso_type` and `Stratification` (if specified).
#' @export
#' @examples
#' print(nepal_sees_jags_output)
print.sr_model <- function(x, ...) { # nolint
x <- x |>
dplyr::group_by(.data$Stratification, .data$Iso_type, .data$Parameter) |>
dplyr::summarise(mean_val = mean(.data$value)) |>
tidyr::pivot_wider(names_from = .data$Parameter,
values_from = .data$mean_val) |>
dplyr::arrange(.data$Iso_type)
# Taking out stratification column if not specified
if (unique(data$Stratification == "None")) {
x <- x |> select(-all_of(Stratification))

Check warning on line 25 in R/print.sr_model.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/print.sr_model.R,line=25,col=30,[object_usage_linter] no visible binding for global variable 'Stratification'
}
invisible(x)
}
10 changes: 10 additions & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Biomarker
CMD
CodeFactor
Codecov
Hyperpriors
JAGs
Lifecycle
Postprocess
Expand All @@ -9,29 +11,37 @@ Traceplots
behaviour
biomarker
biomarkers
bmatrix
cdot
dobson
dotplots
geoms
ggproto
hyp
hyperprior
hyperpriors
ij
iso
isotype
isotypes
mathcal
mcmc
nmc
overfit
params
prec
pred
rhat
sd
seroconversion
serocourse
seroresponse
seroresponses
sr
strat
stratifications
tbl
tibble
unstratified
wishdf
dayssincefeveronset
Expand Down
28 changes: 28 additions & 0 deletions man/print.sr_model.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkgdown/_pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ reference:
- title: Summarize seroresponse model estimates
contents:
- post_summ
- print.sr_model
- title: Example data sets
contents:
- serodynamics_example
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Stratification,Iso_type,alpha,shape,t1,y0,y1
paratyphi,HlyE_IgA,0.00228672,1.66482,3.85028,2.55072,1024.3
typhi,HlyE_IgA,0.00290543,1.61299,7.3068,2.9673,1031.9
paratyphi,HlyE_IgG,0.00256872,1.36053,4.7794,1.72131,833.105
typhi,HlyE_IgG,0.00153667,1.40846,8.72891,2.31451,338.572
9 changes: 9 additions & 0 deletions tests/testthat/test-print.sr_model.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
test_that(
desc = "results are consistent with printed output for sr_model class",
code = {
withr::local_seed(1)
results <- print(nepal_sees_jags_output) |>
ssdtools:::expect_snapshot("default-print-runmod-object")

}
)
Loading