From f7b193980410efc34ca356415e72e0e4b55e349a Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Tue, 11 Jun 2013 16:51:07 -0400 Subject: updated changelog --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 002b265..f78483e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,3 +15,5 @@ Current Development Branch - Fixed a overflow bug in quikr_train - added native gzip decoding for quikr and multifasta_to_otu - documentation fixes +- use int64_t for NNLS to avoid overflow issues +- use long for multifasta/quikr to avoid overflow issues -- cgit v1.2.3 From fff49b63c7b2fc39dfaf1bd450e130df56c95e2b Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Tue, 11 Jun 2013 16:51:55 -0400 Subject: make documentation more consistent --- README.markdown | 1 - doc/install.markdown | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.markdown b/README.markdown index d56c1ac..fa7f44f 100644 --- a/README.markdown +++ b/README.markdown @@ -25,7 +25,6 @@ line utility, but we also provide python and matlab scripts. For issues with the quikr software, contact gailro@gmail.com ## License ## - The Quikr project is released under the GPL-3 License. Please view the [LICENSE](LICENSE) file for more details. diff --git a/doc/install.markdown b/doc/install.markdown index 543b8c4..61112e6 100644 --- a/doc/install.markdown +++ b/doc/install.markdown @@ -5,10 +5,10 @@ To use Quikr there are several prerequisites. + Mac OS X 10.6.8 or GNU/Linux + 4Gb of RAM minimum. Absolutely neccessary. + gcc that supports OpenMP -+ mlton, the ML compile ++ mlton the Standard-ML compiler ### Python Requirements ### -+ Python 2.7 ++ Python 2.7+ + Scipy + Numpy + BioPython @@ -16,7 +16,7 @@ To use Quikr there are several prerequisites. ### Mac Requirements ### + Mac OS X 10.6.8 (what we have tested) + GCC 4.7 or newer. (gcc 4.2 did not work, and is the default installation) -+ OCaml compiler mlton ++ mlton the Standard-ML compiler + OpenMP libraries (libgomp, usually comes with gcc) ### Linux Requirements ### -- cgit v1.2.3