From 8ea8586d7cf7ad5e410efbe11a0bd2ac1a9ce5de Mon Sep 17 00:00:00 2001 From: Edoardo Mancini Date: Fri, 17 May 2024 10:49:00 +0000 Subject: [PATCH 1/9] #43 #44 Added new presenters and added presenter names --- data/presentation_archive.rda | Bin 1143 -> 1697 bytes inst/presentation_archive.csv | 26 +++++++++++++++----------- vignettes/presentation_archive.Rmd | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/data/presentation_archive.rda b/data/presentation_archive.rda index 27e74aa6667713fbe116e98e4da21652abe3b471..affde7ff818390e0d2ccca74776723375d66bd21 100644 GIT binary patch literal 1697 zcmV;S2449>T4*^jL0KkKS!0+Xg8&3u|Mma>&%#>g|MLI;-~0dn-}*oR3{=1X0ZTOR-dYco}$kGixPf!{f20&;5qd)`oL77aN4^RyU z0000q0002c13&;Y007Vc003|R00Te(01W^%00Te(4FCWD2LJ#7Gynhq&;vjKGynk5 z0000sq*7uu8fXAC000000000005oU-2_yswrXetb8%d@V+7$h&YGm3yC^UMR9#Q0< zsy3mc)X2%B^#s$}rkzLDm)aRc_2!{7EOa3}S2$TG2(^)TK!D)~%)m1QuMOkTx&9+$ zn*J&y5{Zz5XEKe4g$;~-???<8Uj#~sW*X|g`SVA-|M1Tep(YRt_CO~vk#kMBV=mDqsL#P4=7WnjQO-Dvq8#iGX-cc zWQ9No69AG-1Dp zMaH`WYkTdXm{#Fz;1!2sv_uJqwa4C=b2V#jm{CdfSC({))tFQ|&fTc9QKbq&x`nK&6TUqX8lzTm;7SngC_IWQvY8HZ(9v?j}kJ6ZBO#B$+ULq>N}w=AoXer)o!WCDKSVV$fqG zgELzQ*%eY?U?M_LMCm6dCC0+w$`}mYh|XuiBL@x3HuWORvVt)hOz*0xeG5wt8x%Hh zbq+o@wIs-37-D{`+Rk50(d8Kh2w%%|J&j@FHZ;#O2Kf|@%Zbd1Qg9y__0`Jbag>)c zp58r44q9xFWt_qKBz%hZ$?Vcn=HPf>VD*;W&c}{;f`+J+9ni>eSUc62t$Kn)s4DiJ z2C%5=N5JHIypXtu%E`^zjt}gg`;m3T91Jr!JSM#ZH|7~Tp~Jo}#Yl6E zH=E)8*ZMzOX<(($^8JfWG*3AFyre%S?<GFW6{MWw!OQ)7cQK_bvxc_{i1 zi8|6sqqT9@}9=lU}o|3dwn!PCs#$s|7 z#exGI(zXYPI0-pio%!EMz}c3aE1lts-teP!nNQqgP{>n2alvheA4Lbq2%*3i5tT<^ zmgJ5NHu*_$1difLfjDRzdW?@Cxuj{712F`QN_Ew31)`WT4*^jL0KkKS!l~y#Q*}$|K$Js&%jXU|MLI;-}?XW-}*oR1XO@f0Rhki zKI^T$&t9|J&<6JJ2`Hi(Y3gJR9-}}9sAvGukTha6000N5G-wT|GDOupn@DP6WFCmq zK+pg*001-q00w{nGF0&iq}nH`qfb$w00w|GXwU!v4=5QL0i!@Rs%Rp4Mvo{qpfY-Z z000000000zKma05;z zO)<$f?5dI^-=#>Ca!5Q-@_zpXp$L_*mhXCGx&CSTnt(5&%OJo*A1e!pQ zfRPHT00RQbLns1JfRPIU2&vwH$Us0^6Ev1aBsR_YVJrnXD2PybQG?V)37qQ0dcuTe z(FzFU;$y{X(BM<5S%6CpwkO^TSq>}SHE0<4qvX3stA*l`p&vc`&4(DLH9@B?U!(}a zKVX0ws|jj}0?U6Ms;4;`s{)VE41nQWgYKRkz1PQ!%~!JA9giFr$x)4{oeP;)U zFB$gHxPYxY+c-m$v0k#F)grnSwUBhCE!JaDd>Se+zmti2Gq2l`@lvEA=aP6lGJcfp+FTZ;4GZI9MF|Z_FrL?3%Ok!$wW8G!A_l!NPlh=bRGtzv z=qw<>Ra_{KOq9cTV8D^2Fl5`D0DASl;EPp|%jY zfh3}Y!IpDqg-{eRA^?0&zRCO2DkbEXt}IcBCxMJMc}=IBa3Oq7p?XaXvlDg&>s`dz z(Qy0*A&{Wcgx3oy(0R^m&MwXUdb&A<#-{tfe94=K$N5jNgIYE9V3D=0}LscxUG-% zboW{*R`6AQI&hbUZz0NV;lr%o?uOki&Kk~WH&WMl)3FMuS*xFyI5j1u8DW%?ZA+ze zdE9L{*1@#Vnnc%ZtOvz&X~1XH{b_1ClTu{`g^E-Ou_izUCJ{PmC=pq}eks|kpF+F~ zvVuGB-T<@+g&|XjYS)so*+BD;sNEiIJPRudf4~NgiUC9*T JLP4V~XA~Sm0lokL diff --git a/inst/presentation_archive.csv b/inst/presentation_archive.csv index 7e0cfab..fc633b2 100644 --- a/inst/presentation_archive.csv +++ b/inst/presentation_archive.csv @@ -1,11 +1,15 @@ -Year,Title,Conference,Material -2023,{admiral} - from Open Source to Company Implementation,R in Pharma 2023,[Paper](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/EU/Birmingham/PAP_TT03.pdf) [Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/EU/Birmingham/PRE_TT03.pdf) -2023,{admiral} - from Open Source to Company Implementation,R in Pharma 2023,[Recording](https://www.youtube.com/watch?v=ZbV3E0_xrrI) -2023,Cross Industry Package Development,R in Pharma 2023,[Recording](https://www.youtube.com/watch?v=M4L1PPMu0pU) -2023,Paving the Way for Clinical Submissions in R,PHUSE SDE - London UK,[Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/SDE/EU/London/PRE_London09.pdf) -2023,An overview of {admiral},PHUSE SDE - Summit NJ,[Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/SDE/US/Summit/PRE_Summit03.pdf) -2023,{admiralonco},PHUSE US Connect 2023 - Orlando FL,[Recording](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/REC_OS12.mp4) [Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/PRE_OS12.pdf) -2023,Programming ADNCA using R and {admiral},PHUSE US Connect 2023 - Orlando FL,[Recording](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/REC_OS09.mp4) -2022,Clinical Reporting in R,R in Pharma 2022,[Workshop Recording](https://youtu.be/9eod8MLF5ys?si=T9_WwE-K8yGtZlOn) -2022,Pharmaverse Workshop, PHUSE US Connect 2022 - Atlanta GA,[Slides and resources](https://github.com/pharmaverse/pharmaverse.workshop.phuseUS2022) (including `{admiral}` workshop slides from PHUSE EU Connect 2021) -2021,Introducing {admiral}, R in Pharma 2021,[Recording](https://www.youtube.com/watch?v=N7Bw8c3D5fU) +Year,Title,Conference,Presenter(s),Material +2024,"From Stowaway to Admiral, a R-iveting Tale of a Hierarchical Composite Endpoint's Journey from Idea to Dataset",PHUSE US Connect 2024 - Bethesda MD,Nicole Major,[Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/PRE_AS02.pdf) [Paper](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/PAP_AS02.pdf) +2024,Population Pharmacokinetic Analysis Data (ADPPK) Programming in {admiral} and the pharmaverse, PHUSE US Connect 2024 - Bethesda MD, Jeff Dickinson,[Poster](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/POS_PP01.pdf) [Paper](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/PAP_PP01.pdf) +2024,{admiral} - from Open Source to Company Implementation, PHUSE US Connect 2024 - Bethesda MD, Ross Farrugia, [Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/PRE_OS05.pdf) [Paper](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/PAP_OS05.pdf) +2024,Bridging the Gap Between the pharmaverse and Company Internal Resources,PHUSE US Connect 2024 - Bethesda MD,Kangjie Zhang,[Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/PRE_OS12.pdf) [Paper](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2024/Connect/US/Bethesda/PRE_OS12.pdf) +2023,"Eyes On the Prize – The Development of {admiralophtha}, an R Package for Ophthalmology ADaMs",PHUSE EU Connect 2023 - Birmingham UK,Edoardo Mancini,[Paper](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/EU/Birmingham/PAP_TT03.pdf) [Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/EU/Birmingham/PRE_TT03.pdf) +2023,{admiral} - from Open Source to Company Implementation,R in Pharma 2023,Edoardo Mancini,[Recording](https://www.youtube.com/watch?v=ZbV3E0_xrrI) +2023,Cross Industry Package Development,R in Pharma 2023,Stefan Thoma,[Recording](https://www.youtube.com/watch?v=M4L1PPMu0pU) +2023,Paving the Way for Clinical Submissions in R,PHUSE SDE - London UK,Declan Hodges,[Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/SDE/EU/London/PRE_London09.pdf) +2023,An overview of {admiral},PHUSE SDE - Summit NJ,,[Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/SDE/US/Summit/PRE_Summit03.pdf) +2023,{admiralonco},PHUSE US Connect 2023 - Orlando FL,Matthew Marino and Neharika Sharma,[Recording](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/REC_OS12.mp4) [Slides](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/PRE_OS12.pdf) +2023,Programming ADNCA using R and {admiral},PHUSE US Connect 2023 - Orlando FL,Jeff Dickinson,[Recording](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/REC_OS09.mp4) +2022,Clinical Reporting in R,R in Pharma 2022,"Christina Fillmore, Ellis Hughes and Thomas Neitmann",[Workshop Recording](https://youtu.be/9eod8MLF5ys?si=T9_WwE-K8yGtZlOn) +2022,Pharmaverse Workshop, PHUSE US Connect 2022 - Atlanta GA,"Ross Farrugia, Alice Ehmann, Mike Stackhouse and Tad Lewandowski",[Slides and resources](https://github.com/pharmaverse/pharmaverse.workshop.phuseUS2022) (including `{admiral}` workshop slides from PHUSE EU Connect 2021) +2021,Introducing {admiral}, R in Pharma 2021,Thomas Neitmann and Ning Leng,[Recording](https://www.youtube.com/watch?v=N7Bw8c3D5fU) diff --git a/vignettes/presentation_archive.Rmd b/vignettes/presentation_archive.Rmd index e39ac8c..3bc73e4 100644 --- a/vignettes/presentation_archive.Rmd +++ b/vignettes/presentation_archive.Rmd @@ -24,7 +24,7 @@ In the table below you can find links to material from various `{admiral}`-relat admiraldiscovery::presentation_archive |> gt::gt() |> gt::fmt_markdown(columns = c("Material")) |> - gt::cols_width(Year ~ gt::pct(4), Material ~ gt::pct(8), c(Title, Conference) ~ gt::pct(20)) |> + gt::cols_width(Year ~ gt::pct(4), Material ~ gt::pct(8), `Presenter(s)` ~ gt::pct(6), c(Title, Conference) ~ gt::pct(15)) |> gt::cols_align(align = "left") ``` From e95a62b20865bd3fa740dfc5abe25b8b590fa88c Mon Sep 17 00:00:00 2001 From: Edoardo Mancini Date: Mon, 20 May 2024 07:23:13 +0000 Subject: [PATCH 2/9] #43 #44 chore: styler, lintr, roxygen checks --- man/presentation_archive.Rd | 2 +- vignettes/presentation_archive.Rmd | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/man/presentation_archive.Rd b/man/presentation_archive.Rd index cb6de8d..120b48b 100644 --- a/man/presentation_archive.Rd +++ b/man/presentation_archive.Rd @@ -5,7 +5,7 @@ \alias{presentation_archive} \title{Presentation Archive} \format{ -An object of class \code{spec_tbl_df} (inherits from \code{tbl_df}, \code{tbl}, \code{data.frame}) with 10 rows and 4 columns. +An object of class \code{spec_tbl_df} (inherits from \code{tbl_df}, \code{tbl}, \code{data.frame}) with 14 rows and 5 columns. } \usage{ presentation_archive diff --git a/vignettes/presentation_archive.Rmd b/vignettes/presentation_archive.Rmd index 3bc73e4..1bfcdc8 100644 --- a/vignettes/presentation_archive.Rmd +++ b/vignettes/presentation_archive.Rmd @@ -21,10 +21,15 @@ knitr::opts_chunk$set( In the table below you can find links to material from various `{admiral}`-related presentations given by members of our community over the years. ```{r echo=FALSE} -admiraldiscovery::presentation_archive |> +admiraldiscovery::presentation_archive |> gt::gt() |> gt::fmt_markdown(columns = c("Material")) |> - gt::cols_width(Year ~ gt::pct(4), Material ~ gt::pct(8), `Presenter(s)` ~ gt::pct(6), c(Title, Conference) ~ gt::pct(15)) |> + gt::cols_width( + Year ~ gt::pct(4), + Material ~ gt::pct(8), + `Presenter(s)` ~ gt::pct(6), + c(Title, Conference) ~ gt::pct(15) + )|> gt::cols_align(align = "left") ``` From caec5cd44c3a624336c0a96cdf95c7f6129c2f46 Mon Sep 17 00:00:00 2001 From: Edoardo Mancini Date: Mon, 20 May 2024 07:41:04 +0000 Subject: [PATCH 3/9] #43 #44 chore: lint --- R/get_fns_with_keyword.R | 2 +- tests/spelling.R | 2 +- vignettes/presentation_archive.Rmd | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/R/get_fns_with_keyword.R b/R/get_fns_with_keyword.R index e867da1..a4188ac 100644 --- a/R/get_fns_with_keyword.R +++ b/R/get_fns_with_keyword.R @@ -76,7 +76,7 @@ get_fns_with_keyword <- function(package, keyword, lib.loc = NULL) { }), alias = lapply(.data$rd_file_contents, extract_alias), # these are the function names has_keyword = - lapply(.data$rd_file_contents, function(x) stringr::str_detect(x, pattern = glue::glue("\\\\keyword\\{[[keyword]]\\}", .open = "[[", .close = "]]"))) |> + lapply(.data$rd_file_contents, function(x) stringr::str_detect(x, pattern = glue::glue("\\\\keyword\\{[[keyword]]\\}", .open = "[[", .close = "]]"))) |> #nolint unlist() ) diff --git a/tests/spelling.R b/tests/spelling.R index 6713838..33ef2c7 100644 --- a/tests/spelling.R +++ b/tests/spelling.R @@ -1,3 +1,3 @@ -if(requireNamespace('spelling', quietly = TRUE)) +if (requireNamespace("spelling", quietly = TRUE)) spelling::spell_check_test(vignettes = TRUE, error = FALSE, skip_on_cran = TRUE) diff --git a/vignettes/presentation_archive.Rmd b/vignettes/presentation_archive.Rmd index 1bfcdc8..8ca59ed 100644 --- a/vignettes/presentation_archive.Rmd +++ b/vignettes/presentation_archive.Rmd @@ -25,11 +25,11 @@ admiraldiscovery::presentation_archive |> gt::gt() |> gt::fmt_markdown(columns = c("Material")) |> gt::cols_width( - Year ~ gt::pct(4), - Material ~ gt::pct(8), - `Presenter(s)` ~ gt::pct(6), + Year ~ gt::pct(4), + Material ~ gt::pct(8), + `Presenter(s)` ~ gt::pct(6), c(Title, Conference) ~ gt::pct(15) - )|> + ) |> gt::cols_align(align = "left") ``` From 2831f8c2e9a2abf4195daafad8981853f09c32ec Mon Sep 17 00:00:00 2001 From: Edoardo Mancini Date: Mon, 20 May 2024 08:02:07 +0000 Subject: [PATCH 4/9] #43 #44 chore: styler --- R/get_fns_with_keyword.R | 2 +- tests/spelling.R | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/R/get_fns_with_keyword.R b/R/get_fns_with_keyword.R index a4188ac..fcf3c98 100644 --- a/R/get_fns_with_keyword.R +++ b/R/get_fns_with_keyword.R @@ -76,7 +76,7 @@ get_fns_with_keyword <- function(package, keyword, lib.loc = NULL) { }), alias = lapply(.data$rd_file_contents, extract_alias), # these are the function names has_keyword = - lapply(.data$rd_file_contents, function(x) stringr::str_detect(x, pattern = glue::glue("\\\\keyword\\{[[keyword]]\\}", .open = "[[", .close = "]]"))) |> #nolint + lapply(.data$rd_file_contents, function(x) stringr::str_detect(x, pattern = glue::glue("\\\\keyword\\{[[keyword]]\\}", .open = "[[", .close = "]]"))) |> # nolint unlist() ) diff --git a/tests/spelling.R b/tests/spelling.R index 33ef2c7..13f77d9 100644 --- a/tests/spelling.R +++ b/tests/spelling.R @@ -1,3 +1,6 @@ -if (requireNamespace("spelling", quietly = TRUE)) - spelling::spell_check_test(vignettes = TRUE, error = FALSE, - skip_on_cran = TRUE) +if (requireNamespace("spelling", quietly = TRUE)) { + spelling::spell_check_test( + vignettes = TRUE, error = FALSE, + skip_on_cran = TRUE + ) +} From 7e0c32e82d65d9bb4f6da732f7cb844cef3816e4 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Mon, 20 May 2024 08:17:12 -0700 Subject: [PATCH 5/9] Update .lintr --- .lintr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.lintr b/.lintr index 6e19e74..1ecf867 100644 --- a/.lintr +++ b/.lintr @@ -2,5 +2,7 @@ linters: linters_with_defaults( line_length_linter(120), object_usage_linter=NULL, cyclocomp_linter(complexity_limit = 22), - undesirable_function_linter = undesirable_function_linter() + undesirable_function_linter=NULL, + brace_linter=NULL, + object_name_linter=NULL ) From 611cb810e4c32abcfa1f1906e6d20569f511f4b4 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Mon, 20 May 2024 08:35:30 -0700 Subject: [PATCH 6/9] Update .lintr --- .lintr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.lintr b/.lintr index 1ecf867..21aa638 100644 --- a/.lintr +++ b/.lintr @@ -2,7 +2,8 @@ linters: linters_with_defaults( line_length_linter(120), object_usage_linter=NULL, cyclocomp_linter(complexity_limit = 22), - undesirable_function_linter=NULL, + undesirable_function_linter=undesirable_function_linter(), brace_linter=NULL, object_name_linter=NULL ) + From 41ab5f2f6a7315652afc12d75d6259932af8f737 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Mon, 20 May 2024 08:55:11 -0700 Subject: [PATCH 7/9] Update .lintr --- .lintr | 1 + 1 file changed, 1 insertion(+) diff --git a/.lintr b/.lintr index 21aa638..0b2a4cd 100644 --- a/.lintr +++ b/.lintr @@ -1,5 +1,6 @@ linters: linters_with_defaults( line_length_linter(120), + indentation_linter=NULL, object_usage_linter=NULL, cyclocomp_linter(complexity_limit = 22), undesirable_function_linter=undesirable_function_linter(), From 03fe284d861f7195232ca60ce30a28594057c2d5 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Mon, 20 May 2024 14:41:45 -0700 Subject: [PATCH 8/9] Update DESCRIPTION --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 52e8788..b56c1bd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: admiraldiscovery Title: Discover admiral Functions -Version: 0.1.1.9000 +Version: 0.1.1.9001 Authors@R: c( person("Daniel D.", "Sjoberg", , "danield.sjoberg@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-0862-2018")), From 3a4189ee18cfaa6d34c22c67bbb2554c64fb4b49 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Mon, 20 May 2024 14:44:23 -0700 Subject: [PATCH 9/9] Update NEWS.md --- NEWS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index 4236aea..b8d9173 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # admiraldiscovery (development version) +* Added additional presentations to the {admiral} presentation listing. (#44) + +* Added the names of the presenters to the {admiral} presentation listing. (#43) + # admiraldiscovery 0.1.1 * Converted presentation archive to a {gt} table.