Skip to content

Commit

Permalink
test fix
Browse files Browse the repository at this point in the history
  • Loading branch information
philipdelff committed Oct 15, 2023
1 parent 2a49fd9 commit 9c5e433
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 34 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: NMdata
Type: Package
Title: Preparation, Checking and Post-Processing Data for PK/PD Modeling
Version: 0.1.1.901
Version: 0.1.1.902
Authors@R: c(person("Philip", "Delff", email = "philip@delff.dk", role = c("aut", "cre")))
Maintainer: Philip Delff <philip@delff.dk>
Description: Efficient tools for preparation, checking and post-processing of data in PK/PD (pharmacokinetics/pharmacodynamics) modeling, with focus on use of Nonmem. Attention is paid to ensure consistency, traceability, and Nonmem compatibility of Data. Rigorously checks final Nonmem datasets. Implemented in 'data.table', but easily integrated with 'base' and 'tidyverse'.
Expand Down
2 changes: 1 addition & 1 deletion R/NMscanInput.R
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ NMscanInput <- function(file, formats.read, file.mod, dir.data=NULL,
setcolorder(meta$tables,intersect(c("source","name","nrow","ncol","firstonly","lastonly","firstlastonly","format","sep","nid","idlevel","has.row","maxLength","full.length","filetype","file.mtime","file.logtime","file"),colnames(meta$tables)))


if(col.id%in%NMinfoDT(data.input,"input.colnames")[,result]) {
if(!is.null(col.id) && col.id%in%NMinfoDT(data.input,"input.colnames")[,result]) {
meta$tables[,nid:=
data.input.0.trans[,uniqueN(get(col.id.inp))]
]
Expand Down
3 changes: 2 additions & 1 deletion devel/todo.org
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
*** DONE Add version to welcome message
*** DONE All arguments should be arg.foo rather than argFoo
*** TODO [#B] deprecate "default" option in NMdataConf
has no benefit over NULL, so redundant and prevents the use of "default" as an actual param value.
has no benefit over NULL, so redundant and prevents the use of
"default" as an actual param value.
*** DONE Allow for say input.txt/output.txt
**** NMtransInput
*** TODO Support a drop argument
Expand Down
4 changes: 3 additions & 1 deletion man/NMextractText.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion man/NMgenText.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 10 additions & 15 deletions man/NMreadCsv.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions man/NMreadSection.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions man/NMscanInput.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/testthat/test_NMscanInput.R
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,6 @@ test_that("Combinations of translate and recover.cols",{
all.res <- list(res1,res2,res3,res4)
all.res <- lapply(all.res,fix.time)

expect_equal_to_reference(res,fileRef,version=2)
expect_equal_to_reference(all.res,fileRef,version=2)
})

0 comments on commit 9c5e433

Please sign in to comment.