fix as.matrix() to actually return a matrix.

R/fcwtr_scalogram.R

@@ -344,7 +344,7 @@ as.data.frame.fcwtr_scalogram <- function(x, ...) {
 #'  An "fcwtr_scalogram" object resulting from [fcwt()].
 #' @inheritParams base::as.matrix
 #'
-#' @return A two dimensional numeric vector, inheriting the S3 class "matrix".
+#' @return A two dimensional numeric vector, inheriting the class "matrix".
 #'
 #' @examples
 #' fcwt(
@@ -356,9 +356,13 @@ as.data.frame.fcwtr_scalogram <- function(x, ...) {
 #'
 #' @export
 as.matrix.fcwtr_scalogram <- function(x, ...) {
+  t <- sc_dim_time(x)
+  f <- sc_dim_freq(x)
+
   attributes(x) <- NULL
+  dim(x) <- c(t, f)
 
-  unclass(x)
+  x
 }
 
 #' Extract parts of a scalogram

tests/testthat/test-fcwtr_scalogram.R

@@ -90,6 +90,21 @@ test_that("as.data.frame() result has correct properties", {
   expect_true(has_comp_unit(res[["freq"]], "Hz"))
 })
 
+test_that("as.matrix() has the correct S3 class", {
+  expect_true(
+    fcwt(
+      ts_sin_440[1:1000],
+      sample_freq = 44100,
+      freq_begin = 50,
+      freq_end = 1000,
+      n_freqs = 10,
+      sigma = 1
+    ) |>
+      as.matrix() |>
+      is.matrix()
+  )
+})
+
 test_that("`agg()` does not err", {
   prep <-
     fcwt(