Skip to content
Snippets Groups Projects
Commit 58a64785 authored by Aaron's avatar Aaron
Browse files

Final changes for 2.6.0

parent ffa852df
No related branches found
No related tags found
No related merge requests found
Showing
with 54 additions and 8 deletions
......@@ -11,7 +11,7 @@ export SRC_DIR = src
# define our source subdirectories
SUBDIRS = $(SRC_DIR)/bamToBed $(SRC_DIR)/closestBed $(SRC_DIR)/complementBed $(SRC_DIR)/coverageBed $(SRC_DIR)/fastaFromBed $(SRC_DIR)/genomeCoverageBed $(SRC_DIR)/intersectBed $(SRC_DIR)/linksBed $(SRC_DIR)/maskFastaFromBed $(SRC_DIR)/mergeBed $(SRC_DIR)/overlap $(SRC_DIR)/pairToBed $(SRC_DIR)/pairToPair $(SRC_DIR)/shuffleBed $(SRC_DIR)/slopBed $(SRC_DIR)/sortBed $(SRC_DIR)/subtractBed $(SRC_DIR)/windowBed
UTIL_SUBDIRS = $(SRC_DIR)/utils/lineFileUtilities $(SRC_DIR)/utils/bedFile $(SRC_DIR)/utils/bedFilePE $(SRC_DIR)/utils/sequenceUtilities $(SRC_DIR)/utils/BamTools
UTIL_SUBDIRS = $(SRC_DIR)/utils/lineFileUtilities $(SRC_DIR)/utils/bedFile $(SRC_DIR)/utils/genomeFile $(SRC_DIR)/utils/bedFilePE $(SRC_DIR)/utils/sequenceUtilities $(SRC_DIR)/utils/BamTools
all:
......
Version 2.6.0 (Mar-23-2010)
***Specific improvements / additions to tools***
1. intersectBed
* Added an option (-wo) that reports the number of overlapping bases for each intersection b/w A and B files.
-- Not sure why this wasn't added sooner; it's obvious.
2. coverageBed
* native BAM support
* can now report a histogram (-hist) of coverage for each feature in B. Useful for exome sequencing projects, for example.
-- thanks for the excellent suggestion from Jose Bras
* faster
3. genomeCoverageBed
* native BAM support
* can now report coverage in BEDGRAPH format (-bg)
-- thanks for the code and great suggestion from Gordon Assaf, CSHL.
4. bamToBed
* support for "blocked" BED (aka BED12) format. This facilitates the creation of BED entries for "split" alignments (e.g. RNAseq or SV)
-- thanks to Ann Loraine, UNCC for test data to support this addition.
5. fastaFromBed
* added the ability to extract sequences from a FASTA file according to the strand in the BED file. That is, when "-" the extracted sequence is reverse complemented.
-- thanks to Thomas Doktor, U. of Southern Denmark for the code and suggestion.
6. ***NEW*** overlap
* newly added tool for computing the overlap/distance between features on the same line.
-- For example:
$ cat test.out
chr1 10 20 A chr1 15 25 B
chr1 10 20 C chr1 25 35 D
$ cat test.out | overlaps -i stdin -cols 2,3,6,7
chr1 10 20 A chr1 15 25 B 5
chr1 10 20 C chr1 25 35 D -5
***Bug fixes***
1. Fixed a bug in pairToBed when comparing paired-end BAM alignments to BED annotations and using the "notboth" option.
2. Fixed an idiotic bug in intersectBed that occasionally caused segfaults when blank lines existed in BED files.
3. Fixed a minor bug in mergeBed when using the -nms option.
***General changes***
1. Added a proper class for genomeFiles. The code is much cleaner and the tools are less sensitive to minor problems with the formatting of genome files. Per Gordon Assaf's wise suggestion, the tools now support "chromInfo" files directly downloaded from UCSC. Thanks Gordon---I disagreed at first, but you were right.
2. Cleaned up some of the code and made the API a bit more streamlined. Will facilitate future tool development, etc.
Version 2.5.4 (Mar-3-2010)
1. Fixed an insidious bug that caused malformed BAM output from intersectBed and pairToBed. The previous BAM files worked fine with samtools as BAM input, but when piped in as SAM, there was an extra tab that thwarted conversion from SAM back to BAM. Many thanks to Ivan Gregoretti for reporting this bug. I had never used the BAM output in this way and thus never caught the bug!
1. Fixed an insidious bug that caused malform BAM output from intersectBed and pairToBed. The previous BAM files worked fine with samtools as BAM input, but when piped in as SAM, there was an extra tab that thwarted conversion from SAM back to BAM. Many thanks to Ivan Gregoretti for reporting this bug. I had never used the BAM output in this way and thus never caught the bug!
Version 2.5.3 (Feb-19-2010)
......
CXX = g++
CXXFLAGS = -O3 -Wall
LDFLAGS =
LIBFLAGS = -lc
LIBS=
UTILITIES_DIR = ../utils/
OBJ_DIR = ../../obj/
......@@ -21,7 +21,7 @@ _EXT_OBJECTS=bedFile.o genomeFile.o lineFileUtilities.o
EXT_OBJECTS=$(patsubst %,$(OBJ_DIR)/%,$(_EXT_OBJECTS))
BUILT_OBJECTS= $(patsubst %,$(OBJ_DIR)/%,$(OBJECTS))
PROGRAM= complementBed
LIBS=
all: $(PROGRAM)
......@@ -29,19 +29,19 @@ all: $(PROGRAM)
$(PROGRAM): $(BUILT_OBJECTS) $(EXT_OBJECTS)
@echo " * linking $(PROGRAM)"
@$(CXX) $(LIBFLAGS) $(CXXFLAGS) -o $(BIN_DIR)/$@ $^ $(LIBS)
@$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $(BIN_DIR)/$@ $^ $(LIBS)
$(BUILT_OBJECTS): $(SOURCES)
@echo " * compiling" $(*F).cpp
@$(CXX) -c -o $@ $(*F).cpp $(LDFLAGS) $(CXXFLAGS) $(INCLUDES)
$(EXT_OBJECTS):
@$(MAKE) --no-print-directory -C $(UTILITIES_DIR)/bedFile/
@$(MAKE) --no-print-directory -C $(UTILITIES_DIR)/genomeFile/
@$(MAKE) --no-print-directory -C $(UTILITIES_DIR)/lineFileUtilities/
@$(MAKE) --no-print-directory -C $(UTILITIES_DIR)/bedFile/
@$(MAKE) --no-print-directory -C $(UTILITIES_DIR)/genomeFile/
clean:
@echo "Cleaning up."
@rm -f $(OBJ_DIR)/* $(BIN_DIR)/*
.PHONY: clean
\ No newline at end of file
.PHONY: clean
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment