Merge pull request #154 from nlmixr2/153-nonmem2rx-eta-renaming-is-no…

…t-working-correctly Make sure that theta/eta are always ordered like NONMEM
nlmixr2 · Jul 3, 2023 · e1e2202 · e1e2202
2 parents 3b77fa0 + 0a522fb
commit e1e2202
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -12,6 +12,10 @@
   default for `solveZero` is changed to `solveZero = TRUE` for
   `nonmem2rx` objects.
 
+* Fixed bug for renaming `eta` and `theta` when they are renamed so
+  that the `ui$iniDf` does not match the `theta#` or `eta#` (Issue
+  #153)
+
 # nonmem2rx 0.1.1
 
 - Fix internal memory issue (`LTO`, `valgrind` etc)

diff --git a/R/nonmem2rx.R b/R/nonmem2rx.R
@@ -176,8 +176,12 @@
     if (length(.w) > 0) {
       .t <- .t[-.w]
     }
+    .i <- as.numeric(gsub("^theta", "", .t))
+    .t <- .t[order(.i)]
   } else {
     .t <- rxui$iniDf$name[which(is.na(rxui$iniDf$ntheta) & rxui$iniDf$neta1 == rxui$iniDf$neta2)]
+    .i <- as.numeric(gsub("^eta", "", .t))
+    .t <- .t[order(.i)]
   }
   .t <- .t[!(.t %in% c("icall", "irep"))]
   .w <- which(.n == "")