cleaning up as.matrix, as.data.frame methods

Author: kkholst

NAMESPACE

@@ -79,7 +79,6 @@ S3method(adjMat,lvm)
 S3method(adjMat,lvmfit)
 S3method(ancestors,lvm)
 S3method(ancestors,lvmfit)
-S3method(as.data.frame,sim)
 S3method(as.matrix,sim)
 S3method(as.vector,sim)
 S3method(baptize,lvm)

R/sim.default.R

@@ -176,17 +176,15 @@ as.vector.sim <- function(x, mode="any") {
 }
 
 ##' @export
-as.data.frame.sim <- function(x, ...) {
-  class(x) <- "data.frame"
+as.matrix.sim <- function(x, ...) {
+  if (inherits(x, "data.frame")) {
+    return(as.matrix(as.data.frame(x)))
+  }
+  class(x) <- "matrix"
   attr(x, "call") <- NULL
   attr(x, "f") <- NULL
   attr(x, "time") <- NULL
-  return(x)
-}
-
-##' @export
-as.matrix.sim <- function(x, ...) {
-  as.data.frame(x) |> as.matrix()
+  x
 }
 
 ##' @export

tests/testthat/test-sim.R

@@ -26,7 +26,10 @@ test_that("Missing", {
     testthat::expect_equal(sum(d$r),sum(!is.na(d$y0)))
 
     g <- glm(r~x,data=d,family=binomial)
-    testthat::expect_true(all.equal(coef(g),c(0,1),tolerance=0.2,check.attributes=FALSE))
+    testthat::expect_true(all.equal(coef(g), c(0, 1),
+                                    tolerance = 0.2,
+                                    check.attributes = FALSE
+    ))
 })
 
 
@@ -52,7 +55,10 @@ test_that("sim.default I", {
     val <- sim(val,R=2,b0=1,n=10,type=0) ## append results
     testthat::expect_true(nrow(val)==4)
 
-    s1 <- summary(val,estimate=c(1,1),confint=c(3,4,6,7),true=c(1,1),names=c("Model","Sandwich"))
+    s1 <- summary(val,
+                  estimate = c(1, 1), confint = c(3, 4, 6, 7),
+                  true = c(1, 1), names = c("Model", "Sandwich")
+    )
     testthat::expect_true(length(grep("Coverage",rownames(s1)))>0)
     testthat::expect_equivalent(colnames(s1),c("Model","Sandwich"))