From ceaa0bb64382abb7c9482d607818a9e6b97fcdf7 Mon Sep 17 00:00:00 2001 From: Kyle Baron Date: Tue, 14 Jan 2020 13:23:05 -0600 Subject: [PATCH 01/17] creating review branch --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 277fe47..b2f05ad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: lastdose Type: Package Title: Calculate Time and Amount of Last Dose -Version: 0.1.0 +Version: 0.1.0.9000 Author: Kyle Baron Maintainer: Kyle Baron Description: Efficient calculation of time after last dose and last dose amount From 7fb0ff69386f646124a04a113046bec22e4ad46f Mon Sep 17 00:00:00 2001 From: Kyle Baron Date: Mon, 27 Jan 2020 16:41:54 -0600 Subject: [PATCH 02/17] release branch; reconcile test names as listed in issue --- tests/testthat/test-lastdose.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testthat/test-lastdose.R b/tests/testthat/test-lastdose.R index b7c0139..bd1143d 100644 --- a/tests/testthat/test-lastdose.R +++ b/tests/testthat/test-lastdose.R @@ -73,7 +73,7 @@ test_that("required columns", { expect_error(lastdose(x)) }) -test_that("non-numeic data throws error", { +test_that("non-numeric data throws error", { for(col in c("ID","time", "addl", "ii", "evid", "ID", "amt")) { dd <- set1[seq(10),] dd[[col]] <- "A" @@ -102,7 +102,7 @@ test_that("error for missing values in ID,evid,ii,addl", { } }) -test_that("NA amt is error for dosing rec, ok otherwise", { +test_that("NA amt is error for dosing record, ok otherwise", { dd <- set1 dd$amt[5] <- NA_real_ expect_is(lastdose(dd), "data.frame") From d24a8bf894e5d22df6ffccd8e06166097a485bfa Mon Sep 17 00:00:00 2001 From: Kyle Baron Date: Mon, 27 Jan 2020 16:45:45 -0600 Subject: [PATCH 03/17] re-up docs --- DESCRIPTION | 8 ++++---- README.md | 4 ++-- docs/404.html | 4 ++-- docs/authors.html | 4 ++-- docs/index.html | 12 ++++++------ docs/news/index.html | 6 +++--- docs/reference/index.html | 4 ++-- docs/reference/lastdose.html | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b2f05ad..dc85bfe 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,15 +1,15 @@ Package: lastdose Type: Package Title: Calculate Time and Amount of Last Dose -Version: 0.1.0.9000 +Version: 0.2.0 Author: Kyle Baron -Maintainer: Kyle Baron +Maintainer: Kyle Baron Description: Efficient calculation of time after last dose and last dose amount for analysis data sets. License: GPL (>=2) LinkingTo: Rcpp -URL: https://github.com/kylebaron/lastdose -BugReports: https://github.com/kylebaron/lastdose/issues +URL: https://github.com/metrumresearchgroup/lastdose +BugReports: https://github.com/metrumresearchgroup/lastdose/issues Suggests: testthat, Rcpp Encoding: UTF-8 LazyData: true diff --git a/README.md b/README.md index 23cbe0c..a005e54 100644 --- a/README.md +++ b/README.md @@ -163,7 +163,7 @@ system.time(x2 <- lastdose(big)) ``` . user system elapsed - . 0.048 0.001 0.050 + . 0.047 0.002 0.049 ## Compare against the single profile @@ -172,7 +172,7 @@ system.time(x1 <- lastdose(df)) ``` . user system elapsed - . 0.001 0.001 0.000 + . 0 0 0 ``` r x3 <- filter(x2, big[["ID"]]==1) %>% as.data.frame() diff --git a/docs/404.html b/docs/404.html index 4633c53..62e79e0 100644 --- a/docs/404.html +++ b/docs/404.html @@ -67,7 +67,7 @@ lastdose - 0.1.0 + 0.2.0 @@ -88,7 +88,7 @@