Skip to content

Commit

Permalink
Get run_rqtl and run_gemma working again
Browse files Browse the repository at this point in the history
  • Loading branch information
kbroman committed Oct 25, 2022
1 parent e7d3190 commit b94ce67
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 9 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: GNapi
Version: 0.3-6
Date: 2022-09-26
Version: 0.3-7
Date: 2022-10-25
Title: Connection to the GeneNetwork API
Description: Tools for connecting to the GeneNetwork API.
Author: Karl W Broman [aut, cre] (<https://orcid.org/0000-0002-4914-6671>)
Expand Down
21 changes: 21 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
## GNapi 0.3-7 (2022-10-25)

### Bug fixes

- `run_gemma()` and `run_rqtl()` are working again.

- Trapped additional errors by looking for `Error:` in title of
output. (in new internal function `error_in_title()`)


## GNapi 0.3-6 (2022-09-26)

### Bug fixes

- `get_geno()` is working again

- `info_pheno()` can no longer get a list of traits within a group

- `list_groups()` no longer takes an individual group name


## GNapi 0.3-4 (2021-11-17)

### Bug fixes
Expand Down
8 changes: 4 additions & 4 deletions R/run_stuff.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#' @export
#'
#' @examples
#' \dontrun{out <- run_gemma("BXDPublish", "10015")}
#' out <- run_gemma("HC_M2_0606_P", "1418701_at")
run_gemma <-
function(dataset, trait, use_loco=FALSE, maf=0.01, url=gnapi_url())
{
Expand All @@ -30,7 +30,7 @@ run_gemma <-
"&maf=", maf),
url=url, output="parsed")

list2df(result)
list2df(result[[1]]) # not sure why we need the [[1]]
}


Expand All @@ -43,7 +43,7 @@ run_gemma <-
#' @param method Indicates whether to use the EM algorithm, imputation, Haley-Knott regression, the extended Haley-Knott method, or marker regression.
#' @param model The phenotype model: the usual normal model, a model for binary traits, a two-part model, or non-parametric analysis
#' @param n_perm Number of permutations
#' @param control_marker Name of marker to use as control
#' @param control_marker Name of marker to use as a covariate
#' @param interval_mapping Whether to use interval mapping
#' @param url The URL for the GeneNetwork API
#'
Expand All @@ -53,7 +53,7 @@ run_gemma <-
#' @export
#'
#' @examples
#' \dontrun{out <- run_rqtl("BXDPublish", "10015")}
#' out <- run_rqtl("HC_M2_0606_P", "1418701_at")
run_rqtl <-
function(dataset, trait, method=c("hk", "ehk", "em", "imp", "mr", "mr-imp", "mr-argmax"),
model=c("normal", "binary", "2part", "np"),
Expand Down
2 changes: 1 addition & 1 deletion man/run_gemma.Rd

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

4 changes: 2 additions & 2 deletions man/run_rqtl.Rd

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

0 comments on commit b94ce67

Please sign in to comment.