Skip to content

Commit

Permalink
# assigner 0.6.0 2024-11-06
Browse files Browse the repository at this point in the history
* refresh for new R version
  • Loading branch information
thierrygosselin committed Nov 6, 2024
1 parent 2eb1c49 commit 8b22fde
Show file tree
Hide file tree
Showing 57 changed files with 1,129 additions and 949 deletions.
Binary file modified .DS_Store
Binary file not shown.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: assigner
Type: Package
Title: Assignment Analysis with RADseq Data
Version: 0.5.9
Date: 2023-03-15
Version: 0.6.0
Date: 2024-11-06
Encoding: UTF-8
Authors@R: c(
person("Thierry", "Gosselin", email = "[email protected]", role = c("aut", "cre")),
Expand Down Expand Up @@ -49,6 +49,6 @@ LazyLoad: yes
LazyData: true
VignetteBuilder:
knitr
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
URL: http://thierrygosselin.github.io/assigner/
BugReports: https://github.com/thierrygosselin/assigner/issues
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# assigner 0.6.0 2024-11-06

* refresh for new R version

# assigner 0.5.9 2023-03-15

* work on *assigner::fst_WC84*
Expand Down
6 changes: 6 additions & 0 deletions R/fst_WC84.R
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ fst_WC84 <- function(
# strip the data -------------------------------------------------------------
# increases speed for large datasets
env.arg <- rlang::current_env()

data %<>%
radiator::strip_rad(
x = .,
Expand Down Expand Up @@ -476,6 +477,7 @@ fst_WC84 <- function(
# res <- purrr::prepend(x = res, values = purrr::flatten(subsample.fst))
# change strata --------
nms <- subsample.fst %>% purrr::map(names) %>% purrr::reduce(union)
if (!pairwise && "pairwise.fst" %in% nms) nms <- purrr::discard(.x = nms, .p = nms %in% "pairwise.fst")
res <- purrr::map(
.x = nms,
.f = fst_stats,
Expand All @@ -487,6 +489,8 @@ fst_WC84 <- function(
) %>%
purrr::flatten(.)



# test1 <- res$pairwise.fst
# test2 <- res$pairwise.fst.upper.matrix
# test3 <- res$pairwise.fst.full.matrix
Expand Down Expand Up @@ -1748,6 +1752,8 @@ assigner_fst_stats <- function(

fst_stats <- function(x, l, digits = 9L, m = NULL, s = NULL, subsample = FALSE) {
# x = "pairwise.fst" # test
# x = "fst.markers"
# x = "fis.overall"
res <- list()
# message(x)
want <- c("sigma.loc", "fst.markers", "fst.ranked", "fst.overall",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ state and is being actively
developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
[![minimal R
version](https://img.shields.io/badge/R%3E%3D-3.5.0-6666ff.svg)](https://cran.r-project.org/)
[![packageversion](https://img.shields.io/badge/Package%20version-0.5.9-orange.svg)](commits/master)
[![Last-changedate](https://img.shields.io/badge/last%20change-2023--03--15-brightgreen.svg)](/commits/master)
[![packageversion](https://img.shields.io/badge/Package%20version-0.6.0-orange.svg)](commits/master)
[![Last-changedate](https://img.shields.io/badge/last%20change-2024--11--06-brightgreen.svg)](/commits/master)
[![R-CMD-check](https://github.com/thierrygosselin/assigner/workflows/R-CMD-check/badge.svg)](https://github.com/thierrygosselin/assigner/actions)
[![macOS](https://github.com/thierrygosselin/assigner/workflows/macOS-latest%20(release)/badge.svg)](https://github.com/thierrygosselin/assigner/actions?workflow=macOS-latest%20(release))
[![Linux](https://github.com/thierrygosselin/assigner/workflows/check-linux//badge.svg)](https://github.com/thierrygosselin/assigner/actions?workflow=check-linux)
Expand Down
18 changes: 9 additions & 9 deletions docs/FEATURES.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8b22fde

Please sign in to comment.