Skip to content

Commit

Permalink
typos
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesbecher committed Nov 29, 2022
1 parent f9221b0 commit 8f7db66
Show file tree
Hide file tree
Showing 33 changed files with 21 additions and 178 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ vagrantDNA/.Rproj.user*/*
.Rproj.user
vagrantDNA.Rcheck
*zarr

7 changes: 0 additions & 7 deletions vagrantDNA/.Rproj.user/7A513094/build_options

This file was deleted.

1 change: 0 additions & 1 deletion vagrantDNA/.Rproj.user/7A513094/cpp-definition-cache

This file was deleted.

5 changes: 0 additions & 5 deletions vagrantDNA/.Rproj.user/7A513094/pcs/debug-breakpoints.pper

This file was deleted.

9 changes: 0 additions & 9 deletions vagrantDNA/.Rproj.user/7A513094/pcs/files-pane.pper

This file was deleted.

3 changes: 0 additions & 3 deletions vagrantDNA/.Rproj.user/7A513094/pcs/source-pane.pper

This file was deleted.

14 changes: 0 additions & 14 deletions vagrantDNA/.Rproj.user/7A513094/pcs/windowlayoutstate.pper

This file was deleted.

5 changes: 0 additions & 5 deletions vagrantDNA/.Rproj.user/7A513094/pcs/workbench-pane.pper

This file was deleted.

5 changes: 0 additions & 5 deletions vagrantDNA/.Rproj.user/7A513094/rmd-outputs

This file was deleted.

1 change: 0 additions & 1 deletion vagrantDNA/.Rproj.user/7A513094/saved_source_markers

This file was deleted.

7 changes: 0 additions & 7 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/11029130

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/226D24EC

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/2A7477B2

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/34134B3A

This file was deleted.

7 changes: 0 additions & 7 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/3A25F4D4

This file was deleted.

4 changes: 0 additions & 4 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/4A6A260D

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/6EF926F2

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/7405AB0C

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/78A8D4E0

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/85B4FDB3

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/B16DB1CA

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/C5CE1899

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/E473D4B6

This file was deleted.

6 changes: 0 additions & 6 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/EAFBB325

This file was deleted.

17 changes: 0 additions & 17 deletions vagrantDNA/.Rproj.user/7A513094/sources/prop/INDEX

This file was deleted.

Empty file.
11 changes: 0 additions & 11 deletions vagrantDNA/.Rproj.user/shared/notebooks/paths

This file was deleted.

2 changes: 1 addition & 1 deletion vagrantDNA/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: vagrantDNA
Type: Package
Title: Estimating the proportion of vagrant DNA in a genome
Version: 1.1.0
Version: 1.1.1
Author: Richard Nichols and Hannes Becher
Maintainer: The package maintainer <[email protected]>
Description: The package two functions rainbowPlot and divEst. They produce two different estimates of the proportion of DNA from a particular vagrant genome. They exploit low coverge data from multiple individuals in which the vagrant DNA has taken residence (see Becher and Nichols 2022).
Expand Down
15 changes: 8 additions & 7 deletions vagrantDNA/R/Rainbow_Plot.R
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@
#' ## plot and printout (by default) the results of running rainbowPlot on the parrot data.
#' rainbowPlot(parrotDF, seed = 12345, title = "Parrot")
#' ##
#' ## plot without printing the results and store results in res1.
#' res1 <- rainbowPlot(parrotDF, seed = 12345, printout = FALSE, title = "Parrot")
#' ## print just the stored estimates (the first two elements of the list)
#' print(res1[1:2])
#' ## Inspect the residuals of the lmer model
#' plot(res1$lmer.model)
#' ## plot without printing the results and store results in parrotFit
#' parrotFit <- rainbowPlot(parrotDF, seed = 12345, printout = FALSE, title = "Parrot")
#' ## Inspect relationship between intercepts and SNP location
#' interceptPositionPlot(parrotFit)
#' ## Inspect mapping depth of nuclear insert allele across samples
#' selAllPlot(parrotDF, parrotFit)
#'
#' @export
rainbowPlot <- function(data,
nloci = 400,
Expand Down Expand Up @@ -322,7 +323,7 @@ rainbowPlot <- function(data,
if (printout) {
cat('Intercept based on ', numgoodloci, 'SNP loci \n')
cat('Estimate: ', signif(intercepts[1],3), '\n')
cat('Confindence Interval: ',
cat('Confidence Interval: ',
signif(intercepts[2],3),
'-',
signif(intercepts[3],3),
Expand Down
4 changes: 3 additions & 1 deletion vagrantDNA/R/selAllPlot.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,23 @@
#' selAllPlot(humanDF) # overall alt allele counts
#' selAllPlot(humanDF, humanFit) # alt allele count at loci selected for fit
#' }
selAllPlot <- function(dd,ff,ylim=c(0, 10),...){
selAllPlot <- function(dd,ff,ylim=c(0, 10),ylab="Allele count",...){
if(hasArg(ff)){
posString <- rownames(coef(summary(ff$lmer.model)))
sites <- substr(posString, 9, 20)
pDat <- dd[dd$Position %in% sites,]
boxplot(pDat$DP * exp(pDat$ylog) ~ pDat$Sample,
main="Alt. allele count at selected loci",
ylim=ylim,
ylab=ylab,
...)
goodDatMeds <- round(as.numeric(tapply(pDat$DP * exp(pDat$ylog), pDat$Sample, function(x) boxplot.stats(x)$stats[3])))
if(sum(goodDatMeds < 2) > length(goodDatMeds)/2) warning("The majority of individuals have a median alternate allele depth of 1. This suggests that vagrant DNA proportion or the sequencing depth may be insufficient for an accurate estimate. Consider using more WGS data if possible.")
} else {
boxplot(dd$DP * exp(dd$ylog) ~ dd$Sample,
main="Alt. allele count at all loci",
ylim=ylim,
ylab=ylab,
...)
cat("Plot shows alt allels counts for all loci. Supply rainbowPlot object to show only selected loci.\n")
goodDatMeds <- round(as.numeric(tapply(dd$DP * exp(dd$ylog), dd$Sample, function(x) boxplot.stats(x)$stats[3])))
Expand Down
13 changes: 7 additions & 6 deletions vagrantDNA/man/rainbowPlot.Rd

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

2 changes: 1 addition & 1 deletion vagrantDNA/man/selAllPlot.Rd

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

Binary file renamed vagrantDNA_1.1.0.tar.gz → vagrantDNA_1.1.1.tar.gz
Binary file not shown.

0 comments on commit 8f7db66

Please sign in to comment.