X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aligncommand.h;fp=aligncommand.h;h=4a5eb11bf320a500ddfca34f0504130637fda0f0;hb=55386dddad84cc1140d736cabaf4dd0ae16f2e01;hp=193eeacae57c5bb62deb844bac610b40437d14a2;hpb=990ded2eb38078a417fa00b4fbb4d3c24f4b5046;p=mothur.git diff --git a/aligncommand.h b/aligncommand.h index 193eeac..4a5eb11 100644 --- a/aligncommand.h +++ b/aligncommand.h @@ -91,10 +91,10 @@ typedef struct alignData { MothurOut* m; //AlignmentDB* templateDB; float match, misMatch, gapOpen, gapExtend, threshold; - int count, kmerSize; + int count, kmerSize, threadID; alignData(){} - alignData(string a, string r, string ac, string f, string al, string se, int ks, MothurOut* mout, unsigned long int st, unsigned long int en, bool fl, float ma, float misMa, float gapO, float gapE, float thr) { + alignData(string a, string r, string ac, string f, string al, string se, int ks, MothurOut* mout, unsigned long int st, unsigned long int en, bool fl, float ma, float misMa, float gapO, float gapE, float thr, int tid) { alignFName = a; reportFName = r; accnosFName = ac; @@ -113,6 +113,7 @@ typedef struct alignData { search = se; count = 0; kmerSize = ks; + threadID = tid; } }; @@ -144,7 +145,7 @@ static DWORD WINAPI MyAlignThreadFunction(LPVOID lpParam){ pDataArray->count = pDataArray->end; - AlignmentDB* templateDB = new AlignmentDB("saved-silent", pDataArray->search, pDataArray->kmerSize, pDataArray->gapOpen, pDataArray->gapExtend, pDataArray->match, pDataArray->misMatch); + AlignmentDB* templateDB = new AlignmentDB("saved-silent", pDataArray->search, pDataArray->kmerSize, pDataArray->gapOpen, pDataArray->gapExtend, pDataArray->match, pDataArray->misMatch, pDataArray->threadID); //moved this into driver to avoid deep copies in windows paralellized version Alignment* alignment;