Merge branch 'master' of https://github.com/lvclark/polysat

lvclark · Mar 4, 2019 · fe409dc · fe409dc
2 parents 0974735 + 32a94ec
commit fe409dc
Show file tree

Hide file tree

Showing 5 changed files with 561 additions and 529 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: polysat
 Version: 1.7-4
-Date: 2018-06-22
+Date: 2019-03-03
 Title: Tools for Polyploid Microsatellite Analysis
 Authors@R: c(person("Lindsay V.", "Clark", email = "lvclark@illinois.edu", role = c("aut", "cre"),
                     comment = c(ORCID = "0000-0002-3881-9252")),

diff --git a/NEWS b/NEWS
@@ -1,7 +1,19 @@
 Changes in version 1.7-4
 
 A "show" method has been added for "genambig" so that datasets print to
-the console in a more sensible manner.
+the console in a more sensible manner.  Tyler Smith authored this method and
+has been added as a contributor.
+
+write.Structure now writes files that can be read directly by Structure without
+modification.  write.SPAGeDi no longer writes a temporary file to the working
+directory (tempdir() is used instead).
+
+A bug has been fixed in meandistance.matrix2 (via genotypeProbs) that caused
+errors when ploidy was equal to zero, which is a possible outcome of
+recodeAllopoly.
+
+Alistair Hall has been added as a contributor for coauthoring the SAS code
+used by deSilvaFreq.
 
 Changes in version 1.7-3