Merge branch 'release-3.2.1' into main

andrewmarx · May 12, 2023 · bb88ef9 · bb88ef9
2 parents e174bde + c43b1f2
commit bb88ef9
Show file tree

Hide file tree

Showing 59 changed files with 115 additions and 101 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 3.2.0
-Date: 2023-05-03 18:24:54 UTC
-SHA: 4ad77c5be6e010c661afd9a0f236bb68f9fb785d
+Version: 3.2.1
+Date: 2023-05-08 22:35:52 UTC
+SHA: fb15a4407ea88e1423e756d21b5c191b0f260485
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: samc
 Type: Package
 Title: Spatial Absorbing Markov Chains
-Version: 3.2.0
+Version: 3.2.1
 Authors@R: c(
     person("Andrew", "Marx", , "[email protected]", role = c("aut", "cre", "cph"), 
       comment = c(ORCID = "0000-0002-7456-1631")

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# samc 3.2.1
+
+## Bug fix
+
+- Fixed a minor issue in `check()` that was preventing use of the `init` parameter for samc objects created directly from a matrix.
+
 # samc 3.2.0
 
 ## New Features

diff --git a/R/check.R b/R/check.R
@@ -207,9 +207,9 @@ setMethod(
   function(a, b){
     if (a@source != "transition") stop("Numeric vector input only valid for samc objects created from P matrix", call. = FALSE)
 
-    if (names(b) != a@names) stop("Names of the vector must match the names of the transient states in the P matrix", call. = FALSE)
+    if (!isTRUE(all.equal(names(b), a@names))) stop("Names of the vector must match the names of the transient states in the P matrix", call. = FALSE)
 
     if (any(!is.finite(b)) || any(b < 0)) stop("Input must only contain positive numeric values", call. = FALSE)
 
-    if (length(b) != nrow(a$q_matrix)) stop("Input length does not match number of transient states", call. = FALSE)
+    if (length(b) != length(a@data@t_abs)) stop("Input length does not match number of transient states", call. = FALSE)
   })
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,4 +1,6 @@
-## 3.2.0 (Submission)
+## 3.2.1 (Submission)
+
+Apologies for submitting so soon after the last release. This release fixes an issue that impacts the material for a soon to presented workshop.
 
 ### Notes
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/article-circuit-theory.html b/docs/articles/article-circuit-theory.html
diff --git a/docs/articles/article-computation-methods.html b/docs/articles/article-computation-methods.html
diff --git a/docs/articles/article-models.html b/docs/articles/article-models.html
diff --git a/docs/articles/code-snippets.html b/docs/articles/code-snippets.html
diff --git a/docs/articles/data-disconnected.html b/docs/articles/data-disconnected.html
diff --git a/docs/articles/example-coinflip.html b/docs/articles/example-coinflip.html
diff --git a/docs/articles/example-maze-part1.html b/docs/articles/example-maze-part1.html
diff --git a/docs/articles/example-maze-part2.html b/docs/articles/example-maze-part2.html
diff --git a/docs/articles/example-maze-part3.html b/docs/articles/example-maze-part3.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/overview.html b/docs/articles/overview.html
diff --git a/docs/articles/parallel.html b/docs/articles/parallel.html
diff --git a/docs/articles/performance.html b/docs/articles/performance.html
diff --git a/docs/articles/troubleshooting.html b/docs/articles/troubleshooting.html
diff --git a/docs/articles/tutorial-animations.html b/docs/articles/tutorial-animations.html