start test_fix arm64

BodenmillerGroup · Oct 7, 2024 · b71d2f0 · b71d2f0
1 parent e4af279
commit b71d2f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tests/testthat/test_countInteractions.R b/tests/testthat/test_countInteractions.R
@@ -386,14 +386,14 @@ test_that("countInteractions function works", {
                                                    patch_size = 4,
                                                    colPairName = "knn_interaction_graph")) 
 
-    expect_true(all(cur_out$ct[!is.na(cur_out$ct)] == 0))
+    expect_equal(cur_out$ct[!is.na(cur_out$ct)], rep(0, 22))
 
     expect_silent(cur_out <- countInteractions(pancreasSCE, group_by = "ImageNb",
                                                    label = "CellType", method = "patch",
                                                    patch_size = 0,
                                                    colPairName = "knn_interaction_graph")) 
 
-    expect_true(all(cur_out$ct[!is.na(cur_out$ct)] == 1))
+    expect_equal(cur_out$ct[!is.na(cur_out$ct)], rep(1, 22))
 
     expect_silent(cur_out <- countInteractions(pancreasSCE, group_by = "ImageNb",
                                                    label = "CellType", method = "patch",

diff --git a/tests/testthat/test_integration_interactions.R b/tests/testthat/test_integration_interactions.R
@@ -348,12 +348,12 @@ test_that("testInteractions gives same results as neighbouRhood", {
     expect_equal(dat_p$group, imcRtools_classic_perm$group_by)
     expect_equal(as.character(dat_p$FirstLabel), imcRtools_classic_perm$from_label)
     expect_equal(as.character(dat_p$SecondLabel), imcRtools_classic_perm$to_label)
-    expect_equal(dat_p$p_gt[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$p_gt[!is.na(imcRtools_classic$ct)])
-    expect_equal(dat_p$p_lt[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$p_lt[!is.na(imcRtools_classic$ct)])
-    expect_equal(dat_p$direction[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$interaction[!is.na(imcRtools_classic$ct)])
-    expect_equal(dat_p$p[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$p[!is.na(imcRtools_classic$ct)])
-    expect_equal(dat_p$sig[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$sig[!is.na(imcRtools_classic$ct)])
-    expect_equal(dat_p$sigval[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$sigval[!is.na(imcRtools_classic$ct)])
+    expect_equal(dat_p$p_gt[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$p_gt[!is.na(imcRtools_classic_perm$ct)])
+    expect_equal(dat_p$p_lt[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$p_lt[!is.na(imcRtools_classic_perm$ct)])
+    expect_equal(dat_p$direction[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$interaction[!is.na(imcRtools_classic_perm$ct)])
+    expect_equal(dat_p$p[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$p[!is.na(imcRtools_classic_perm$ct)])
+    expect_equal(dat_p$sig[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$sig[!is.na(imcRtools_classic_perm$ct)])
+    expect_equal(dat_p$sigval[!is.na(imcRtools_classic$ct)], imcRtools_classic_perm$sigval[!is.na(imcRtools_classic_perm$ct)])
 
     ###################################### histocat #############################
     d <- prepare_tables(dat_cells, dat_relation)