Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to v2.1.1 #184

Merged
merged 4 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
^renv$
^renv\.lock$
^data-raw$
^other$
^other$g
^.*\.Rproj$
^\.Rproj\.user$
compile.*
Expand Down
3 changes: 1 addition & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -46,7 +46,6 @@ Imports:
lubridate,
magrittr,
mclust,
mvtnorm,
npde,
openxlsx,
pander,
Expand Down
4 changes: 2 additions & 2 deletions R/PM_data.R
Original file line number Diff line number Diff line change
Expand Up @@ -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) %>%
Expand Down
2 changes: 0 additions & 2 deletions R/Pmetrics-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading