Bug fix and version bump

nlmixrdevelopment · Apr 11, 2019 · 55f9bb9 · 55f9bb9
1 parent 03119f0
commit 55f9bb9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -7,11 +7,11 @@ Imports: Rcpp (>= 0.12.3), brew, lattice, parallel, lbfgs,
         dparser, methods, ggplot2, memoise, rex, minqa, Matrix,
         R.utils, n1qn1, fastGHQuad,
         crayon, cli, RcppArmadillo (>= 0.5.600.2.0), vpc (>= 1.0.0),
-	RxODE(>= 0.9.0-1), nlme, magrittr, tidyr, sys
+	RxODE(>= 0.9.0-2), nlme, magrittr, tidyr, sys
 Suggests: knitr, rmarkdown, dplyr, data.table, lbfgsb3c, testthat,
         madness, devtools, expm, matrixcalc, reshape2, nloptr, ucminf,
 	Rvmmin
-Version: 1.1.0-2
+Version: 1.1.0-3
 Authors@R: c(person("Matthew","Fidler",
       role = "aut", email = "[email protected]",
       comment=c(ORCID="0000-0001-8538-6691")),

diff --git a/R/ui.R b/R/ui.R
@@ -1629,9 +1629,11 @@ nlmixrUIModel <- function(fun, ini=NULL, bigmodel=NULL){
         misplaced.dists <- character();
       }
     }
-    if (misplaced.dists == "f"){
-      if (!any(regexpr(rex::rex(one_of("Ff"), any_spaces, "(", except_some_of(")\n"), ")", any_spaces, or("<-", "=")), .deparse(rest), perl=TRUE) != -1)){
-        misplaced.dists <- character();
+    if (length(misplaced.dists) == 1){
+      if (misplaced.dists == "f"){
+        if (!any(regexpr(rex::rex(one_of("Ff"), any_spaces, "(", except_some_of(")\n"), ")", any_spaces, or("<-", "=")), .deparse(rest), perl=TRUE) != -1)){
+          misplaced.dists <- character();
+        }
       }
     }
   } else if (length(misplaced.dists)==2){