aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMuriithi Frederick Muriuki2021-08-31 06:58:42 +0300
committerMuriithi Frederick Muriuki2021-08-31 06:58:42 +0300
commit750eff22f33fc8c78d529702369446e3acbdcae6 (patch)
tree1cd0cdaf732a4508feb2405bb0c8fa8d22b66e6c /scripts
parent6c872943597f3664cca77abbdf56f074fc5231e6 (diff)
parent2cf220a11936125f059dc9b6a494d0f70eac068d (diff)
downloadgenenetwork3-750eff22f33fc8c78d529702369446e3acbdcae6.tar.gz
Merge branch 'main' of github.com:genenetwork/genenetwork3 into heatmap_generation
Diffstat (limited to 'scripts')
-rw-r--r--scripts/rqtl_wrapper.R10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rqtl_wrapper.R b/scripts/rqtl_wrapper.R
index f7e0406..7518175 100644
--- a/scripts/rqtl_wrapper.R
+++ b/scripts/rqtl_wrapper.R
@@ -167,7 +167,7 @@ if (!is.null(opt$addcovar)) {
if (!is.null(opt$pstrata)) {
covar_names = trait_names[3:length(trait_names) - 1]
} else {
- covar_names = trait_names[3:length(trait_names)]
+ covar_names = trait_names[2:length(trait_names)]
}
covars <- pull.pheno(cross_object, covar_names)
}
@@ -195,18 +195,18 @@ if (opt$nperm > 0) {
if (!is.null(opt$addcovar) || !is.null(opt$control)){
if (!is.null(opt$pstrata)) {
- verbose_print('Running permutations with cofactors and strata\n')
+ verbose_print('Running ', opt$nperm, ' permutations with cofactors and strata\n')
perm_results = scanone(cross_object, pheno.col=1, addcovar=covars, n.perm=opt$nperm, perm.strata=perm_strata, model=opt$model, method=opt$method)
} else {
- verbose_print('Running permutations with cofactors\n')
+ verbose_print('Running ', opt$nperm, ' permutations with cofactors\n')
perm_results = scanone(cross_object, pheno.col=1, addcovar=covars, n.perm=opt$nperm, model=opt$model, method=opt$method)
}
} else {
if (!is.null(opt$pstrata)) {
- verbose_print('Running permutations with strata\n')
+ verbose_print('Running ', opt$nperm, ' permutations with strata\n')
perm_results = scanone(cross_object, pheno.col=1, n.perm=opt$nperm, perm.strata=perm_strata, model=opt$model, method=opt$method)
} else {
- verbose_print('Running permutations\n')
+ verbose_print('Running ', opt$nperm, ' permutations\n')
perm_results = scanone(cross_object, pheno.col=1, n.perm=opt$nperm, model=opt$model, method=opt$method)
}
}