cleanup

NMautoverse · Aug 12, 2024 · 1dda219 · 1dda219
1 parent 3e56e9a
commit 1dda219
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/tests/testthat/testReference/NMdataConf_02.rds b/tests/testthat/testReference/NMdataConf_02.rds
diff --git a/tests/testthat/test_NMdataConf.R b/tests/testthat/test_NMdataConf.R
@@ -153,17 +153,19 @@ test_that("deprecated use.rds",{
     ## NMdataConf(use.rds=TRUE)
     NMdataConf(formats.read=c("csv"))
     new <- NMdataConf()
-
+
+    ## can't compare functions
     new$as.fun <- NULL
     new$file.cov <- NULL
-    new$file.mod <- NULL
     new$file.ext <- NULL
+    new$file.mod <- NULL
     new$file.phi <- NULL
+    new$file.shk <- NULL
     new$modelname <- NULL
 
 
     expect_equal_to_reference(new,fileRef)
-    ## compareCols(readRDS(fileRef),defaults)
+    compareCols(readRDS(fileRef),new)
 })
 
 test_that("reset removes unknown",{

diff --git a/vignettes/ParameterTables.Rmd b/vignettes/ParameterTables.Rmd
@@ -14,9 +14,9 @@ header-includes:
 ---
 
 ```{r,include = FALSE}
-## library(NMdata)
-library(devtools)
-load_all("~/wdirs/NMdata")
+library(NMdata)
+## library(devtools)
+## load_all("~/wdirs/NMdata")
 NMdataConf(as.fun="data.table")
 
 ##knitr::opts_chunk$set(dev = "cairo_pdf")
@@ -228,8 +228,6 @@ mergeCheck(labs.auto[,.(par.name,symbol)],tab.offline,by="symbol",all.x=T)
 
 <!-- off-diags missing. Merge info from ext? -->
 ```{r}
-load_all("~/wdirs/NMdata") 
-NMdataConf(as.fun="data.table")
 
 file2.mod <- system.file("examples/nonmem/xgxr133.mod",package="NMdata")