From c705a294113ee74a8d408b8b51e4eb2b2822b3a7 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sat, 15 Apr 2023 08:44:51 +0200 Subject: Move preprocessing of DMTA data to the test setup --- tests/testthat/setup_script.R | 12 ++++++++++++ tests/testthat/test_dmta.R | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/testthat/setup_script.R b/tests/testthat/setup_script.R index 4e2f76ab..b2147fbe 100644 --- a/tests/testthat/setup_script.R +++ b/tests/testthat/setup_script.R @@ -110,3 +110,15 @@ dfop_saem_1 <- saem(mmkin_dfop_1, quiet = TRUE, transformations = "mkin", no_random_effect = c("parent_0", "g_qlogis")) parallel::stopCluster(cl) + +# Preprocess dimethenamid data +dmta_ds <- lapply(1:7, function(i) { + ds_i <- dimethenamid_2018$ds[[i]]$data + ds_i[ds_i$name == "DMTAP", "name"] <- "DMTA" + ds_i$time <- ds_i$time * dimethenamid_2018$f_time_norm[i] + ds_i +}) +names(dmta_ds) <- sapply(dimethenamid_2018$ds, function(ds) ds$title) +dmta_ds[["Elliot"]] <- rbind(dmta_ds[["Elliot 1"]], dmta_ds[["Elliot 2"]]) +dmta_ds[["Elliot 1"]] <- dmta_ds[["Elliot 2"]] <- NULL + diff --git a/tests/testthat/test_dmta.R b/tests/testthat/test_dmta.R index 825c6e80..cd6de341 100644 --- a/tests/testthat/test_dmta.R +++ b/tests/testthat/test_dmta.R @@ -1,16 +1,5 @@ context("Dimethenamid data from 2018") -# Data -dmta_ds <- lapply(1:7, function(i) { - ds_i <- dimethenamid_2018$ds[[i]]$data - ds_i[ds_i$name == "DMTAP", "name"] <- "DMTA" - ds_i$time <- ds_i$time * dimethenamid_2018$f_time_norm[i] - ds_i -}) -names(dmta_ds) <- sapply(dimethenamid_2018$ds, function(ds) ds$title) -dmta_ds[["Elliot"]] <- rbind(dmta_ds[["Elliot 1"]], dmta_ds[["Elliot 2"]]) -dmta_ds[["Elliot 1"]] <- dmta_ds[["Elliot 2"]] <- NULL - test_that("Different backends get consistent results for DFOP tc, dimethenamid data", { skip_on_cran() # Time constraints -- cgit v1.2.1