From 52292d54942a69a0d2660dc6f005ac240cd668ee Mon Sep 17 00:00:00 2001 From: "Win Cowger, PhD" Date: Mon, 20 May 2024 16:28:51 -0700 Subject: [PATCH] update test --- R/manage_spec.R | 6 ++++-- tests/testthat/test-manage_spec.R | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/R/manage_spec.R b/R/manage_spec.R index 6f5fb4ce..9d3c0cba 100644 --- a/R/manage_spec.R +++ b/R/manage_spec.R @@ -169,10 +169,12 @@ merge_map.list <- function(x, origins = NULL, ...) { if(is.null(origins)){ origin = lapply(map, function(x) unique(x$metadata$description)) + pix_size = lapply(map, function(x) unique(x$metadata$`pixel size`)) + pixel_size = vapply(pix_size, function(x) as.numeric(gsub("(\\{)|(\\})|(,.*)", "",x))*10^6, FUN.VALUE = numeric(1)) originx = vapply(origin, function(x) gsub(",.*", "", gsub(".*X=", "", x)) |> as.numeric(), FUN.VALUE = numeric(1)) originy = vapply(origin, function(x) gsub(".*Y=", "", x) |> as.numeric(), FUN.VALUE = numeric(1)) - xoffset = as.integer((originx-min(originx))/(as.numeric(gsub("(\\{)|(\\})|(,.*)", "",x$metdata["pixel size"]))*10^5)) - yoffset = as.integer((originy-min(originy))/(as.numeric(gsub("(\\{)|(\\})|(,.*)", "",x$metdata["pixel size"]))*10^5)) + xoffset = as.integer((originx-min(originx))/pixel_size) + yoffset = as.integer((originy-min(originy))/pixel_size) } else{ diff --git a/tests/testthat/test-manage_spec.R b/tests/testthat/test-manage_spec.R index ad56248e..cf6398cd 100644 --- a/tests/testthat/test-manage_spec.R +++ b/tests/testthat/test-manage_spec.R @@ -63,8 +63,10 @@ test_that("merge_map()", { expect_true(check_OpenSpecy(merged)) two_alt <- list(read_extdata("CA_tiny_map.zip"), read_extdata("CA_tiny_map.zip")) merged2 <- merge_map(two_alt, origins = origins) + auto_size <- merge_map(two_alt) expect_true(check_OpenSpecy(merged2)) expect_identical(merged$spectra, merged2$spectra) expect_true(ncol(merged2$spectra) == ncol(tiny_map$spectra) * 2) + expect_true(ncol(auto_size$spectra) == ncol(tiny_map$spectra)) })