Fix eta facet names inaccurate grouping (UUPharmacometrics#144)

billdenney · Mar 25, 2019 · 69eca9e · 69eca9e
1 parent 4187bf5
commit 69eca9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# xpose 0.4.4.9000
+### General
+* Fixed issue when ETA values were not named as ETA(X) in NONMEM (@billdenney #144)
+
 # xpose 0.4.4
 ### General
 * Improved documentation for `xpose_data` (@billdenney #99)

diff --git a/R/plot_distribution.R b/R/plot_distribution.R
@@ -101,7 +101,9 @@ eta_distrib <- function(xpdb,
     stop('No eta column found in the xpdb data index.', call. = FALSE)
   }
 
-  if (software(xpdb) == 'nonmem') {
+  # eta reordering only occurs if all ETAs match the pattern ETA(X) where X is a
+  # number.
+  if (all(grepl(pattern="^ETA\\([0-9]+\\)$", x=eta_col))) {
     post_processing_eta <-  reorder_factors(prefix = 'ETA(', suffix = ')')
   } else {
     post_processing_eta <- NULL