X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=shhhercommand.cpp;h=8ae76d9836c31b0d3a37ac41d58a6aa54db6e859;hb=2c97dd48b8e27ee0a6a86c7a082f4c504c3357c6;hp=08bb017a4d025113c7317167e3eb6217fa57638d;hpb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;p=mothur.git diff --git a/shhhercommand.cpp b/shhhercommand.cpp index 08bb017..8ae76d9 100644 --- a/shhhercommand.cpp +++ b/shhhercommand.cpp @@ -938,6 +938,8 @@ void ShhherCommand::initPyroCluster(){ try{ if (numOTUs < processors) { processors = 1; } + if (m->debug) { m->mothurOut("[DEBUG]: numSeqs = " + toString(numSeqs) + " numOTUS = " + toString(numOTUs) + " about to alloc a dist vector with size = " + toString((numSeqs * numOTUs)) + ".\n"); } + dist.assign(numSeqs * numOTUs, 0); change.assign(numOTUs, 1); centroids.assign(numOTUs, -1); @@ -947,6 +949,8 @@ void ShhherCommand::initPyroCluster(){ nSeqsBreaks.assign(processors+1, 0); nOTUsBreaks.assign(processors+1, 0); + if (m->debug) { m->mothurOut("[DEBUG]: made it through the memory allocation.\n"); } + nSeqsBreaks[0] = 0; for(int i=0;i filenames, string thisCompositeFASTAFil vector uniqueLengths; int numFlowCells; + if (m->debug) { m->mothurOut("[DEBUG]: About to read flowgrams.\n"); } int numSeqs = getFlowData(flowFileName, seqNameVector, lengths, flowDataIntI, nameMap, numFlowCells); if (m->control_pressed) { break; } @@ -2193,6 +2198,8 @@ int ShhherCommand::driver(vector filenames, string thisCompositeFASTAFil vector nSeqsBreaks; vector nOTUsBreaks; + if (m->debug) { m->mothurOut("[DEBUG]: numSeqs = " + toString(numSeqs) + " numOTUS = " + toString(numOTUs) + " about to alloc a dist vector with size = " + toString((numSeqs * numOTUs)) + ".\n"); } + dist.assign(numSeqs * numOTUs, 0); change.assign(numOTUs, 1); centroids.assign(numOTUs, -1); @@ -2206,6 +2213,8 @@ int ShhherCommand::driver(vector filenames, string thisCompositeFASTAFil nSeqsBreaks[1] = numSeqs; nOTUsBreaks[1] = numOTUs; + if (m->debug) { m->mothurOut("[DEBUG]: done allocating memory, about to denoise.\n"); } + if (m->control_pressed) { break; } double maxDelta = 0; @@ -2336,17 +2345,21 @@ int ShhherCommand::getFlowData(string filename, vector& thisSeqNameVecto thisNameMap.clear(); flowFile >> numFlowCells; + if (m->debug) { m->mothurOut("[DEBUG]: numFlowCells = " + toString(numFlowCells) + ".\n"); } int index = 0;//pcluster while(!flowFile.eof()){ if (m->control_pressed) { break; } flowFile >> seqName >> currentNumFlowCells; + thisLengths.push_back(currentNumFlowCells); thisSeqNameVector.push_back(seqName); thisNameMap[seqName] = index++;//pcluster - + + if (m->debug) { m->mothurOut("[DEBUG]: seqName = " + seqName + " length = " + toString(currentNumFlowCells) + " index = " + toString(index) + "\n"); } + for(int i=0;i> intensity; if(intensity > 9.99) { intensity = 9.99; } @@ -2634,6 +2647,8 @@ int ShhherCommand::getOTUData(int numSeqs, string fileName, vector& otuDat listFile >> label >> numOTUs; + if (m->debug) { m->mothurOut("[DEBUG]: Getting OTU Data...\n"); } + otuData.assign(numSeqs, 0); cumNumSeqs.assign(numOTUs, 0); nSeqsPerOTU.assign(numOTUs, 0); @@ -2648,6 +2663,7 @@ int ShhherCommand::getOTUData(int numSeqs, string fileName, vector& otuDat for(int i=0;icontrol_pressed) { break; } + if (m->debug) { m->mothurOut("[DEBUG]: processing OTU " + toString(i) + ".\n"); } listFile >> singleOTU;