bugs fixes while testing for 1.5 release

[mothur.git] / pintail.cpp

diff --git a/pintail.cpp b/pintail.cpp
index 39ac13f786ad3c6e94d4b1a8252f126a23200522..74c34e18be897ecb2c7966e5a481a5fff81d76df 100644 (file)
--- 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<int, int> win = decalc->findWindows(querySeqs[i], it->first, it->second, windowSizes[i], increment);
-                               windows[i] = win;
+                               vector<int> 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<float> obsi = decalc->calcObserved(querySeqs[i], bestfit[i], windows[i], windowSizes[i]);
+                               vector<float> 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<float> q = decalc->findQav(windows[i], windowSizes[i], probabilityProfile, h[i]);
+                               vector<float> q = decalc->findQav(windowsForeachQuery[i], windowSizes[i], probabilityProfile);
                                Qav[i] = q;
                        }
                        mothurOut("Done."); mothurOutEndLine();