[med-svn] [bedtools] 02/07: Merge branch 'master' of https://github.com/arq5x/bedtools2
Andreas Tille
tille at debian.org
Mon Jul 18 12:43:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch upstream
in repository bedtools.
commit 32c26d8ddd3059c4b4f1ca42d4924b9e1185ee77
Merge: b36ce1a 2f4d319
Author: Charles Plessy <plessy at debian.org>
Date: Mon Jan 5 10:02:55 2015 +0900
Merge branch 'master' of https://github.com/arq5x/bedtools2
.gitignore | 1 +
Makefile | 8 +
README.md | 2 +-
docs/conf.py | 4 +-
docs/content/images/fisher/res-genes.png | Bin 0 -> 72950 bytes
docs/content/images/tool-glyphs/closest-glyph.png | Bin 0 -> 138680 bytes
.../content/images/tool-glyphs/genomecov-glyph.png | Bin 41644 -> 43832 bytes
docs/content/tools/closest.rst | 448 +-
docs/content/tools/fisher.rst | 94 +-
docs/content/tools/intersect.rst | 369 +-
docs/index.rst | 11 +-
src/closestFile/closestFile.cpp | 4 +
src/closestFile/closestMain.cpp | 7 +-
src/fisher/Fisher.cpp | 71 +-
src/fisher/Fisher.h | 9 +
src/fisher/Makefile | 35 +-
src/fisher/fisherMain.cpp | 11 +-
src/groupBy/groupBy.cpp | 2 +-
src/intersectFile/intersectFile.cpp | 3 +
src/intersectFile/intersectMain.cpp | 6 +-
src/jaccard/jaccardMain.cpp | 2 +-
src/mapFile/mapMain.cpp | 2 +-
src/mergeFile/mergeMain.cpp | 2 +-
src/pairToPair/pairToPair.cpp | 4 +-
src/sampleFile/sampleMain.cpp | 2 +-
src/slopBed/slopBed.cpp | 12 +-
src/tagBam/tagBam.cpp | 6 +-
src/tagBam/tagBamMain.cpp | 4 +
src/utils/BinTree/BinTree.cpp | 2 +
src/utils/Contexts/ContextBase.cpp | 117 +-
src/utils/Contexts/ContextBase.h | 23 +-
src/utils/Contexts/ContextClosest.cpp | 2 +-
src/utils/Contexts/ContextFisher.cpp | 25 +-
src/utils/Contexts/ContextFisher.h | 7 +
src/utils/Contexts/ContextIntersect.cpp | 5 +
src/utils/Contexts/ContextMerge.cpp | 14 +-
src/utils/FileRecordTools/Records/BlockMgr.cpp | 7 +-
src/utils/FileRecordTools/Records/Record.cpp | 32 +
src/utils/FileRecordTools/Records/Record.h | 4 +
src/utils/KeyListOps/KeyListOps.cpp | 29 +-
src/utils/KeyListOps/KeyListOps.h | 6 +
src/utils/NewChromsweep/CloseSweep.cpp | 209 +-
src/utils/NewChromsweep/CloseSweep.h | 14 +-
src/utils/NewChromsweep/NewChromsweep.cpp | 251 +-
src/utils/NewChromsweep/NewChromsweep.h | 44 +-
src/utils/RecordOutputMgr/RecordOutputMgr.cpp | 22 +-
src/utils/bedFile/bedFile.cpp | 18 +-
src/utils/bedFile/bedFile.h | 1 +
src/utils/general/ParseTools.h | 8 +-
src/utils/version/version_release.txt | 6 +-
src/windowMaker/windowMakerMain.cpp | 2 +-
test/closest/bug157_a.bed | 1 +
test/closest/bug157_b.bed | 2 +
test/closest/close-b.bed | 3 -
test/closest/d.bed | 1 +
test/closest/d_id.bed | 2 +
test/closest/d_iu.bed | 2 +
test/closest/sortAndNaming/alpha_all.bed | 5 +
test/closest/sortAndNaming/alpha_missing.bed | 3 +
test/closest/sortAndNaming/db1_gls.bed | 12 +
test/closest/sortAndNaming/db1_leadingZero.txt | 10 +
test/closest/sortAndNaming/db1_noChr.bed | 10 +
test/closest/sortAndNaming/db1_num.bed | 6 +
test/closest/sortAndNaming/db2_num.bed | 6 +
test/closest/sortAndNaming/db2_numBackwards.bed | 6 +
test/closest/sortAndNaming/db3_numBackwards.bed | 4 +
test/closest/sortAndNaming/num_all.bed | 5 +
test/closest/sortAndNaming/num_missing.bed | 3 +
test/closest/sortAndNaming/q1_gls.bed | 12 +
test/closest/sortAndNaming/q1_num.bed | 10 +
test/closest/sortAndNaming/q1a_num.bed | 11 +
test/closest/sortAndNaming/sdb1.bed | 2 +
test/closest/sortAndNaming/sq1.bed | 2 +
test/closest/sortAndNaming/test-sort-and-naming.sh | 320 +
test/closest/strand-test-c.bed | 2 +
test/closest/strand-test-d.bed | 2 +
test/closest/test-closest.sh | 135 +-
test/fisher/README.md | 20 +
test/fisher/a.bed | 3 +
test/fisher/b.bed | 2 +
test/fisher/cmp.sh | 9 +
test/fisher/plot.py | 46 +
test/fisher/shuf.sh | 14 +
test/fisher/sim.py | 31 +
test/fisher/t.500.genome | 1 +
test/fisher/t.60.genome | 1 +
test/fisher/test-fisher.sh | 53 +
test/groupBy/test-groupby.sh | 29 +
test/intersect/b_testZeroLen.bed | 1 -
test/intersect/bug150_a.bed | 1 +
test/intersect/bug150_b.bed | 2 +
test/intersect/new_test-intersect.sh | 9 +-
test/intersect/sortAndNaming/alpha_all.bed | 5 +
test/intersect/sortAndNaming/alpha_missing.bed | 3 +
.../sortAndNaming/bigTests/2.21_500Kvs500K.txt | 15821 +
test/intersect/sortAndNaming/bigTests/2.21_5v5.txt | 15821 +
.../intersect/sortAndNaming/bigTests/2.21_chr1.txt | 1173 +
.../sortAndNaming/bigTests/curr500Kvs500K.txt | 15575 +
test/intersect/sortAndNaming/bigTests/curr5v5.txt | 15821 +
test/intersect/sortAndNaming/bigTests/currChr1.txt | 1173 +
test/intersect/sortAndNaming/bigTests/db500K.bed | 500000 ++++++++++++++++++
test/intersect/sortAndNaming/bigTests/dbchr1.bed | 39409 ++
test/intersect/sortAndNaming/bigTests/diffs.txt | 34 +
test/intersect/sortAndNaming/bigTests/q500K.bed | 500000 ++++++++++++++++++
test/intersect/sortAndNaming/bigTests/qchr1.bed | 39544 ++
test/intersect/sortAndNaming/db1_gls.bed | 12 +
test/intersect/sortAndNaming/db1_leadingZero.txt | 10 +
test/intersect/sortAndNaming/db1_noChr.bed | 10 +
test/intersect/sortAndNaming/db1_num.bed | 6 +
test/intersect/sortAndNaming/db2_num.bed | 6 +
test/intersect/sortAndNaming/db2_numBackwards.bed | 6 +
test/intersect/sortAndNaming/db3_numBackwards.bed | 4 +
test/intersect/sortAndNaming/diffs.txt | 489 +
test/intersect/sortAndNaming/exp1 | 2 +
test/intersect/sortAndNaming/num_all.bed | 5 +
test/intersect/sortAndNaming/num_missing.bed | 3 +
test/intersect/sortAndNaming/q1_gls.bed | 12 +
test/intersect/sortAndNaming/q1_num.bed | 10 +
test/intersect/sortAndNaming/q1a_num.bed | 11 +
test/intersect/sortAndNaming/sdb1.bed | 2 +
test/intersect/sortAndNaming/sq1.bed | 2 +
.../sortAndNaming/test-sort-and-naming.sh | 315 +
test/intersect/splitBug155_a.bed | 1 +
test/intersect/splitBug155_b.bed | 1 +
test/intersect/test-intersect.sh | 52 +-
test/jaccard/d.bed | 1 -
test/jaccard/test-jaccard.sh | 11 +-
test/map/test-map.sh | 10 +-
test/merge/bamCol4Mean.txt | 14 +-
test/merge/bamCol5Mean.txt | 14 +-
test/merge/bamCol8Mean.txt | 32 +-
test/merge/bamCol9Mean.txt | 18 +-
test/merge/precisionTest2.bed | 5 +
test/merge/test-merge.sh | 40 +
test/test.sh | 3 +
tutorial/Makefile | 3 +
tutorial/answers.html | 148 +
tutorial/answers.md | 140 +
tutorial/bedtools.html | 582 +
tutorial/bedtools.md | 716 +
tutorial/bootstrap.css | 4480 +
tutorial/template.class.html | 65 +
tutorial/template.html | 75 +
143 files changed, 1153905 insertions(+), 556 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/bedtools.git
More information about the debian-med-commit
mailing list