Skip to content

Commit

Permalink
Admiral v0.11.1 (#1997)
Browse files Browse the repository at this point in the history
* [actions skip] Add/Update README.md for patch

* Closes #1962 #1969 admiral 0.11.1 hotfix for get started link, derive_param_tte, derive_vars_joined (#1987)

* feat #1962 #1969 param_tte and get started fix

* forgot to add updated DESCRIPTION

* chore: #1962 thought crossing was dplyr

* chore: #1962 account for new assertions

* fix: #1962 was missing the reassignment piece?

* fix: #1966 crude answer

* feat: #1966 potential way of warning users of null new_vars

* fix: #1966 add appropriate assertions to get check to go through

* fix: #1966 appropriate function fix for order

* fix: #1966 vignette named order expression

* chore: #1966 try something

* chore: #1966 optionality of expressions is tricky

* feat: #1966 undo derive_joined stuff

* chore: run styler

---------

Co-authored-by: Zelos Zhu <zdz2101@github.com>

---------

Co-authored-by: Ben Straub <ben.x.straub@gsk.com>
Co-authored-by: GitHub Actions <action@github.com>
Co-authored-by: Zelos Zhu <zdz2101@github.com>
  • Loading branch information
4 people authored Jul 5, 2023
1 parent 2558245 commit a2b224a
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: admiral
Type: Package
Title: ADaM in R Asset Library
Version: 0.11.0
Version: 0.11.1
Authors@R: c(
person("Ben", "Straub", email = "ben.x.straub@gsk.com", role = c("aut", "cre")),
person("Stefan", "Bundfuss", role = "aut"),
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# admiral 0.11.1

- Fix bug in `derive_param_tte()`. (#1962)
- Get Started page now points to correct article. (#1969)

# admiral 0.11.0

## New Features
Expand Down
9 changes: 1 addition & 8 deletions R/derive_param_tte.R
Original file line number Diff line number Diff line change
Expand Up @@ -738,14 +738,7 @@ extend_source_datasets <- function(source_datasets,
by_groups <- unique(bind_rows(by_groups))
for (i in seq_along(source_datasets)) {
if (extend[[i]]) {
source_datasets[[i]] <-
full_join(
mutate(by_groups, temp_dummy = 1),
mutate(source_datasets[[i]], temp_dummy = 1),
by = "temp_dummy",
relationship = "many-to-many"
) %>%
select(-temp_dummy)
source_datasets[[i]] <- crossing(by_groups, source_datasets[[i]])
}
}
source_datasets
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ remotes::install_github("pharmaverse/admiral", ref = "devel")
The `admiral` family has several downstream and upstream dependencies and so this release shall be done in three
Phases:

* Phase 1 release is for `{admiraldev}`, `{admiral.test}`, and `{admiral}` core
* Phase 1 release is for `{admiraldev}`, `{admiral.test}`, and `{admiral}` core
* Phase 2 release is extension packages, e.g. `{admiralonco}`, `admiralophtha`

|Release Schedule | Phase 1- Date and Packages | Phase 2- Date and Packages |
|---------------- | -------------------------- | -------------------------- |
| Q3-2023 | September 4th | September 11th |
| | `{admiraldev}` `{admiral.test}` | `{admiralonco}` |
| | `{admiral}` | `{admiralophtha}` |
| Q4-2023 | December 4th | December 11th |
| | `{admiraldev}` `{admiral.test}` | `{admiralonco}` |
| | `{admiral}` | `{admiralophtha}` |
| Release Schedule | Phase 1- Date and Packages | Phase 2- Date and Packages |
| ---------------- | ------------------------------- | -------------------------- |
| Q3-2023 | September 4th | September 11th |
| | `{admiraldev}` `{admiral.test}` | `{admiralonco}` |
| | `{admiral}` | `{admiralophtha}` |
| Q4-2023 | December 4th | December 11th |
| | `{admiraldev}` `{admiral.test}` | `{admiralonco}` |
| | `{admiral}` | `{admiralophtha}` |

## Main Goal

Expand Down Expand Up @@ -171,8 +171,8 @@ that all our developers and contributors must follow, so that all our code has a
* [Paving the way for clinical submissions in R](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/SDE/EU/London/PRE_London09.pdf) (slides from PHUSE SDE in London)
* [An Overview of {admiral}](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/SDE/US/Summit/PRE_Summit03.pdf) (slides from PHUSE SDE in Summit, NJ)
* [{admiralonco}](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/REC_OS12.mp4) (recording for talk at PHUSE US Connect 2023, slides also available [here](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/PRE_OS12.pdf))
* [Programming ADNCA using R and {admiral}](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/REC_OS09.mp4) (recording of presentation from PHUSE US Connect 2023)
* [Clinical Reporting in R](https://www.youtube.com/watch?v=9eod8MLF5ys&list=PLMtxz1fUYA5AWYQHB5mZAs-yamNJ5Tm_8&index=2) (recording of workshop at R in Pharma 2022)
* [Programming ADNCA using R and {admiral}](https://phuse.s3.eu-central-1.amazonaws.com/Archive/2023/Connect/US/Florida/REC_OS09.mp4) (recording of presentation from PHUSE US Connect 2023)
* [Clinical Reporting in R](https://www.youtube.com/watch?v=9eod8MLF5ys\&list=PLMtxz1fUYA5AWYQHB5mZAs-yamNJ5Tm_8\&index=2) (recording of workshop at R in Pharma 2022)
* [Introducing {admiral}](https://www.youtube.com/watch?v=N7Bw8c3D5fU) (recording of talk for R in Pharma 2021)
* [Pharmaverse workshop](https://github.com/pharmaverse/pharmaverse.workshop.phuseUS2022) (slides and materials from PHUSE US Connect 2022---including `{admiral}`
workshop slides from PHUSE EU Connect 2021)
Expand Down
1 change: 1 addition & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ navbar:
text: User Guides
menu:
- text: Getting Started
href: articles/admiral.html
- text: Creating a Basic ADSL
href: articles/adsl.html
- text: FAQ
Expand Down

0 comments on commit a2b224a

Please sign in to comment.