add check_for_errors()

change logic in cholesky variable to clarify error catching intent

Author: njtierney

R/checkers.R

@@ -1693,9 +1693,9 @@ check_final_dim <- function(dim,
   if (last_dim_gt_1) {
     cli::cli_abort(
       message = c(
-      "The final dimension of a {thing} must have more than \\
+        "The final dimension of a {thing} must have more than \\
       one element",
-      "The final dimension has: {.val {n_last_dim} element{?s}}"
+        "The final dimension has: {.val {n_last_dim} element{?s}}"
       ),
       call = call
     )
@@ -1725,6 +1725,33 @@ check_not_greta_array <- function(x,
   }
 }
 
+# if it errored
+check_for_errors <- function(res,
+                             call = rlang::caller_env()){
+
+  if (inherits(res, "error")) {
+
+    # check for known numerical errors
+    numerical_errors <- vapply(greta_stash$numerical_messages,
+                               grepl,
+                               res$message,
+                               FUN.VALUE = 0
+    ) == 1
+
+    # if it was just a numerical error, quietly return a bad value
+    if (!any(numerical_errors)) {
+      cli::cli_abort(
+        message = c(
+          "{.pkg greta} hit a tensorflow error:",
+          "{res}"
+        ),
+        call = call
+      )
+    }
+  }
+
+}
+
 checks_module <- module(
   check_tf_version,
   check_dims,

R/utils.R

@@ -510,26 +510,7 @@ quietly <- function(expr) {
 cleanly <- function(expr) {
   res <- tryCatch(expr, error = function(e) e)
 
-  # if it errored
-  if (inherits(res, "error")) {
-
-    # check for known numerical errors
-    numerical_errors <- vapply(greta_stash$numerical_messages,
-                               grepl,
-                               res$message,
-                               FUN.VALUE = 0
-    ) == 1
-
-    # if it was just a numerical error, quietly return a bad value
-    if (!any(numerical_errors)) {
-      cli::cli_abort(
-        c(
-          "{.pkg greta} hit a tensorflow error:",
-          "{res}"
-        )
-      )
-    }
-  }
+  check_for_errors(res)
 
   res
 }

R/variable.R

@@ -72,18 +72,21 @@ cholesky_variable <- function(dim, correlation = FALSE) {
   n_dim <- length(dim)
   if (n_dim == 1) {
     dim <- c(dim, dim)
-  } else if (n_dim == 2) {
-    not_square <- dim[1] != dim[2]
-    if (not_square) {
-      msg <- cli::cli_abort(
-        c(
-          "cholesky variables must be square",
-          "However its dimension is: {.val {paste(dim, collapse = 'x')}}"
-        )
+  }
+
+  not_square <- dim[1] != dim[2]
+
+  if (n_dim == 2 && not_square){
+    cli::cli_abort(
+      c(
+        "cholesky variables must be square",
+        "However its dimension is: {.val {paste(dim, collapse = 'x')}}"
       )
-    }
-  } else {
-    msg <- cli::cli_abort(
+    )
+  }
+
+  if (length(dim) > 2) {
+    cli::cli_abort(
       c(
         "{.arg dim} can either be a scalar or a vector of length 2",
         "However {.arg dim} has length {.val {length(dim)}}, and contains: \\
@@ -96,8 +99,8 @@ cholesky_variable <- function(dim, correlation = FALSE) {
 
   # dimension of the free state version
   free_dim <- ifelse(correlation,
-    k * (k - 1) / 2,
-    k + k * (k - 1) / 2
+                     k * (k - 1) / 2,
+                     k + k * (k - 1) / 2
   )
 
   # create variable node
@@ -109,8 +112,8 @@ cholesky_variable <- function(dim, correlation = FALSE) {
 
   # set the constraint, to enable transformation
   node$constraint <- ifelse(correlation,
-    "correlation_matrix",
-    "covariance_matrix"
+                            "correlation_matrix",
+                            "covariance_matrix"
   )
 
   # set the printed value to be nicer