Skip to content

Commit c86b102

Browse files
authored
Merge pull request #241 from kbroman/cran
Add plot_ci; bump version for CRAN
2 parents b8c2a8e + 5dbc4d1 commit c86b102

7 files changed

Lines changed: 18 additions & 10 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: qtl2
2-
Version: 0.39-4
2+
Version: 0.40
33
Date: 2026-05-04
44
Title: Quantitative Trait Locus Mapping in Experimental Crosses
55
Description: Provides a set of tools to perform quantitative

NEWS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## qtl2 0.39-4 (2026-05-04)
1+
## qtl2 0.40 (2026-05-04)
22

33
### New features
44

@@ -7,15 +7,15 @@
77

88
### Minor changes
99

10-
- In `src/matrix.cpp`, change `Rf_error()` to `Rcpp:stop()`. Issue #239
10+
- In `src/matrix.cpp`, change `Rf_error()` to `Rcpp:stop()`. (Issue #239)
1111

1212
- Fixed a mistake in the documentation for `est_herit()` and
1313
`scan1()`. The model we use has covariance matrix
1414
sigma^2 [h^2 (2K) + (1-h^2)I] where K is the kinship matrix, I is
1515
the identity matrix, h^2 is the residual heritability, and sigma^2
1616
is the residual SD.
1717

18-
- Export dim.calc_genoprob and dimnames.calc_genoprob to avoid some
18+
- Export `dim.calc_genoprob` and `dimnames.calc_genoprob` to avoid some
1919
warnings.
2020

2121
- Small tweaks to tests of scan1coef with kinship matrix, to avoid

R/fit1.R

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@
113113
#' # fit QTL model just at that position
114114
#' out_fit1 <- fit1(pr_max, pheno, addcovar=covar)
115115
#'
116-
#' @seealso [pull_genoprobpos()], [find_marker()]
116+
#' # plot estimated effects
117+
#' plot_ci(out_fit1$coef[1:3], out_fit1$SE[1:3],
118+
#' xlab="Genotype", ylab="QTL effects")
119+
#'
120+
#' @seealso [pull_genoprobpos()], [find_marker()], [plot_ci()]
117121
#'
118122
#' @importFrom stats setNames
119123
#' @export

R/qtl2_grayplot.R renamed to R/grayplot.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# grayplot
1+
# grayplot (internal function taken from github.com/kbroman/broman)
22
#
33
# Scatterplot with a gray background
44
#

R/plot_ci.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# plot_ci
1+
# plot_ci (taken from broman::ciplot)
22
#'
33
#' Effect plot with multiple CIs for different groups
44
#'
@@ -43,7 +43,7 @@
4343
#' plot_ci(out_fit1$coef[1:3], out_fit1$SE[1:3],
4444
#' xlab="Genotype chr 9 @ 56.6 cM", ylab="Spleen phenotype")
4545
#'
46-
#' @seealso [plot_coef()], [plot_pxg()]
46+
#' @seealso [plot_coef()], [plot_pxg()], [fit1()], [pull_genoprobpos()]
4747
#'
4848
#' @keywords
4949
#' graphics

man/fit1.Rd

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/plot_ci.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)