Skip to content

Commit

Permalink
Merge pull request #18 from kbroman/cran
Browse files Browse the repository at this point in the history
Fix link to Rd file
  • Loading branch information
kbroman authored Jul 17, 2024
2 parents 6965c44 + 486b87d commit 21512eb
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [main, master, cran]
pull_request:
branches: [main, master]
branches: [main, master, cran]

name: R-CMD-check

Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: qtl2fst
Version: 0.26
Date: 2021-10-07
Version: 0.28
Date: 2024-07-16
Title: Database Storage of Genotype Probabilities for QTL Mapping
Description: Uses the 'fst' package to store genotype probabilities on disk for the 'qtl2' package. These genotype probabilities are a central data object for mapping quantitative trait loci (QTL), but they can be quite large. The facilities in this package enable the genotype probabilities to be stored on disk, leading to reduced memory usage with only a modest increase in computation time.
Author: Karl W Broman [aut, cre] (<https://orcid.org/0000-0002-4914-6671>),
Expand All @@ -26,5 +26,5 @@ License: GPL-3
URL: https://github.com/rqtl/qtl2fst
ByteCompile: true
Encoding: UTF-8
RoxygenNote: 7.1.2
RoxygenNote: 7.3.2
Roxygen: list(markdown=TRUE)
11 changes: 9 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## qtl2fst 0.28 (2024-07-16)

### Minor changes

- Fixed link in documentation.


## qtl2fst 0.26 (2021-10-07)

### Minor changes
Expand Down Expand Up @@ -40,11 +47,11 @@

- Added `calc_genoprob_fst()` which combines `calc_genoprob()` and
`fst_genoprob()` to save use of RAM when calculating genotype
probabilties.
probabilities.

- Added `genoprob_to_alleleprob_fst()` which combines
`genoprob_to_alleleprob()` and `fst_genoprob()` to save use of RAM
when converting genotype probabilties to allele dosages.
when converting genotype probabilities to allele dosages.

- Added `summary()` and `print()` functions for `"fst_genoprob"`
objects.
Expand Down
4 changes: 2 additions & 2 deletions R/genoprob_to_alleleprob_fst.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#' Convert genotype probabilities to allele probabilities and write to fst database
#'
#' Reduce genotype probabilities (as calculated by
#' [calc_genoprob()]) to allele probabilities, writing them to an fst database.
#' [qtl2::calc_genoprob()]) to allele probabilities, writing them to an fst database.
#'
#' @param probs Genotype probabilities, as calculated from
#' [calc_genoprob()].
#' [qtl2::calc_genoprob()].
#' @param fbase Base of filename for fst database.
#' @param fdir Directory for fst database.
#' @param quiet IF `FALSE`, print progress messages.
Expand Down
4 changes: 2 additions & 2 deletions man/genoprob_to_alleleprob_fst.Rd

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

0 comments on commit 21512eb

Please sign in to comment.