Skip to content

Commit 19665f1

Browse files
documentation website function update and vignete update
1 parent 9d4b227 commit 19665f1

13 files changed

Lines changed: 193 additions & 191 deletions

File tree

CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cff-version: 1.2.0
2-
message: "Matthew P Hamilton (2024). ready4: Develop and Use Modular Health Economic Models. Version 0.0.1. Zenodo. https://doi.org/10.5281/zenodo.5606250"
2+
message: "Matthew P Hamilton (2024). ready4: Develop and Use Modular Health Economic Models. Version 0.1.20. Zenodo. https://doi.org/10.5281/zenodo.5606250"
33
authors:
44
- family-names: "Hamilton"
55
given-names: "Matthew P"
66
title: "ready4: Develop and Use Modular Health Economic Models"
7-
version: 0.0.1
7+
version: 0.1.20
88
doi: 10.5281/zenodo.5606250
9-
date-released: 2025-12-10
9+
date-released: 2026-01-29
1010
url: "https://ready4-dev.github.io/ready4/"

DESCRIPTION

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Description: A template model module, tools to help find model modules
1919
use it visit <https://www.ready4-dev.com/>. For a background to the
2020
methodological issues that the framework is attempting to help solve,
2121
see Hamilton et al. (2024) <doi:10.1007/s40273-024-01378-8>.
22-
License: GPL-3 + file LICENSE
22+
License: GPL-3
2323
URL: https://ready4-dev.github.io/ready4/,
2424
https://github.com/ready4-dev/ready4, https://www.ready4-dev.com/
2525
Encoding: UTF-8
@@ -30,8 +30,6 @@ Collate:
3030
'C4_Ready4Private.R'
3131
'C4_Ready4Project.R'
3232
'C4_Ready4Public.R'
33-
'add.R'
34-
'bind.R'
3533
'fn_add.R'
3634
'fn_bind.R'
3735
'fn_get.R'
@@ -42,11 +40,9 @@ Collate:
4240
'fn_transform.R'
4341
'fn_update.R'
4442
'fn_write.R'
45-
'get.R'
4643
'grp_generics.R'
4744
'imp_fns.R'
4845
'imp_mthds.R'
49-
'make.R'
5046
'mthd_authorSlot.R'
5147
'mthd_characterizeSlot.R'
5248
'mthd_depictSlot.R'
@@ -63,34 +59,31 @@ Collate:
6359
'mthd_renewSlot.R'
6460
'mthd_shareSlot.R'
6561
'pkg_ready4.R'
66-
'print.R'
6762
'ready4-package.R'
68-
'remove.R'
69-
'rowbind.R'
70-
'transform.R'
71-
'update.R'
72-
'write.R'
7363
Suggests:
64+
devtools,
65+
Hmisc,
7466
knitr,
75-
testthat
67+
pkgload,
68+
readr,
69+
readxl,
70+
rmarkdown,
71+
testthat,
72+
usethis,
73+
zen4R
7674
VignetteBuilder: knitr
7775
Imports:
7876
curl,
7977
dataverse,
80-
devtools,
8178
dplyr,
8279
gh,
83-
Hmisc,
8480
kableExtra,
8581
lifecycle,
8682
magrittr,
8783
methods,
8884
piggyback,
8985
purrr,
90-
readr,
91-
readxl,
9286
rlang,
93-
rmarkdown,
9487
rvest,
9588
stats,
9689
stringi,
@@ -99,6 +92,5 @@ Imports:
9992
tidyRSS,
10093
tidyselect,
10194
tools,
102-
usethis,
103-
utils,
104-
zen4R
95+
utils
96+
Language: en-AU

R/fn_get.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ get_excluded_repos <- function (gh_repo_1L_chr = "ready4-dev/ready4", gh_tag_1L_
248248
dmt_urls_chr <- dmt_urls_xx
249249
if (any(dmt_urls_chr %>% endsWith("exclude_chr.RDS"))) {
250250
exclude_chr <- get_gracefully(dmt_urls_chr[dmt_urls_chr %>%
251-
endsWith("exclude_chr.RDS")], not_chr_1L_lgl = TRUE)
251+
endsWith("exclude_chr.RDS")], not_chr_1L_lgl = FALSE)
252252
}
253253
else {
254254
exclude_chr <- character(0)

R/fn_make.R

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@ make_modules_tb <- function (pkg_extensions_tb = NULL, cls_extensions_tb = NULL,
911911
#' @param format_1L_chr Format (a character vector of length one), Default: '%d-%b-%Y'
912912
#' @param gh_repo_1L_chr Github repository (a character vector of length one), Default: 'ready4-dev/ready4'
913913
#' @param gh_tag_1L_chr Github tag (a character vector of length one), Default: 'Documentation_0.0'
914+
#' @param org_1L_chr Organisation (a character vector of length one), Default: 'ready4-dev'
914915
#' @param tidy_desc_1L_lgl Tidy description (a logical vector of length one), Default: TRUE
915916
#' @param url_stub_1L_chr Url stub (a character vector of length one), Default: 'https://ready4-dev.github.io/'
916917
#' @param zenodo_1L_chr Zenodo (a character vector of length one), Default: 'ready4'
@@ -935,7 +936,7 @@ make_modules_tb <- function (pkg_extensions_tb = NULL, cls_extensions_tb = NULL,
935936
make_programs_tbl <- function (what_1L_chr = c("Program", "Subroutine", "Program_and_Subroutine"),
936937
as_kbl_1L_lgl = FALSE, exclude_chr = character(0), format_1L_chr = "%d-%b-%Y",
937938
gh_repo_1L_chr = "ready4-dev/ready4", gh_tag_1L_chr = "Documentation_0.0",
938-
tidy_desc_1L_lgl = TRUE, url_stub_1L_chr = "https://ready4-dev.github.io/",
939+
org_1L_chr = "ready4-dev", tidy_desc_1L_lgl = TRUE, url_stub_1L_chr = "https://ready4-dev.github.io/",
939940
zenodo_1L_chr = "ready4", ...)
940941
{
941942
if (!requireNamespace("zen4R", quietly = TRUE)) {
@@ -944,8 +945,8 @@ make_programs_tbl <- function (what_1L_chr = c("Program", "Subroutine", "Program
944945
what_1L_chr <- match.arg(what_1L_chr)
945946
programs_xx <- make_code_releases_tbl(what_1L_chr, as_kbl_1L_lgl = FALSE,
946947
exclude_chr = exclude_chr, gh_repo_1L_chr = gh_repo_1L_chr,
947-
gh_tag_1L_chr = gh_tag_1L_chr, tidy_desc_1L_lgl = FALSE,
948-
url_stub_1L_chr = url_stub_1L_chr)
948+
gh_tag_1L_chr = gh_tag_1L_chr, org_1L_chr = org_1L_chr,
949+
tidy_desc_1L_lgl = FALSE, url_stub_1L_chr = url_stub_1L_chr)
949950
if (!is.null(programs_xx)) {
950951
programs_xx <- programs_xx %>% dplyr::group_by(!!rlang::sym(what_1L_chr)) %>%
951952
dplyr::filter(dplyr::row_number() == 1) %>% dplyr::arrange(!!rlang::sym(what_1L_chr)) %>%

data-raw/NOTES.R

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,16 @@ module_libraries_ls <- list(People = list(names_chr = c("youthvars", "scorz", "s
2222
descriptions_chr = c("Description (datasets)", "Description (variable scoring)", "Modelling (inverse problems)", "Modelling (health utility)", "Prediction (health utility)", "Modelling (choice)", "Modelling (heterogeneity)")),
2323
Places = list(names_chr = c("aus", "vicinity"),
2424
descriptions_chr = c("Modelling (Australian spatial)", "Modelling (spatial)")),
25-
#Platforms = ,
26-
Programs = list(names_chr = c("bimp", "costly"),
27-
descriptions_chr = c("Modelling (budget impact)", "Modelling (costs)")))
25+
Platforms = list(names_chr = c("mimic"),
26+
descriptions_chr = c("Modelling (microsimulation)")),
27+
Programs = list(names_chr = c(
28+
# "bimp",
29+
"costly",
30+
"serious"),
31+
descriptions_chr = c(
32+
# "Modelling (budget impact)",
33+
"Modelling (costs)",
34+
"Modelling (time series)")))
2835
extras_tb <- module_libraries_ls %>% # c("people", "places","platforms","programs")
2936
purrr::map2_dfr(names(module_libraries_ls),
3037
~make_additions_tb(library_chr = .x$names_chr,#make_modules_pkgs_chr(.x),
@@ -63,11 +70,11 @@ Y <- renewSlot(Y,
6370
#classes_bup_lup = Y@b_Ready4useIngest@objects_ls$bup_classes_lup
6471
#classes_lup = Z@b_Ready4useIngest@objects_ls$framework_metadata_ls$classes_lup
6572
#abbreviations_lup = abbreviations_lup,
66-
#libraries_tb = libraries_tb
73+
libraries_tb = libraries_tb,
6774
#exclude_chr = c("aus_09_synth","dce_sa_cards","fakefolk","rebuild")
68-
#libraries_ls = libraries_ls
69-
methods_tb = methods_tb
70-
#modules_tb = modules_tb
75+
libraries_ls = libraries_ls,
76+
# methods_tb = methods_tb
77+
modules_tb = modules_tb
7178
#treat_as_words_chr = Y@b_Ready4useIngest@objects_ls$treat_as_words_chr
7279
)),
7380
slot_nm_1L_chr = "b_Ready4useIngest")

data-raw/fns/get.R

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,19 @@ get_examples <- function(vignettes_chr,
153153
}
154154
return(examples_chr)
155155
}
156-
get_excluded_repos <- function(gh_repo_1L_chr = "ready4-dev/ready4",
157-
gh_tag_1L_chr = "Documentation_0.0"){
156+
get_excluded_repos <- function (gh_repo_1L_chr = "ready4-dev/ready4", gh_tag_1L_chr = "Documentation_0.0"){
158157
exclude_chr <- NULL
159158
dmt_urls_xx <- get_gracefully(NULL, fn = piggyback::pb_download_url,
160-
args_ls = list(repo = gh_repo_1L_chr, tag = gh_tag_1L_chr, .token = ""),
161-
not_chr_1L_lgl = FALSE)
162-
if(!is.null(dmt_urls_xx)){
163-
dmt_urls_chr <- dmt_urls_xx
164-
if(any(dmt_urls_chr %>% endsWith("exclude_chr.RDS"))){
165-
exclude_chr <- get_gracefully(dmt_urls_chr[dmt_urls_chr %>% endsWith("exclude_chr.RDS")], not_chr_1L_lgl = TRUE)
166-
}else{
167-
exclude_chr <- character(0)
168-
}
159+
args_ls = list(repo = gh_repo_1L_chr, tag = gh_tag_1L_chr,
160+
.token = ""), not_chr_1L_lgl = FALSE)
161+
if (!is.null(dmt_urls_xx)) {
162+
dmt_urls_chr <- dmt_urls_xx
163+
if (any(dmt_urls_chr %>% endsWith("exclude_chr.RDS"))) {
164+
exclude_chr <- get_gracefully(dmt_urls_chr[dmt_urls_chr %>%
165+
endsWith("exclude_chr.RDS")], not_chr_1L_lgl = FALSE)
166+
} else {
167+
exclude_chr <- character(0)
168+
}
169169
}
170170
return(exclude_chr)
171171
}

0 commit comments

Comments
 (0)