fix issues with match on R devel

boennecd · Oct 11, 2021 · 73aa275 · 73aa275
1 parent 4206fb8
commit 73aa275
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: dynamichazard
 Type: Package
 Title: Dynamic Hazard Models using State Space Models
-Version: 1.0.0
+Version: 1.0.1
 Authors@R: c(person("Benjamin", "Christoffersen", 
                     email = "[email protected]", 
                     role = c("cre", "aut"),  

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# dynamichazard 1.0.1
+* fix issues with `match` after changes in R devel.
+
+# dynamichazard 1.0.0
+* add citation information before JSS article is published.
+
 # dynamichazard 0.6.8
 * fix issue due to changes in speedglm.
 * add documentation and fix other issues raised by CRAN.

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,12 +1,10 @@
 ## Test environments
 * Ubuntu 20.04 LTS with gcc 10.1.0
   R version 4.1.1
-* Ubuntu 20.04 LTS with gcc 10.1.0
-  R devel 2021-09-06 r80861 with LTO checks
 * Ubuntu 20.04 LTS with gcc 10.1.0
   R version 4.1.1 with valgrind
 * Ubuntu 20.04 LTS with gcc 10.1.0
-  R devel 2021-09-05 r80859 with ASAN and UBSAN
+  R devel 2021-10-09 r81024 with ASAN and UBSAN
 * Github actions on windows-latest (release), macOS-latest (release), 
   ubuntu-20.04 (release), and ubuntu-20.04 (devel)
 * win-builder (devel, oldrelease, and release)
@@ -17,9 +15,3 @@
 There were no WARNINGs or ERRORs.
 
 There is a NOTE about the package size in some cases.
-
-There is a NOTE about a 404 error for one of the DOIs in the description. This  
-is for a Journal of Statistical Software paper that will be published soon. 
-The paper is the reason for this update.
-
-There is NOTE that Christoffersen is possibly misspelled. It is not.
diff --git a/tests/testthat/test_design_mat_and_risk_obj.R b/tests/testthat/test_design_mat_and_risk_obj.R
@@ -580,7 +580,7 @@ test_that("Permutating gives the data frame and risk set permutated", {
       expect_equal(nrow(suppressMessages(plyr::match_df(X_Y_org[[i]], X_Y[[i]]))),
         nrow(X_Y_org[[i]]))
   }
-  expect_true(sum(is.na(match(X_Y_org$Y, X_Y$Y))) == 0)
+  expect_true(sum(is.na(match(unclass(X_Y_org$Y), unclass(X_Y$Y)))) == 0)
 
   expect_true(setequal(w_org, w))
   expect_true(any(w_org != w))
@@ -641,7 +641,7 @@ test_that("Ordering gives the data frame and risk set orded", {
                    nrow(X_Y_org[[i]]))
     }
   }
-  expect_true(sum(is.na(match(X_Y_org$Y, X_Y$Y))) == 0)
+  expect_true(sum(is.na(match(unclass(X_Y_org$Y), unclass(X_Y$Y)))) == 0)
 
   expect_true(setequal(w_org, w))
   expect_true(any(w_org != w))