Merge pull request #184 from LAPKB/dev

Bump to v2.1.1

.Rbuildignore

@@ -1,7 +1,7 @@
 ^renv$
 ^renv\.lock$
 ^data-raw$
-^other$
+^other$g
 ^.*\.Rproj$
 ^\.Rproj\.user$
 compile.*

DESCRIPTION

@@ -27,7 +27,7 @@ Authors@R: c(
   person("David", "Bayard", email = "", role = "ctb"),
   person("Robert", "Leary", email = "", role = "ctb")
     )
-Version: 2.1
+Version: 2.1.1
 URL: https://lapkb.github.io/Pmetrics/
 BugReports: https://github.com/LAPKB/Pmetrics/issues
 Depends: 
@@ -46,7 +46,6 @@ Imports:
     lubridate,
     magrittr,
     mclust,
-    mvtnorm,
     npde,
     openxlsx,
     pander,

R/PM_data.R

@@ -351,8 +351,8 @@ PM_data <- R6::R6Class("PM_data",
       if (nrow(addl_lines) > 0) {
         new_lines <- addl_lines %>%
           tidyr::uncount(addl, .remove = FALSE) %>%
-          group_by(id) %>%
-          mutate(time = ii * row_number() + time)
+          group_by(id, time) %>%
+          mutate(time = ii * row_number() + time) %>% ungroup()
 
         dataObj <- bind_rows(dataObj, new_lines) %>%
           dplyr::arrange(id, time) %>%

R/Pmetrics-package.R

@@ -26,13 +26,11 @@
 # #' @importFrom tibble as_tibble tibble
 #' @importFrom tidyr pivot_longer pivot_wider nest unnest extract separate fill crossing
 #' @importFrom stringr str_replace regex
-# #' @importFrom gridExtra grid.arrange
 #' @importFrom mclust Mclust mclustBIC
 #' @importFrom grDevices col2rgb dev.off devAskNewPage gray.colors jpeg 
 #' pdf png postscript rgb setEPS
 #' @importFrom graphics abline arrows axTicks axis boxplot hist legend lines 
 #' par plot points polygon rect rug segments text
-# #' @importFrom methods new show validObject
 #' @importFrom stats aggregate anova approx as.formula binom.test coef 
 #' complete.cases confint cor cor.test cov cov.wt cov2cor density dnorm 
 #' get_all_vars glm kmeans kruskal.test ks.test