From 9012763994b89d93bce8bb1b53bcded46c40cbd4 Mon Sep 17 00:00:00 2001 From: Bart-Jan van Rossum Date: Wed, 5 Feb 2025 11:41:51 +0100 Subject: [PATCH] Minor changes --- .Rbuildignore | 1 + DESCRIPTION | 3 ++- .../example_magicreconstruct_ancestry.csv.gz | Bin inst/tinytest/{rabbitJulia => }/example_ped.csv | 0 inst/tinytest/test_readRABBIT.R | 5 +++-- 5 files changed, 6 insertions(+), 3 deletions(-) rename inst/tinytest/{rabbitJulia => }/example_magicreconstruct_ancestry.csv.gz (100%) rename inst/tinytest/{rabbitJulia => }/example_ped.csv (100%) diff --git a/.Rbuildignore b/.Rbuildignore index 2d137ac..636c83c 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -17,3 +17,4 @@ public ^CRAN-RELEASE$ developmentScripts pkgdown +revdep diff --git a/DESCRIPTION b/DESCRIPTION index 52c3f10..8f3e144 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -46,7 +46,8 @@ Roxygen: list(markdown = TRUE) Suggests: rmarkdown, knitr, - tinytest + tinytest, + R.utils VignetteBuilder: knitr URL: https://biometris.github.io/statgenIBD/index.html, https://github.com/Biometris/statgenIBD/ BugReports: https://github.com/Biometris/statgenIBD/issues diff --git a/inst/tinytest/rabbitJulia/example_magicreconstruct_ancestry.csv.gz b/inst/tinytest/example_magicreconstruct_ancestry.csv.gz similarity index 100% rename from inst/tinytest/rabbitJulia/example_magicreconstruct_ancestry.csv.gz rename to inst/tinytest/example_magicreconstruct_ancestry.csv.gz diff --git a/inst/tinytest/rabbitJulia/example_ped.csv b/inst/tinytest/example_ped.csv similarity index 100% rename from inst/tinytest/rabbitJulia/example_ped.csv rename to inst/tinytest/example_ped.csv diff --git a/inst/tinytest/test_readRABBIT.R b/inst/tinytest/test_readRABBIT.R index 63436fa..0b93c1c 100644 --- a/inst/tinytest/test_readRABBIT.R +++ b/inst/tinytest/test_readRABBIT.R @@ -55,10 +55,11 @@ expect_equal(barleyMPP$markers, barleyMPP2$markers) ## Define input files. -genoFileJulia <- file.path("rabbitJulia", "example_magicreconstruct_ancestry.csv.gz") -pedFileJulia <- file.path("rabbitJulia", "example_ped.csv") +genoFileJulia <- file.path(".", "example_magicreconstruct_ancestry.csv.gz") +pedFileJulia <- file.path(".", "example_ped.csv") ## Different combinations of inputs should give similar output. + expect_silent(exMPP <- readRABBIT(infile = genoFileJulia)) expect_silent(exMPP2 <- readRABBIT(infile = genoFileJulia, pedFile = pedFileJulia))