version 0.9.6

Author: mllg

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: batchtools
 Title: Tools for Computation on Batch Systems
-Version: 0.9.5-9000
+Version: 0.9.6
 Authors@R: c(
     person("Michel", "Lang", NULL, "[email protected]", role = c("cre", "aut")),
     person("Bernd", "Bischl", NULL, "[email protected]", role = "aut"),

NEWS.md

@@ -1,3 +1,8 @@
+# batchtools 0.9.6
+
+* Fixed a bug where the wrong problem was retrieved from the cache. This was only triggered for chunked jobs in
+  combination with an `ExperimentRegistry`.
+
 # batchtools 0.9.5
 
 * Added a missing routine to upgrade registries created with batchtools prior to v0.9.3.

R/RDSReader.R

@@ -8,16 +8,26 @@ RDSReader = R6Class("RDSReader",
       self$use.cache = use.cache
     },
 
-    get = function(uri, slot = NULL) {
+    get = function(uri, slot = NA_character_) {
       read = function(uri) if (file.exists(uri)) readRDS(uri) else NULL
-      if (self$use.cache) {
-        nn = slot %??% uri
-        if (! nn %chin% names(self$cache))
-          self$cache[[nn]] = read(uri)
-        self$cache[[nn]]
-      } else {
-        read(uri)
+
+      # no cache used, read object from disk and return
+      if (!self$use.cache)
+        return(read(uri))
+
+      # not slotted:
+      # look up object in cache. If not found, add to cache. Return cached object
+      if (is.na(slot)) {
+        if (! uri %chin% names(self$cache))
+          self$cache[[uri]] = read(uri)
+        return(self$cache[[uri]])
       }
+
+      # slotted:
+      # object is stored in cache[[slot]] as list(obj = [cached obj], uri = uri)
+      if (is.null(self$cache[[slot]]) || self$cache[[slot]]$uri != uri)
+        self$cache[[slot]] = list(obj = read(uri), uri = uri)
+      return(self$cache[[slot]]$obj)
     },
 
     clear = function() {