X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=pintail.cpp;h=74c34e18be897ecb2c7966e5a481a5fff81d76df;hb=ac1da2a793271cb67f2a2155c5558e1fabdd6aba;hp=39ac13f786ad3c6e94d4b1a8252f126a23200522;hpb=fe346922fe0af5b1a025beacb211078d37598fd4;p=mothur.git diff --git a/pintail.cpp b/pintail.cpp index 39ac13f..74c34e1 100644 --- a/pintail.cpp +++ b/pintail.cpp @@ -593,8 +593,8 @@ void Pintail::createProcessesSpots() { for (int i = lines[0]->start; i < lines[0]->end; i++) { it = trimmed[i].begin(); - map win = decalc->findWindows(querySeqs[i], it->first, it->second, windowSizes[i], increment); - windows[i] = win; + vector win = decalc->findWindows(querySeqs[i], it->first, it->second, windowSizes[i], increment); + windowsForeachQuery[i] = win; } #endif @@ -852,7 +852,7 @@ void Pintail::createProcesses() { #else mothurOut("Calculating observed distance... "); cout.flush(); for (int i = lines[0]->start; i < lines[0]->end; i++) { - vector obsi = decalc->calcObserved(querySeqs[i], bestfit[i], windows[i], windowSizes[i]); + vector obsi = decalc->calcObserved(querySeqs[i], bestfit[i], windowsForeachQuery[i], windowSizes[i]); obsDistance[i] = obsi; } mothurOut("Done."); mothurOutEndLine(); @@ -861,7 +861,7 @@ void Pintail::createProcesses() { mothurOut("Finding variability... "); cout.flush(); for (int i = lines[0]->start; i < lines[0]->end; i++) { - vector q = decalc->findQav(windows[i], windowSizes[i], probabilityProfile, h[i]); + vector q = decalc->findQav(windowsForeachQuery[i], windowSizes[i], probabilityProfile); Qav[i] = q; } mothurOut("Done."); mothurOutEndLine();