Skip to content

Commit

Permalink
**v.0.4.6**
Browse files Browse the repository at this point in the history
* I'm pleased to announce that `stackr` parallel mode now works with **Windows**!
Nothing to install, just need to choose the number of CPU,
the rest is done automatically.
* `haplo2colony` is deprecated. Use the new function called `write_colony`!
* `write_colony`: works similarly to the deprecated function `haplo2colony`,
      * with the major advantage that it's no longer restricted to STACKS
      haplotypes file.
      * The function is using the `tidy_genomic_data` module
      to import files. So you can choose one of the 10 input file formats supported
      by `stackr`!
      * other benefits also include the possibility to efficiently test MAF,
      snp.ld, haplotypes/snp approach, whitelist of markes,
      blacklist of individuals, blacklist of genotypes, etc. with the buit-it
      arguments.
      * the function only **keeps markers in common** between populations/groups
      and **is removing monomorphic markers**.
      * **Note:** there are several *defaults* in the function and
      it's a complicated file format, so make sure to read the function
      documentation, please, and `COLONY` manual.
  • Loading branch information
thierrygosselin committed Nov 29, 2016
1 parent d423cd0 commit 8c36f47
Show file tree
Hide file tree
Showing 8 changed files with 1,018 additions and 11 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: stackr
Type: Package
Title: GBS/RADseq Data Exploration, Manipulation and Visualization using R
Version: 0.4.5
Date: 2016-11-18
Version: 0.4.6
Date: 2016-11-29
Encoding: UTF-8
Authors@R: c(
person("Thierry", "Gosselin", email = "thierrygosselin@icloud.com", role = c("aut", "cre")),
Expand Down
11 changes: 8 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export(filter_snp_number)
export(fis_summary)
export(genomic_converter)
export(genotypes_summary)
export(haplo2colony)
export(ibdg_fh)
export(individuals2strata)
export(keep_common_markers)
Expand Down Expand Up @@ -79,6 +78,7 @@ export(whitelist_loci_snp)
export(whitelist_snp_vcf)
export(write_arlequin)
export(write_betadiv)
export(write_colony)
export(write_genepop)
export(write_genind)
export(write_genlight)
Expand All @@ -90,10 +90,8 @@ export(write_vcf)
import(adegenet)
import(dplyr)
import(ggplot2)
import(lazyeval)
import(parallel)
import(readr)
import(reshape2)
import(strataG)
import(stringi)
importFrom(adegenet,chromosome)
Expand All @@ -116,6 +114,7 @@ importFrom(dplyr,bind_cols)
importFrom(dplyr,bind_rows)
importFrom(dplyr,coalesce)
importFrom(dplyr,contains)
importFrom(dplyr,count)
importFrom(dplyr,distinct)
importFrom(dplyr,filter)
importFrom(dplyr,filter_)
Expand Down Expand Up @@ -144,8 +143,12 @@ importFrom(dplyr,ungroup)
importFrom(lazyeval,interp)
importFrom(magrittr,"%>%")
importFrom(methods,new)
importFrom(parallel,clusterExport)
importFrom(parallel,detectCores)
importFrom(parallel,makeCluster)
importFrom(parallel,mclapply)
importFrom(parallel,parLapply)
importFrom(parallel,stopCluster)
importFrom(purrr,detect_index)
importFrom(purrr,discard)
importFrom(purrr,flatten)
Expand All @@ -158,6 +161,7 @@ importFrom(readr,read_delim)
importFrom(readr,read_lines)
importFrom(readr,read_tsv)
importFrom(readr,write_delim)
importFrom(readr,write_file)
importFrom(readr,write_tsv)
importFrom(reshape2,dcast)
importFrom(reshape2,melt)
Expand Down Expand Up @@ -202,6 +206,7 @@ importFrom(tidyr,unite_)
importFrom(utils,combn)
importFrom(utils,count.fields)
importFrom(utils,packageVersion)
importFrom(utils,sessionInfo)
importFrom(utils,write.table)
importFrom(vcfR,extract.gt)
importFrom(vcfR,read.vcfR)
Expand Down
Binary file modified R/.DS_Store
Binary file not shown.
Loading

0 comments on commit 8c36f47

Please sign in to comment.