make SimResults output consistent

Author: philchalmers

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: SimDesign
 Title: Structure for Organizing Monte Carlo Simulation Designs
-Version: 2.17.4
+Version: 2.17.5
 Authors@R: c(person("Phil", "Chalmers", email = "rphilip.chalmers@gmail.com", role = c("aut", "cre"),
                     comment = c(ORCID="0000-0001-5332-2810")),
              person("Matthew", "Sigal", role = c("ctb")),

NEWS.md

@@ -2,6 +2,9 @@
 
 ## Changes in SimDesign 2.18
 
+- `SimResults()` now gives the same output behavior when `store_results` or 
+  `save_results` are used (see issue #45)
+
 - Use of `SimSolve(..., wait.time)` now automatically sets the `maxiter` to 
   3000 to avoid early terminations
 

R/SimResults.R

@@ -86,11 +86,20 @@ SimResults <- function(obj, which, prefix = "results-row", wd = getwd()){
     file_nums <- gsub(paste0(prefix, '-'), '', file_nums)
     file_nums <- as.numeric(gsub('.rds', '', file_nums))
     files <- data.frame(file_nums, files, stringsAsFactors = FALSE)
-    ret <- vector('list', length(which))
+    stored_Results_list <- vector('list', length(which))
     for(i in seq_len(length(which))){
         pick <- which(files$file_num == which[i])
-        ret[[i]] <- readRDS(files$files[pick])
+        stored_Results_list[[i]] <- readRDS(files$files[pick])
     }
-    if(length(which) == 1L) ret <- ret[[1]]
-    ret
+    design <- SimExtract(obj, 'design')
+    if(is(stored_Results_list[[1L]]$results, 'data.frame') ||
+       is(stored_Results_list[[1L]]$results, 'matrix')){
+        for(i in seq_len(length(stored_Results_list)))
+            stored_Results_list[[i]] <- cbind(design[i,],
+                                              stored_Results_list[[i]]$results, row.names=NULL)
+        stored_Results_list <- dplyr::bind_rows(stored_Results_list)
+        stored_Results_list$ID <- NULL
+        stored_Results_list <- dplyr::as_tibble(stored_Results_list)
+    }
+    stored_Results_list
 }