Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fuzzy bad, silver good #281

Merged
merged 1 commit into from
Oct 29, 2022
Merged

Fuzzy bad, silver good #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions R/saem.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,13 +670,13 @@ nmObjGetFoceiControl.saem <- function(x, ...) {
#.txt <- paste0("(", crayon::italic(ifelse(is.null(.uif$nmodel$lin.solved), ifelse(.uif$predSys, "PRED", "ODE"), "Solved")), "); ")
.txt <- ""
if (tolower(type) == "focei") {
.txt <- paste0(.txt, crayon::blurred$italic("OBJF by FOCEi approximation"))
.txt <- paste0(.txt, crayon::silver$italic("OBJF by FOCEi approximation"))
} else if (tolower(type) == "foce") {
.txt <- paste0(.txt, crayon::blurred$italic("OBJF by FOCE approximation"))
.txt <- paste0(.txt, crayon::silver$italic("OBJF by FOCE approximation"))
} else if (tolower(type) == "fo") {
.txt <- paste0(.txt, crayon::blurred$italic("OBJF by FO approximation"))
.txt <- paste0(.txt, crayon::silver$italic("OBJF by FO approximation"))
} else if (type == "") {
.txt <- paste0(.txt, crayon::blurred$italic("OBJF not calculated"))
.txt <- paste0(.txt, crayon::silver$italic("OBJF not calculated"))
} else {
.reg <- rex::rex(start, "laplace", capture(.regNum), end)
.regG <- rex::rex(start, "gauss", capture(.regNum), "_", capture(.regNum), end)
Expand All @@ -689,7 +689,7 @@ nmObjGetFoceiControl.saem <- function(x, ...) {
} else {
stop("unknown error")
}
.txt <- paste0(.txt, crayon::blurred$italic(sprintf("OBJF by %s", paste0(ifelse(.nnode == 1, "Lapalcian (n.sd=", sprintf("Gaussian Quadrature (n.nodes=%s, n.sd=", .nnode)), .nsd, ")"))))
.txt <- paste0(.txt, crayon::silver$italic(sprintf("OBJF by %s", paste0(ifelse(.nnode == 1, "Lapalcian (n.sd=", sprintf("Gaussian Quadrature (n.nodes=%s, n.sd=", .nnode)), .nsd, ")"))))
}
.env$extra <- .txt
invisible()
Expand Down