Skip to content

Commit a2d63d5

Browse files
# radiator 1.3.3 2024-05-15
* Fix issue #188 related to coverage in DArT 1row and 2rows format
1 parent ab919f4 commit a2d63d5

File tree

224 files changed

+936
-912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+936
-912
lines changed

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: radiator
22
Type: Package
33
Title: RADseq Data Exploration, Manipulation and Visualization using R
4-
Version: 1.3.2
5-
Date: 2024-04-30
4+
Version: 1.3.3
5+
Date: 2024-05-15
66
Encoding: UTF-8
77
Authors@R: c(
88
person("Thierry", "Gosselin", email = "[email protected]", role = c("aut", "cre")),

NEWS.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# radiator 1.3.3 2024-05-15
2+
3+
* Fix issue #188 related to coverage in DArT 1row and 2rows format
4+
5+
6+
7+
18
# radiator 1.3.2 2024-04-30
29

310
* works with R 4.3.4

R/gds.R

+23-17
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ extract_genotypes_metadata <- function(
971971
#' baddly generated. It will say you have Read and allele Depth info, but you don't.
972972
#' Default: \code{stacks.haplo.check = FALSE}.
973973
#' @param dart.check (optional, logical) DArT have different reporting for coverage
974-
#' information.
974+
#' information. Will no longer report the average coverage stats from 1 and 2-rows DArT format.
975975
#' Default: \code{dart.check = FALSE}.
976976
# @keywords internal
977977
#' @export
@@ -1000,15 +1000,21 @@ check_coverage <- function(gds, genotypes.metadata.check = FALSE, stacks.haplo.c
10001000
# DArT count and 1 and 2 rows have different information...
10011001
if (dart.check && "dart" %in% data.source) {
10021002
if (any(c("2rows", "1row") %in% data.source)) {
1003-
got.coverage <- extract_markers_metadata(
1004-
gds,
1005-
markers.meta.select = c("AVG_COUNT_REF", "AVG_COUNT_SNP"),
1006-
whitelist = TRUE
1007-
)
1008-
if (!is.null(got.coverage)) {
1009-
got.coverage <- c("AVG_COUNT_REF", "AVG_COUNT_SNP")
1010-
return(got.coverage)
1011-
}
1003+
# got.coverage <- extract_markers_metadata(
1004+
# gds,
1005+
# markers.meta.select = c("AVG_COUNT_REF", "AVG_COUNT_SNP"),
1006+
# whitelist = TRUE
1007+
# )
1008+
# if (!is.null(got.coverage)) {
1009+
# got.coverage <- c("AVG_COUNT_REF", "AVG_COUNT_SNP")
1010+
# return(got.coverage)
1011+
# }
1012+
message("Coverage statistics information for 2rows and 1row DArT format is ignored")
1013+
message("\nradiator cannot generate coverage statistics from source\npotential blacklisted individuals bias the statistics generated by DArT")
1014+
message("\nrequest DArT count format from DArT")
1015+
1016+
got.coverage <- NULL
1017+
return(got.coverage)
10121018
}#End DART 1row and 2 rows
10131019
}
10141020

@@ -2162,7 +2168,7 @@ generate_stats <- function(
21622168
# subsample = variant.select
21632169
# exhaustive = FALSE
21642170
# force.stats = TRUE
2165-
# # path.folder = NULL
2171+
# path.folder = NULL
21662172
# plot = TRUE
21672173
# digits = 6
21682174
# # file.date = NULL
@@ -2562,7 +2568,7 @@ generate_stats <- function(
25622568
}
25632569

25642570
if (individuals) {
2565-
# changing the margin doesnt work with seqarray, the GDS needs to be optimized by sample
2571+
# changing the margin doesn't work with seqarray, the GDS needs to be optimized by sample
25662572
# this operation is very costly in both time and disk space.
25672573
# faster to do matrix calculations by rows and sums
25682574
# Note to myself: the huge speed gain by using other packages robustbse, Rfast, etc.
@@ -2791,11 +2797,11 @@ generate_stats <- function(
27912797
# NOTE TO MYSELF need to work on including that one with DArT files...--------
27922798
#DArT 1 row and 2rows --------------------------------------------------------
27932799
# if ("dart" %in% data.source && any(c("2rows", "1row") %in% data.source)) {
2794-
# depth <- extract_markers_metadata(
2795-
# gds,
2796-
# markers.meta.select = c("AVG_COUNT_REF", "AVG_COUNT_SNP"),
2797-
# whitelist = TRUE
2798-
# )
2800+
# depth <- extract_markers_metadata(
2801+
# gds,
2802+
# markers.meta.select = c("AVG_COUNT_REF", "AVG_COUNT_SNP"),
2803+
# whitelist = TRUE
2804+
# )
27992805
# markers <- ind <- FALSE
28002806
#
28012807
# if (is.null(depth)) return(NULL)

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
[![Project Status: Active – The project has reached a stable, usable
66
state and is being actively
77
developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
8-
[![packageversion](https://img.shields.io/badge/Package%20version-1.3.2-orange.svg)](commits/master)
9-
[![Last-changedate](https://img.shields.io/badge/last%20change-2024--04--30-brightgreen.svg)](/commits/master)
8+
[![packageversion](https://img.shields.io/badge/Package%20version-1.3.3-orange.svg)](commits/master)
9+
[![Last-changedate](https://img.shields.io/badge/last%20change-2024--05--15-brightgreen.svg)](/commits/master)
1010
[![R-CMD-check](https://github.com/thierrygosselin/radiator/workflows/R-CMD-check/badge.svg)](https://github.com/thierrygosselin/radiator/actions)
1111
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3687060.svg)](https://doi.org/10.5281/zenodo.3687060)
1212
<!-- badges: end -->

docs/404.html

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE.html

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/get_started.html

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)