[med-svn] [mhap] 07/09: Merge tag 'upstream/2.0+dfsg'

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif pushed a commit to branch master
in repository mhap.

commit 183349e91fecba06e7fa6ce9a84314cf81ec4360
Merge: bbe9c20 a4d148f
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Thu Mar 24 21:54:40 2016 -0700

    Merge tag 'upstream/2.0+dfsg'
    
    Upstream version 2.0+dfsg

 README.md                                          |   25 +-
 build.xml                                          |  377 ---
 docs/source/conf.py                                |    4 +-
 docs/source/contact.rst                            |    2 +-
 docs/source/index.rst                              |    2 +-
 docs/source/installation.rst                       |   32 +-
 docs/source/quickstart.rst                         |   52 +-
 docs/source/utilities.rst                          |   20 +-
 pom.xml                                            |  137 +
 .../marbl/mhap/align/AlignElementDoubleSketch.java |    5 +-
 .../java/edu/umd/marbl/mhap/align/Aligner.java     |   43 +-
 .../java/edu/umd/marbl/mhap/impl/FastaData.java    |   74 +-
 .../java/edu/umd/marbl/mhap/impl/MatchResult.java  |    2 +-
 .../mhap/impl/MinHashBitSequenceSubSketches.java   |  103 +-
 .../edu/umd/marbl/mhap/impl/MinHashSearch.java     |   25 +-
 .../java/edu/umd/marbl/mhap/impl/OverlapInfo.java  |   15 +-
 .../java/edu/umd/marbl/mhap/impl/SequenceId.java   |   14 +-
 .../edu/umd/marbl/mhap/impl/SequenceSketch.java    |   82 +-
 .../marbl/mhap/impl/SequenceSketchStreamer.java    |   10 +-
 .../java/edu/umd/marbl/mhap/main/AlignmentTry.java |    7 +-
 .../java/edu/umd/marbl/mhap/main/EstimateROC.java  |  128 +-
 .../edu/umd/marbl/mhap/main/KmerStatSimulator.java |   10 +
 .../java/edu/umd/marbl/mhap/main/MhapMain.java     |  151 +-
 .../java/edu/umd/marbl/mhap/math/BasicMath.java    |   10 +-
 .../java/edu/umd/marbl/mhap/math/FastMath.java     | 3379 --------------------
 .../umd/marbl/mhap/sketch/AbstractBitSketch.java   |    2 +-
 .../java/edu/umd/marbl/mhap/sketch/BottomHash.java |   72 +
 .../java/edu/umd/marbl/mhap/sketch/CountMin.java   |   20 -
 .../umd/marbl/mhap/sketch/OrderedNGramHashes.java  |  747 +++--
 ...NGramHashes.java => OrderedNGramHashesOld.java} |   12 +-
 .../edu/umd/marbl/mhap/utils/CharacterHash.java    |   51 -
 .../java/edu/umd/marbl/mhap/utils/CyclicHash.java  |   72 -
 .../java/edu/umd/marbl/mhap/utils/PackageInfo.java |   87 -
 .../edu/umd/marbl/mhap/utils/ParseOptions.java     |    2 +-
 34 files changed, 1013 insertions(+), 4761 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mhap.git