Merge pull request #90 from UUPharmacometrics/dev

Update Master to 0.4.2

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: xpose
 Type: Package
 Title: Diagnostics for Pharmacometric Models
-Version: 0.4.1
+Version: 0.4.2
 Authors@R: c(
       person('Benjamin', 'Guiastrennec',
              role  = c('aut', 'cre', 'cph'),

NEWS.md

@@ -1,3 +1,9 @@
+# xpose 0.4.2
+### General
+* Address CRAN requests
+* Improved internal structure of VPC
+* Fixed bug with vpc 1.0.1
+
 # xpose 0.4.1
 ### General
 * Improved integration of the xpose.nlmixr package

R/vpc_data.R

@@ -60,11 +60,11 @@ vpc_data <- function(xpdb,
     sim_data <- get_data(xpdb, .problem = sim_problem)
     if (is.null(opt$obs_cols)) {
       obs_cols <- xp_var(xpdb, obs_problem, type = c('id', 'idv', 'dv', 'pred'))
-      obs_cols <- purrr::set_names(obs_cols$col, nm = obs_cols$type)
+      obs_cols <- purrr::set_names(as.list(obs_cols$col), nm = obs_cols$type)
     }
     if (is.null(opt$sim_cols)) {
       sim_cols <- xp_var(xpdb, sim_problem, type = c('id', 'idv', 'dv', 'pred'))
-      sim_cols <- purrr::set_names(sim_cols$col, nm = sim_cols$type)
+      sim_cols <- purrr::set_names(as.list(sim_cols$col), nm = sim_cols$type)
     }
     vpc_nsim <- xpdb %>% 
       get_summary(sim_problem) %>% 
@@ -145,7 +145,10 @@ vpc_data <- function(xpdb,
 
   # Format vpc output
   xpdb$special <- vpc_dat %>%
-    purrr::discard(names(.) %in% c('sim', 'stratify_original', 'stratify_color', 'facet', 'as_percentage')) %>%
+    purrr::discard(names(.) %in% c('sim', 'stratify_original', 
+                                   'stratify_color', 'facet', 
+                                   'as_percentage', 'xlab', 
+                                   'ylab', 'labeller')) %>%
     purrr::map_at('vpc_dat', function(x) {
       x <- x %>% 
         tidyr::gather(key = 'tmp', value = 'value', dplyr::matches('\\.(low|med|up)')) %>% 

README.Rmd

@@ -21,9 +21,10 @@ knitr::opts_chunk$set(fig.path   = 'man/figures/',
 # xpose <a href="https://UUPharmacometrics.github.io/xpose/"><img src="man/figures/logo.png" align="right" /></a>
 
 [![travis_status](https://travis-ci.org/UUPharmacometrics/xpose.svg?branch=master)](https://travis-ci.org/UUPharmacometrics/xpose)
-[![appveyor status](https://ci.appveyor.com/api/projects/status/f6k09rf2cfi3vcs2?svg=true)](https://ci.appveyor.com/project/guiastrennec/xpose)[![cran_version](http://www.r-pkg.org/badges/version/xpose)]()
+[![appveyor status](https://ci.appveyor.com/api/projects/status/f6k09rf2cfi3vcs2?svg=true)](https://ci.appveyor.com/project/guiastrennec/xpose)
+[![cran_version](http://www.r-pkg.org/badges/version/xpose)](https://CRAN.R-project.org/package=xpose)
 [![codecov](https://codecov.io/gh/UUPharmacometrics/xpose/branch/master/graph/badge.svg)](https://codecov.io/gh/UUPharmacometrics/xpose)
-[![downloads](https://cranlogs.r-pkg.org/badges/grand-total/xpose)](http://cran.rstudio.com/web/packages/xpose/index.html)
+[![downloads](https://cranlogs.r-pkg.org/badges/grand-total/xpose)](https://CRAN.R-project.org/package=xpose)
 
 ### Overview
 [xpose](https://UUPharmacometrics.github.io/xpose/) was designed as a [ggplot2](https://github.com/tidyverse/ggplot2)-based alternative to [xpose4](http://xpose.sourceforge.net). xpose aims to reduce the post processing burden and improve diagnostics commonly associated the development of non-linear mixed effect models.

README.md

@@ -3,7 +3,7 @@
 xpose <a href="https://UUPharmacometrics.github.io/xpose/"><img src="man/figures/logo.png" align="right" /></a>
 ===============================================================================================================
 
-[![travis\_status](https://travis-ci.org/UUPharmacometrics/xpose.svg?branch=master)](https://travis-ci.org/UUPharmacometrics/xpose) [![appveyor status](https://ci.appveyor.com/api/projects/status/f6k09rf2cfi3vcs2?svg=true)](https://ci.appveyor.com/project/guiastrennec/xpose)[![cran\_version](http://www.r-pkg.org/badges/version/xpose)]() [![codecov](https://codecov.io/gh/UUPharmacometrics/xpose/branch/master/graph/badge.svg)](https://codecov.io/gh/UUPharmacometrics/xpose) [![downloads](https://cranlogs.r-pkg.org/badges/grand-total/xpose)](http://cran.rstudio.com/web/packages/xpose/index.html)
+[![travis\_status](https://travis-ci.org/UUPharmacometrics/xpose.svg?branch=master)](https://travis-ci.org/UUPharmacometrics/xpose) [![appveyor status](https://ci.appveyor.com/api/projects/status/f6k09rf2cfi3vcs2?svg=true)](https://ci.appveyor.com/project/guiastrennec/xpose) [![cran\_version](http://www.r-pkg.org/badges/version/xpose)](https://CRAN.R-project.org/package=xpose) [![codecov](https://codecov.io/gh/UUPharmacometrics/xpose/branch/master/graph/badge.svg)](https://codecov.io/gh/UUPharmacometrics/xpose) [![downloads](https://cranlogs.r-pkg.org/badges/grand-total/xpose)](https://CRAN.R-project.org/package=xpose)
 
 ### Overview