Skip to content

Commit

Permalink
new version v.0.2.0 introducing assignment_mixture for mixture assign…
Browse files Browse the repository at this point in the history
…ment analysis
  • Loading branch information
thierrygosselin committed Apr 5, 2016
1 parent cd0cd8a commit 471da32
Show file tree
Hide file tree
Showing 7 changed files with 3,523 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: assigner
Type: Package
Title: Assignment Analysis with GBS/RADseq Data using R
Version: 0.1.9
Date: 2015-03-04
Version: 0.2.0
Date: 2015-04-06
Encoding: UTF-8
Authors@R: c(
person("Thierry", "Gosselin", email = "thierrygosselin@icloud.com", role = c("aut", "cre")))
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generated by roxygen2: do not edit by hand

export(assignment_genodive)
export(assignment_mixture)
export(assignment_ngs)
export(dlr)
export(gsi_sim_binary)
Expand Down
3,159 changes: 3,159 additions & 0 deletions R/assignment_mixture.R

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions R/assignment_ngs.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Write a gsi_sim file from STACKS VCF file

#' @name assignment_ngs
#' @title Assignment analysis in gsi_sim with GBS/RADseq data produced by STACKS workflow
#' @title Assignment analysis of next-generation sequencing data (GBS/RADseq,
#' SNP chip, etc) using gsi_sim and adegenet.
#' @description \code{gsi_sim} is a tool for doing and simulating genetic stock
#' identification and developed by Eric C. Anderson.
#' The arguments in the \code{assignment_ngs} function were tailored for the
Expand Down Expand Up @@ -230,7 +231,7 @@
#' Things are set up so that it will try running gsi_sim, and if it does not find it, the
#' program will throw an error and ask the user to run \code{\link{install_gsi_sim}}
#' which will do its best to put a usable copy of gsi_sim where it is needed. To do
#' so, you must be connected to the internet. If that doesn't work, you will
#' so, you must be connected to the internet. If that doesn't work, you will
#' need to compile the program yourself, or get it yourself, and the manually copy
#' it to \code{file.path(system.file(package = "assigner"), "bin", "gsi_sim")}.
#' To compile gsi_sim, follow the
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ The Amazon image can be imported into Google Cloud Compute Engine to start a new

## New

**v.0.2.0**
* new function: `assignment_mixture` for mixture analysis.

**v.0.1.9**
* Simplified gsi_sim install

**v.0.1.8**
* You can now opt between [gsi_sim] (https://github.com/eriqande/gsi_sim) or [adegenet] (https://github.com/thibautjombart/adegenet), a R package developed by Thibaul Jombart, to conduct the assignment analysis

Expand Down
349 changes: 349 additions & 0 deletions man/assignment_mixture.Rd

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions man/assignment_ngs.Rd

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

0 comments on commit 471da32

Please sign in to comment.