Merge pull request #177 from UUPharmacometrics/dev

Dev
UUPharmacometrics · Mar 17, 2020 · ee1c060 · ee1c060
2 parents 4a0f2e2 + 9a05b16
commit ee1c060
Show file tree

Hide file tree

Showing 152 changed files with 7,841 additions and 4,974 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: xpose
 Type: Package
 Title: Diagnostics for Pharmacometric Models
-Version: 0.4.7
+Version: 0.4.8
 Authors@R: c(
       person('Benjamin', 'Guiastrennec',
              role  = c('aut', 'cre', 'cph'),
@@ -54,4 +54,4 @@ BugReports: https://github.com/UUPharmacometrics/xpose/issues
 Encoding: UTF-8
 LazyData: true
 VignetteBuilder: knitr
-RoxygenNote: 7.0.2
+RoxygenNote: 7.1.0
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+# xpose 0.4.8
+* Compatibility fix for ggplot 3.3.0 and tibble 3.0.0
+
 # xpose 0.4.7
 * Fixed error in documentation check fail in R 4.0.0
 

diff --git a/R/fetch_data.R b/R/fetch_data.R
@@ -62,7 +62,7 @@ only_obs <- function(xpdb, .problem, quiet) {
     string <- c('Filtering data by ', mdv_var, ' == 0')
     body(fun) <- bquote({
       msg(.(string), .(quiet))
-      x[x[, .(mdv_var)] == 0, ]
+      x[as.vector(x[, .(mdv_var)] == 0), ]
     })
   } else {
     string <- c('No `evid` or `mdv` variable available to filter the data.')

diff --git a/R/plot_amt.R b/R/plot_amt.R
@@ -11,7 +11,7 @@
 #' @inheritSection xplot_scatter Template titles
 #' @seealso \code{\link{xplot_scatter}}
 #' @examples
-#' amt_vs_idv(xpdb_ex_pk)
+#' amt_vs_idv(xpdb_ex_pk, nrow = 2, ncol = 1)
 #' 
 #' @export
 amt_vs_idv <- function(xpdb,

diff --git a/R/read_nm_files.R b/R/read_nm_files.R
@@ -96,8 +96,13 @@ parse_nm_files <- function(dat, quiet) {
   if (length(unlist(dat$raw)) == 0) {
     tab_rows <- NULL 
   } else {
-    x <- dplyr::tibble(raw = unlist(dat$raw), problem = NA, 
-                       subprob = NA, method = NA, header = FALSE)
+    x <- dplyr::tibble(
+      raw = unlist(dat$raw), 
+      problem = NA_character_, 
+      subprob = NA_character_, 
+      method  = NA_character_, 
+      header  = FALSE
+      )
     tab_rows <- which(stringr::str_detect(x$raw, '^\\s*TABLE NO'))
   }
 

diff --git a/data/xpdb_ex_pk.rda b/data/xpdb_ex_pk.rda
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/about.html b/docs/articles/about.html
diff --git a/docs/articles/access_xpdb_data.html b/docs/articles/access_xpdb_data.html
diff --git a/docs/articles/customize_plots.html b/docs/articles/customize_plots.html
diff --git a/docs/articles/faq.html b/docs/articles/faq.html
diff --git a/docs/articles/import_model_outputs.html b/docs/articles/import_model_outputs.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/interactive_plots.html b/docs/articles/interactive_plots.html
diff --git a/docs/articles/interactive_plots_files/crosstalk-1.1.0.1/css/crosstalk.css b/docs/articles/interactive_plots_files/crosstalk-1.1.0.1/css/crosstalk.css
@@ -0,0 +1,27 @@
+/* Adjust margins outwards, so column contents line up with the edges of the
+   parent of container-fluid. */
+.container-fluid.crosstalk-bscols {
+  margin-left: -30px;
+  margin-right: -30px;
+  white-space: normal;
+}
+
+/* But don't adjust the margins outwards if we're directly under the body,
+   i.e. we were the top-level of something at the console. */
+body > .container-fluid.crosstalk-bscols {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.crosstalk-input-checkboxgroup .crosstalk-options-group .crosstalk-options-column {
+  display: inline-block;
+  padding-right: 12px;
+  vertical-align: top;
+}
+
+@media only screen and (max-width:480px) {
+  .crosstalk-input-checkboxgroup .crosstalk-options-group .crosstalk-options-column {
+    display: block;
+    padding-right: inherit;
+  }
+}