Merge pull request #84 from mrc-ide/mrc-5882

Fix pack bug

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: monty
 Title: Monte Carlo Models
-Version: 0.2.17
+Version: 0.2.18
 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
                     email = "[email protected]"),
              person("Wes", "Hinsley", role = "aut"),

R/packer.R

@@ -342,9 +342,10 @@ monty_packer <- function(scalar = NULL, array = NULL, fixed = NULL,
     for (nm in names(shape)) {
       ret[idx[[nm]], ] <- p[[nm]]
     }
-
     drop <- length(shp) == 0 ||
-      (length(shp) == 1 && (length(shape) == 0 || all(lengths(shape) == 0)))
+      (length(shp) == 1 &&
+         (length(shape) == 0 || all(lengths(shape) == 0)) &&
+         length(ret) == length(idx))
     if (drop) {
       dim(ret) <- NULL
     } else if (length(shp) > 1) {

tests/testthat/test-packer.R

@@ -15,7 +15,7 @@ test_that("trivial packer", {
                "Incorrect length input; expected 1 but given 2")
   expect_equal(xp$pack(list(a = 1)), 1)
   expect_equal(xp$pack(list(a = 1:2)),
-               1:2)
+               rbind(1:2))
 
   expect_equal(xp$index(), list(a = 1))
 })
@@ -445,3 +445,10 @@ test_that("don't allow things other than character vectors for now", {
     p$subset(1),
     "Invalid input for 'keep'; this must currently be a character vector")
 })
+
+
+test_that("can add matrix dimensions when unpacking", {
+  p <- monty_packer(c("a", "b", "c"))
+  m <- matrix(1:12, 3, 4)
+  expect_equal(p$pack(p$unpack(m)), m)
+})