word-smith error #428

nlmixrdevelopment · Nov 19, 2020 · afe1d10 · afe1d10
1 parent c2c92f9
commit afe1d10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/R/ui.R b/R/ui.R
@@ -2861,7 +2861,7 @@ nlmixrUI.nlme.var <- function(object) {
     tmp <- sprintf("varConstPower(form=~fitted(.)%s%s)", grp, powera)
   } else if (.addProp == "combined2") {
     if (powera != ", fixed=list(power=1)") {
-      stop("add+prop combined2 does not support power for nlme currently")
+      stop("add+prop combined2 does not support nlme power currently")
     }
     tmp <- sprintf("nlme::varConstProp(%s)", grp)
   }

diff --git a/build/install.R b/build/install.R
@@ -1,3 +1,4 @@
+
 Sys.setenv(PATH=paste0("c:/Rtools/bin;c:/Rtools/mingw_64/bin;", Sys.getenv("PATH")))
 install.packages(c("assertthat", "backports", "BH", "brew", "broom.mixed", "checkmate",
                    "cli", "covr", "crayon", "curl", "data.table", "Deriv", "devtools",
@@ -6,16 +7,23 @@ install.packages(c("assertthat", "backports", "BH", "brew", "broom.mixed", "chec
                    "htmltools", "huxtable", "inline", "knitr", "lattice", "lbfgs",
                    "lbfgsb3c", "learnr", "lotri", "madness", "magrittr",
                    "matrixcalc", "memoise", "methods", "microbenchmark", "minqa",
-                   "n1qn1", "nlme", "nloptr", "officer", "parallel", "pillar", "pkgdown",
-                   "PreciseSums", "Rcpp", "RcppArmadillo", "RcppEigen", "remotes",
+                   "n1qn1", "nlme", "nloptr", "officer", "pillar", "pkgdown",
+                   "PreciseSums", "Rcpp",  "RcppEigen", "remotes",
                    "reshape2", "rex", "rlang", "rmarkdown", "roxygen2", "Rvmmin",
-                   "scales", "shiny", "sitmo", "StanHeaders", "stringi", "symengine",
+                   "scales", "shiny", "sitmo", "stringi", "symengine",
                    "sys", "testthat", "tibble", "tidyr", "tidyverse", "tools", "ucminf",
                    "units", "usethis", "utils", "vdiffr", "vpc", "xgxr", "xpose",
-                   "yaml") , type="source")
+                   "yaml",
+                   "RcppArmadillo", "StanHeaders") , type="source",
+                 # For R 3.6.1 use the release date of R 3.6.3
+                 #repos="https://cran.microsoft.com/snapshot/2020-02-29/"
+                 )
+
+#devtools::install_github("nlmixrdevelopment/n1qn1c", dependencies = FALSE)
+
+devtools::install_github("nlmixrdevelopment/RxODE", ref="pruneBranch", dependencies = FALSE)
 
-devtools::install_github("nlmixrdevelopment/RxODE", ref="pruneBranch")
-devtools::install_github("nlmixrdevelopment/nlmixr", ref="foceiDur")
+devtools::install_github("nlmixrdevelopment/nlmixr", ref="foceiDur", dependencies = FALSE)
 
 ## devtools::install_github("nlmixrdevelopment/rxModels")
 library(RxODE)