Skip to content

Commit

Permalink
When data do not match, warn and show as much as possible
Browse files Browse the repository at this point in the history
  • Loading branch information
mattfidler committed Sep 2, 2024
1 parent 0c0cb48 commit a87fd25
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
1 change: 0 additions & 1 deletion R/monolix2rx.R
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ monolix2rx <- function(mlxtran, update=TRUE, thetaMatType=c("sa", "lin"),
crayon::bold$blue("$monolixData"), ")"))
.ui$monolixData <- .monolixData
.ui$sticky <- "monolixData"

}
.etaData <- try(monolixEtaImport(.ui))
if (inherits(.etaData, "try-error")) .etaData <- NULL
Expand Down
14 changes: 10 additions & 4 deletions R/validate.R
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,17 @@
n
}, character(1), USE.NAMES = FALSE)
.nMonolix <- length(.monolix[, 1])
if (.nMonolix != .nBoth) {
.minfo("monolix and rxode2 solves have different number of rows")
return(invisible())
}

.monolix$rxMonolixRowN <- seq_along(.monolix[,1])
.both <- merge(.monolix, .both)
.monolixNot <- .monolix[!(.monolix$rxMonolixRowN %in% .both$rxMonolixRowN), ,drop=FALSE]
if (length(.monolixNot$rxMonolixRowN) != 0L) {
.minfo(paste0("monolix and rxode2 solves have different number of rows (",
crayon::blue$bold("$monolixNotMatched"),")"))
.monolixNot <- .monolixNot[,names(.monolixNot) != "rxMonolixRowN"]
assign("monolixNotMatched", .monolixNot, .ui)
}
.both <- .both[, names(.both) != "rxMonolixRowN"]
.ci0 <- .ci <- ci
.sigdig <- sigdig
.ci <- (1 - .ci) / 2
Expand Down

0 comments on commit a87fd25

Please sign in to comment.