diff --git a/Makefile b/Makefile index 9393e69f5b4e92edce8d47c47508a95b5b8d6b0a..9d2790030b2dd9490851f42b0e0f91b73d5dd3a5 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ SUBDIRS = $(SRC_DIR)/annotateBed \ $(SRC_DIR)/complementBed \ $(SRC_DIR)/coverageBed \ $(SRC_DIR)/fastaFromBed \ + $(SRC_DIR)/fjoin \ $(SRC_DIR)/genomeCoverageBed \ $(SRC_DIR)/groupBy \ $(SRC_DIR)/intersectBed \ diff --git a/src/utils/bedFile/bedFile.h b/src/utils/bedFile/bedFile.h index d9cc9c15ea9dc27e68b8d09537a372d92f6a5b17..972b6e18100cac73f31137a4f72ae2e43ac24851 100644 --- a/src/utils/bedFile/bedFile.h +++ b/src/utils/bedFile/bedFile.h @@ -89,6 +89,12 @@ struct BED { // Add'l fields for BED12 and/or custom BED annotations vector<string> otherFields; + + // experimental fields for the FJOIN approach. + bool added; + bool finished; + // list of hits from another file. + vector<BED> overlaps; public: // constructors @@ -101,7 +107,10 @@ public: name(""), score(""), strand(""), - otherFields() + otherFields(), + added(false), + finished(false), + overlaps() {} // BED3 @@ -141,10 +150,10 @@ public: strand(strand), otherFields(otherFields) {} + }; // BED - /* Structure for regular BED COVERAGE records */