diff --git a/DESCRIPTION b/DESCRIPTION index 6319c5c..ad7abd6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,7 +27,6 @@ Imports: shiny, shinyAce, shinyWidgets, - rxode2 (>= 2.1.2), stats, stringr, tidyr, @@ -44,6 +43,7 @@ Suggests: prompter, rmarkdown, readxl, + rxode2 (>= 2.1.2), rxode2et, shinydashboard, testthat (>= 3.0.0), diff --git a/R/CTS_Server.R b/R/CTS_Server.R index cd743bb..bec8ea6 100644 --- a/R/CTS_Server.R +++ b/R/CTS_Server.R @@ -4306,6 +4306,7 @@ CTS_set_current_element = function(state, element){ paste0(' time_scales = ', ts_object, ','), paste0(' rules = ', rules_object_name, ','), paste0(' rx_options = ', rxopts_object_name, ')'), + "", "# Collecting the simulation and event history values", paste0(sim_tc_object_name, ' = ', simres_object_name, '[["simall"]]'), paste0(sim_ev_object_name, ' = ', simres_object_name, '[["ev_history"]]'), diff --git a/R/MB_Server.R b/R/MB_Server.R index 49ee27f..48ed693 100644 --- a/R/MB_Server.R +++ b/R/MB_Server.R @@ -86,7 +86,7 @@ MB_Server <- function(id, uiele}) #------------------------------------ - # Generating the + # Generating the timescale selection UI output$ui_select_time_scale = renderUI({ input[["element_name"]] input[["ui_mb_model"]] @@ -168,7 +168,10 @@ MB_Server <- function(id, } uiele}) #------------------------------------ + # Generating the UI to select model from catalog or user-defined model output$ui_select_base_from = renderUI({ + input[["element_name"]] + input[["ui_mb_model"]] state = MB_fetch_state(id = id, id_ASM = id_ASM, input = input, diff --git a/README.Rmd b/README.Rmd index b4bf822..692978c 100644 --- a/README.Rmd +++ b/README.Rmd @@ -53,6 +53,8 @@ install.packages("ubiquity") install.packages("nlmixr2lib") install.packages("nonmem2rx") install.packages("rxode2") +install.packages("rxode2et") +install.packages("nlmixr2") # Actual package install.packages("ruminate") diff --git a/build_custom.R b/build_custom.R index 4709fc4..929f406 100644 --- a/build_custom.R +++ b/build_custom.R @@ -1,6 +1,5 @@ -#repo_root = here::here() -#setwd(repo_root) -repo_root = file.path("~", "projects", "ruminate", "github", "ruminate") +repo_root = here::here() +setwd(repo_root) devtools::document(roclets = c('rd', 'collate', 'namespace')) diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 8c2f258..8ca5fb5 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -7,5 +7,5 @@ articles: model_builder: model_builder.html noncompartmental_analysis: noncompartmental_analysis.html simulate_rules: rmdhunks/simulate_rules.html -last_built: 2024-08-22T01:43Z +last_built: 2024-08-22T03:40Z diff --git a/docs/reference/CTS_add_covariate.html b/docs/reference/CTS_add_covariate.html index 167dd6d..5456d1e 100644 --- a/docs/reference/CTS_add_covariate.html +++ b/docs/reference/CTS_add_covariate.html @@ -235,8 +235,8 @@

Examples#> #> ℹ parameter labels from comments are typically ignored in non-interactive mode #> ℹ Need to run with the source intact to parse comments -#> → MB: model checksum updated: 9267905b70fc8dbc94d7a569db25dc2f -#> → MB: module checksum updated:4a2145b4d87a3c6561947503e71961bd +#> → MB: model checksum updated: 231713db83f090bd0013a538c5574f28 +#> → MB: module checksum updated:bb40e0658f62354b980848c4093660d5 #> → CTS: including file #> → CTS: source: file.path(system.file(package="onbrand"), "templates", "report.docx") #> → CTS: dest: file.path("config","report.docx") @@ -248,13 +248,13 @@

Examples#> → CTS: dest: file.path("config","report.yaml") #> → CTS: source model change detected #> → CTS: > covariates reset -#> → CTS: cohort checksum updated: bc0ca077e205a43fad880f050f0441b4 -#> → CTS: module checksum updated: 0c9bd6a6259b551cd407d26872c11dc2 +#> → CTS: cohort checksum updated: 237998bcd55488c4486b5c97fc4df69d +#> → CTS: module checksum updated: 5a02fbf23208d1d70201c1a4b8c88a2f #> → CTS: State initialized #> → CTS: add rule success #> → CTS: rule added -#> → CTS: cohort checksum updated: 9436c2f86c2cd28c59ec050ee82967c2 -#> → CTS: module checksum updated: 98a89f7f69d62cdca00ebde1663c6681 +#> → CTS: cohort checksum updated: c075e40a5ed15dd94c2c4bd8d72f6aee +#> → CTS: module checksum updated: e49e55638836a8db50919aa9c6fd6cae #> → CTS: CTS_plot_element() #> → CTS: # Plotting timecourse #> → CTS: CTS_obj_1_fgtc = @@ -272,12 +272,12 @@

Examples#> → CTS: evplot = 1, #> → CTS: fpage = 1) #> → CTS: No simulation available, you need to run the simulation first. -#> → CTS: cohort checksum updated: decd19c15ffa710e10ae3b0f4db6d102 -#> → CTS: module checksum updated: 13410f6734aae53f517dfa4571fe54f9 +#> → CTS: cohort checksum updated: 75d0c4f10040c52ff0af28f2c46a3e0b +#> → CTS: module checksum updated: 336ab0ec5a32bf88e992d8105312cd40 #> → CTS: source model change detected #> → CTS: > covariates reset -#> → CTS: cohort checksum updated: 48bf1c41318277fae443775ccee64680 -#> → CTS: module checksum updated: 90ceca9572809a89112d8d7a99f4737c +#> → CTS: cohort checksum updated: 2cf4f2c7a3b9f4a260703ee86800d148 +#> → CTS: module checksum updated: c28568d244af87c52f4ccfefcae352c6