Merge remote-tracking branch 'origin/AI' into AI

PredictiveEcology · Jan 10, 2025 · 65343b6 · 65343b6
2 parents 05f337f + b42bf33
commit 65343b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/R/GPT2.R b/R/GPT2.R
@@ -482,7 +482,7 @@ get_function_defaults <- function(func) {
 # Helper function to reorder arguments based on formal arguments, combining defaults and user args
 reorder_arguments <- function(formals, args) {
   # Combine defaults and args: user args override defaults
-  combined_args <- modifyList(formals, args)
+  combined_args <- modifyList(formals, args, keep.null = TRUE)
 
   # Preserve the order of the formals
   ordered_args <- combined_args[union(names(formals), names(combined_args))]
@@ -1099,7 +1099,6 @@ loadFromDiskOrMemoise <- function(fromMemoise = FALSE, useCache,
           memoiseFail <- TRUE
           rm(list = cache_key, envir = memoiseEnv(cachePath))
           cache_file <- CacheStoredFile(cachePath, cache_key)
-          browser()
         }
     }
     if (!fromMemoise || rerun || memoiseFail) {

diff --git a/R/exportedMethods.R b/R/exportedMethods.R
@@ -1173,10 +1173,11 @@ unmakeMemoisable.default <- function(x) {
       obj <- unwrapRaster(obj, cachePath, cacheId)
     } else {
       obj <- lapply(obj, function(out) {
-        ret <- .unwrap(out, cachePath, cacheId, drv, conn, ...)
+        ret <- .unwrap(out, cachePath, cacheId = cacheId, drv, conn, ...)
         if (is.character(ret))
           if (identical(.returnNothing, ret))
             FAIL <<- TRUE
+        ret
       })
     }
   }

diff --git a/R/showCacheEtc.R b/R/showCacheEtc.R
@@ -202,8 +202,9 @@ setMethod(
       createCache(x, drv = drv, force = TRUE)
       # }
       if (isTRUE(getOption("reproducible.useMemoise"))) {
-        if (exists(x, envir = .pkgEnv)) {
-          rm(list = x, envir = .pkgEnv)
+        objsInMemEnv <- ls(memoiseEnv(x))
+        if (length(objsInMemEnv)) {
+          rm(list = objsInMemEnv, envir = memoiseEnv(x))
         }
       }
       # memoise::forget(.loadFromLocalRepoMem)