Merge branch 'development'

PredictiveEcology · Jun 6, 2024 · dea0017 · dea0017
2 parents aa543f0 + a591901
commit dea0017
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -42,6 +42,7 @@ jobs:
 
       - name: Install additional package dependencies
         run: |
+          pak::pkg_install("PredictiveEcology/reproducible@development")
           pak::pkg_install("ropensci/NLMR")
           pak::pkg_install("s-u/fastshp")
         shell: Rscript {0}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -14,8 +14,8 @@ Description: Provides the core framework for a discrete event system to
 URL:
     https://spades-core.predictiveecology.org/,
     https://github.com/PredictiveEcology/SpaDES.core
-Date: 2024-06-05
-Version: 2.1.1
+Date: 2024-06-06
+Version: 2.1.2
 Authors@R: c(
     person("Alex M", "Chubaty", , "[email protected]", role = c("aut"),
            comment = c(ORCID = "0000-0001-7146-8135")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# SpaDES.core 2.1.2
+
+* fixed bug in `restartSpades()`;
+
 # SpaDES.core 2.1.1
 
 ## Bugfixes

diff --git a/R/restart.R b/R/restart.R
@@ -102,7 +102,7 @@ restartSpades <- function(sim = NULL, module = NULL, numEvents = Inf, restart =
   numMods <- min(length(sim$.recoverableObjs), numEvents)
   if (numMods > 0) {
     com <- completed(sim)
-    etSecs <- sum(com[, et := difftime(._clockTime, ._prevEventTimeFinish, units = "secs"),
+    etSecs <- sum(com[, et := difftime(clockTime, ._prevEventTimeFinish, units = "secs"),
                       by = seq_len(NROW(com))]$et)
 
     # remove the times of the completed events - 1 because the restartSpaDES includes the incompleted event