Skip to content

Commit

Permalink
Merge branch 'development' of github.com:PredictiveEcology/reproducib…
Browse files Browse the repository at this point in the history
…le into development
  • Loading branch information
eliotmcintire committed Nov 8, 2018
2 parents 2479267 + 02fada0 commit d66894d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions R/cache.R
Original file line number Diff line number Diff line change
Expand Up @@ -503,18 +503,20 @@ setMethod(
# don't digest the dotPipe elements as they are already
# extracted individually into modifiedDots list elements
dotPipe <- startsWith(names(modifiedDots), "._")

preDigestByClass <- lapply(seq_along(modifiedDots[!dotPipe]), function(x) {
.preDigestByClass(modifiedDots[!dotPipe][[x]])
})

if (verbose) {
startHashTime <- Sys.time()
}
# if (!is.null(list(...)$sim))
# browser(expr = current(list(...)$sim)$moduleName == "LBMR")

preDigest <- lapply(modifiedDots[!dotPipe], function(x) {
# remove some of the arguments passed to Cache, which are irrelevant for digest
argsToOmitForDigest <- dotPipe |
(names(modifiedDots) %in%
c("debug", "notOlderThan", "debugCache", "verbose", "useCache", "showSimilar"))

preDigest <- lapply(modifiedDots[!argsToOmitForDigest], function(x) {
# remove the "newCache" attribute, which is irrelevant for digest
if (!is.null(attr(x, ".Cache")$newCache)) attr(x, ".Cache")$newCache <- NULL
.robustDigest(x, objects = objects,
Expand Down

0 comments on commit d66894d

Please sign in to comment.