start fixing tests

Author: jgabry

R/loo_compare.R

@@ -9,7 +9,7 @@
 #' @param ... Additional objects of class `"loo"`, if not passed in as a single
 #'   list.
 #'
-#' @return A matrix with class `"compare.loo"` that has its own
+#' @return A data frame with class `"compare.loo"` that has its own
 #'   print method. See the **Details** section.
 #'
 #' @details
@@ -164,15 +164,15 @@ print.compare.loo <- function(x, ..., digits = 1, p_worse = TRUE) {
   if (NCOL(xcopy) >= 2) {
     xcopy <- xcopy[, c("elpd_diff", "se_diff")]
   }
-  if (p_worse) {
+  if (p_worse && !inherits(x, "old_compare.loo")) {
     print(
       cbind(.fr(xcopy, digits),
             p_worse = .fr(x[, "p_worse"], 2),
             diag_pnorm = x[, "diag_pnorm"]),
       quote = FALSE
     )
   } else {
-    print(cbind(.fr(xcopy, digits)), quote = FALSE)
+    print(.fr(xcopy, digits), quote = FALSE)
   }
   invisible(x)
 }

man/loo_compare.Rd

@@ -1,28 +1,32 @@
 # loo_compare returns expected results (2 models)
 
-    WAoAAAACAAQFAAACAwAAAAMOAAAAEAAAAAAAAAAAwBA6U1+cRe4AAAAAAAAAAD+2ake0LxMB
-    wFTh8N3JQljAVeWWE8MGuUARCD2zEXBfQBEalRIN2T9ACijAYdW5U0AmZ5XrANCKP/H9Zexy
-    814/8ZtgnG1nx0Bk4fDdyUJYQGXllhPDBrlAIQg9sxFwX0AhGpUSDdk/AAAEAgAAAAEABAAJ
-    AAAAA2RpbQAAAA0AAAACAAAAAgAAAAgAAAQCAAAAAQAEAAkAAAAIZGltbmFtZXMAAAATAAAA
-    AgAAABAAAAACAAQACQAAAAZtb2RlbDEABAAJAAAABm1vZGVsMgAAABAAAAAIAAQACQAAAAll
-    bHBkX2RpZmYABAAJAAAAB3NlX2RpZmYABAAJAAAACWVscGRfd2FpYwAEAAkAAAAMc2VfZWxw
-    ZF93YWljAAQACQAAAAZwX3dhaWMABAAJAAAACXNlX3Bfd2FpYwAEAAkAAAAEd2FpYwAEAAkA
-    AAAHc2Vfd2FpYwAABAIAAAABAAQACQAAAAVjbGFzcwAAABAAAAADAAQACQAAAAtjb21wYXJl
-    LmxvbwAEAAkAAAAGbWF0cml4AAQACQAAAAVhcnJheQAAAP4=
+    WAoAAAACAAQEAgACAwAAAAMTAAAACgAAAA4AAAACAAAAAAAAAADAEDpTX5xF7gAAAA4AAAAC
+    AAAAAAAAAAA/tmpHtC8TAQAAAA4AAAACf/AAAAAAB6I/8AAAAAAAAAAAABAAAAACAAQACQAA
+    AAAABAAJAAAAB04gPCAxMDAAAAAOAAAAAsBU4fDdyUJYwFXllhPDBrkAAAAOAAAAAkARCD2z
+    EXBfQBEalRIN2T8AAAAOAAAAAkAKKMBh1blTQCZnlesA0IoAAAAOAAAAAj/x/WXscvNeP/Gb
+    YJxtZ8cAAAAOAAAAAkBk4fDdyUJYQGXllhPDBrkAAAAOAAAAAkAhCD2zEXBfQCEalRIN2T8A
+    AAQCAAAAAQAEAAkAAAAFbmFtZXMAAAAQAAAACgAEAAkAAAAJZWxwZF9kaWZmAAQACQAAAAdz
+    ZV9kaWZmAAQACQAAAAdwX3dvcnNlAAQACQAAAApkaWFnX3Bub3JtAAQACQAAAAllbHBkX3dh
+    aWMABAAJAAAADHNlX2VscGRfd2FpYwAEAAkAAAAGcF93YWljAAQACQAAAAlzZV9wX3dhaWMA
+    BAAJAAAABHdhaWMABAAJAAAAB3NlX3dhaWMAAAQCAAAAAQAEAAkAAAAFY2xhc3MAAAAQAAAA
+    AgAEAAkAAAALY29tcGFyZS5sb28ABAAJAAAACmRhdGEuZnJhbWUAAAQCAAAAAQAEAAkAAAAJ
+    cm93Lm5hbWVzAAAAEAAAAAIABAAJAAAABm1vZGVsMQAEAAkAAAAGbW9kZWwyAAAA/g==
 
 # loo_compare returns expected result (3 models)
 
-    WAoAAAACAAQFAAACAwAAAAMOAAAAGAAAAAAAAAAAwBA6U1+cRe7AMA3KkbYEGAAAAAAAAAAA
-    P7ZqR7QvEwE/y6/t4TTtXsBU4fDdyUJYwFXllhPDBrnAWOVjgjbDYkARCD2zEXBfQBEalRIN
-    2T9AEPIF3GigE0AKKMBh1blTQCZnlesA0IpAQcjYUhrdCj/x/WXscvNeP/GbYJxtZ8c/8YDQ
-    kmfJX0Bk4fDdyUJYQGXllhPDBrlAaOVjgjbDYkAhCD2zEXBfQCEalRIN2T9AIPIF3GigEwAA
-    BAIAAAABAAQACQAAAANkaW0AAAANAAAAAgAAAAMAAAAIAAAEAgAAAAEABAAJAAAACGRpbW5h
-    bWVzAAAAEwAAAAIAAAAQAAAAAwAEAAkAAAAGbW9kZWwxAAQACQAAAAZtb2RlbDIABAAJAAAA
-    Bm1vZGVsMwAAABAAAAAIAAQACQAAAAllbHBkX2RpZmYABAAJAAAAB3NlX2RpZmYABAAJAAAA
-    CWVscGRfd2FpYwAEAAkAAAAMc2VfZWxwZF93YWljAAQACQAAAAZwX3dhaWMABAAJAAAACXNl
-    X3Bfd2FpYwAEAAkAAAAEd2FpYwAEAAkAAAAHc2Vfd2FpYwAABAIAAAABAAQACQAAAAVjbGFz
-    cwAAABAAAAADAAQACQAAAAtjb21wYXJlLmxvbwAEAAkAAAAGbWF0cml4AAQACQAAAAVhcnJh
-    eQAAAP4=
+    WAoAAAACAAQEAgACAwAAAAMTAAAACgAAAA4AAAADAAAAAAAAAADAEDpTX5xF7sAwDcqRtgQY
+    AAAADgAAAAMAAAAAAAAAAD+2ake0LxMBP8uv7eE07V4AAAAOAAAAA3/wAAAAAAeiP/AAAAAA
+    AAA/8AAAAAAAAAAAABAAAAADAAQACQAAAAAABAAJAAAAB04gPCAxMDAABAAJAAAAB04gPCAx
+    MDAAAAAOAAAAA8BU4fDdyUJYwFXllhPDBrnAWOVjgjbDYgAAAA4AAAADQBEIPbMRcF9AERqV
+    Eg3ZP0AQ8gXcaKATAAAADgAAAANACijAYdW5U0AmZ5XrANCKQEHI2FIa3QoAAAAOAAAAAz/x
+    /WXscvNeP/GbYJxtZ8c/8YDQkmfJXwAAAA4AAAADQGTh8N3JQlhAZeWWE8MGuUBo5WOCNsNi
+    AAAADgAAAANAIQg9sxFwX0AhGpUSDdk/QCDyBdxooBMAAAQCAAAAAQAEAAkAAAAFbmFtZXMA
+    AAAQAAAACgAEAAkAAAAJZWxwZF9kaWZmAAQACQAAAAdzZV9kaWZmAAQACQAAAAdwX3dvcnNl
+    AAQACQAAAApkaWFnX3Bub3JtAAQACQAAAAllbHBkX3dhaWMABAAJAAAADHNlX2VscGRfd2Fp
+    YwAEAAkAAAAGcF93YWljAAQACQAAAAlzZV9wX3dhaWMABAAJAAAABHdhaWMABAAJAAAAB3Nl
+    X3dhaWMAAAQCAAAAAQAEAAkAAAAFY2xhc3MAAAAQAAAAAgAEAAkAAAALY29tcGFyZS5sb28A
+    BAAJAAAACmRhdGEuZnJhbWUAAAQCAAAAAQAEAAkAAAAJcm93Lm5hbWVzAAAAEAAAAAMABAAJ
+    AAAABm1vZGVsMQAEAAkAAAAGbW9kZWwyAAQACQAAAAZtb2RlbDMAAAD+
 
 # compare returns expected result (2 models)
 

tests/testthat/_snaps/compare.md

@@ -62,6 +62,8 @@ test_that("loo_compare throws appropriate warnings", {
 comp_colnames <- c(
   "elpd_diff",
   "se_diff",
+  "p_worse",
+  "diag_pnorm",
   "elpd_waic",
   "se_elpd_waic",
   "p_waic",
@@ -73,6 +75,7 @@ comp_colnames <- c(
 test_that("loo_compare returns expected results (2 models)", {
   comp1 <- loo_compare(w1, w1)
   expect_s3_class(comp1, "compare.loo")
+  expect_s3_class(comp1, "data.frame")
   expect_equal(colnames(comp1), comp_colnames)
   expect_equal(rownames(comp1), c("model1", "model2"))
   expect_output(print(comp1), "elpd_diff")
@@ -98,7 +101,7 @@ test_that("loo_compare returns expected result (3 models)", {
   expect_equal(rownames(comp1), c("model1", "model2", "model3"))
   expect_equal(comp1[1, 1], 0)
   expect_s3_class(comp1, "compare.loo")
-  expect_s3_class(comp1, "matrix")
+  expect_s3_class(comp1, "data.frame")
 
   expect_snapshot_value(comp1, style = "serialize")