Closes #204

Author: danielleiwood

R/awote.R

@@ -61,17 +61,22 @@ awote <- function(Date = NULL,
                       isMale = isMale,
                       isAdult = isAdult,
                       isOrdinary = isOrdinary) %>%
+    .[, "ordering" := .I] %>%
     setkeyv(key(AWOTE_by_Date_isMale_isOrdinary_isAdult))
 
   AWOTE_by_Date_isMale_isOrdinary_isAdult %>%
     .[input, roll = rollDate] %>%
+    setorderv("ordering") %>%
     .subset2("AWOTE")
 }
 
 awote_fy <- function(fy_year, isMale, isAdult, isOrdinary) {
   fy_year <- validate_fys_permitted(fy_year)
   input <- data.table(fy_year, isMale, isAdult, isOrdinary)
-  setkeyv(input, names(input))
+  
+  # Perhaps unnecessary since data.table retains order of 
+  input[, "ordering" := .I]
+  setkey(input, fy_year, isMale, isAdult, isOrdinary)
   Date <- AWOTE <- NULL
   AWOTE_by_Date_isMale_isOrdinary_isAdult %>%
     .[, "fy_year" := date2fy(Date)] %>%
@@ -81,5 +86,6 @@ awote_fy <- function(fy_year, isMale, isAdult, isOrdinary) {
                 isOrdinary,
                 isAdult)] %>%
     .[input, on = c(key(.))] %>%
+    setorderv("ordering") %>%
     .subset2("AWOTE")
 }

tests/testthat/test_awote.R

@@ -23,9 +23,43 @@ test_that("AWOTE fy", {
 })
 
 test_that("AWOTE unsorted, issue #204", {
-  ufys <- yr2fy(2014:2015)
+  ufys <- yr2fy(2015:2014)
   # Reversing inputs same as referring outputs
   expect_equal(awote(fy.year = rev(ufys)),
                rev(awote(fy.year = ufys)))
+  
+  udates <- paste0(2015:2014, "-01-01")
+  expect_equal(awote(Date = rev(udates)),
+               rev(awote(Date = udates)))
+  
+  withr::with_seed(602, {
+    library(data.table)
+    # Create a combination of inputs, randomly order them
+    # and ensure the collected inputs match the inputs alone
+    
+    DT <- CJ(fy.year = yr2fy(2013:2015),
+             isMale = c(NA, TRUE, FALSE),
+             isAdult = c(TRUE, FALSE), 
+             isOrdinary = c(TRUE, FALSE))
+    DT[, awote_ordered := awote(fy.year = fy.year, 
+                                isMale = isMale,
+                                isAdult = isAdult,
+                                isOrdinary = isOrdinary)]
+    myorder <- sample(1:nrow(DT))
+    DT2 <- DT[myorder]
+    DT2[, this_awote := awote(fy.year = fy.year, 
+                              isMale = isMale, 
+                              isAdult = isAdult,
+                              isOrdinary = isOrdinary)]
+    first_awote <- awote(fy.year = .subset2(DT2, "fy.year")[1],
+                         isMale = .subset2(DT2, "isMale")[1],
+                         isAdult = .subset2(DT2, "isAdult")[1],
+                         isOrdinary = .subset2(DT2, "isOrdinary")[1])
+    expect_equal(first_awote, DT2[["this_awote"]][1])
+    expect_equal(.subset2(DT2, "this_awote"),
+                 .subset2(DT2, "awote_ordered"))
+  })
+  
+  
 })