Skip to content

Commit

Permalink
Merge branch 'new_io'
Browse files Browse the repository at this point in the history
Conflicts:
	src/Makefile
	src/io.cpp
	src/io.h
	src/main.cpp
	src/threads.h
	src/vntr.cpp
	src/vntr.h
  • Loading branch information
mchaisso committed Sep 19, 2023
2 parents e36449c + af091c6 commit b9c9cdf
Show file tree
Hide file tree
Showing 13 changed files with 504 additions and 331 deletions.
2 changes: 1 addition & 1 deletion src/bounded_anno_local.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static int scoring(vector<MOTIF> &motifs, vector<int> &matches, int top, double


void string_decomposer(vector<uint8_t> &optMotifs, vector<int> &motifQV, vector<int> &starts, vector<int> &ends,
vector<vector<int> > &motifNMatches, vector<MOTIF> &motifs, char *vntr, int N, const OPTION &opt,
vector<vector<int> > &motifNMatches, vector<MOTIF> &motifs, const char *vntr, int N, const OPTION &opt,
SDTables &sdTables, vector<int > &mismatchCI)
{

Expand Down
Loading

0 comments on commit b9c9cdf

Please sign in to comment.