small bug with trimming of quality scores over a window. lost last base if sequence...

[mothur.git] / qualityscores.cpp

diff --git a/qualityscores.cpp b/qualityscores.cpp
index 719bf3dc6c44cd3880ebc8b1c4d3dc352a448ee1..ae85d86199c3ce9fbec09aac5525b17db3c4297a 100644 (file)
--- a/qualityscores.cpp
+++ b/qualityscores.cpp
@@ -31,7 +31,7 @@ QualityScores::QualityScores(ifstream& qFile){
                
                m = MothurOut::getInstance();
                
-               /*seqName = "";
+               seqName = "";
                int score;
                
                qFile >> seqName; 
@@ -44,63 +44,67 @@ QualityScores::QualityScores(ifstream& qFile){
                else{
                        seqName = seqName.substr(1);
                }
-               cout << seqName << endl;        
+               
                string qScoreString = m->getline(qFile);
-               cout << qScoreString << endl;   
+               while(qFile.peek() != '>' && qFile.peek() != EOF){
+                       qScoreString +=  ' ' + m->getline(qFile);
+               }
+               
                istringstream qScoreStringStream(qScoreString);
                int count = 0;
                while(!qScoreStringStream.eof()){
                        if (m->control_pressed) { break; }
-                       qScoreStringStream >> score;
+                       qScoreStringStream >> score;  m->gobble(qScoreStringStream);
+
                        qScores.push_back(score);
-                       cout << score << '\t' << count << endl;
                        count++;
                }
-               qScores.pop_back();*/
-               string scores = "";
-               
-               while(!qFile.eof()){    
-                       
-                       qFile >> seqName; 
-                       
-                       //get name
-                       if (seqName.length() != 0) { 
-                               seqName = seqName.substr(1);
-                               while (!qFile.eof())    {       
-                                       char c = qFile.get(); 
-                                       //gobble junk on line
-                                       if (c == 10 || c == 13){        break;  }
-                               } 
-                               m->gobble(qFile);
-                       }
-                       
-                       //get scores
-                       while(qFile){
-                               char letter=qFile.get();
-                               if((letter == '>')){    qFile.putback(letter);  break;  }
-                               else if (isprint(letter)) { scores += letter; }
-                       }
-                       
-                       m->gobble(qFile);
-                       
-                       break;
-               }
-               
-               //convert scores string to qScores
-               istringstream qScoreStringStream(scores);
-               
-               int score;
-               while(!qScoreStringStream.eof()){
-                       
-                       if (m->control_pressed) { break; }
-                       
-                       qScoreStringStream >> score;
-                       qScores.push_back(score);
-               }
-               
-               qScores.pop_back();
+               //qScores.pop_back();
+               
+//             string scores = "";
+//             
+//             while(!qFile.eof()){    
+//                     
+//                     qFile >> seqName; 
+//                     
+//                     //get name
+//                     if (seqName.length() != 0) { 
+//                             seqName = seqName.substr(1);
+//                             while (!qFile.eof())    {       
+//                                     char c = qFile.get(); 
+//                                     //gobble junk on line
+//                                     if (c == 10 || c == 13){        break;  }
+//                             } 
+//                             m->gobble(qFile);
+//                     }
+//                     
+//                     //get scores
+//                     while(qFile){
+//                             char letter=qFile.get();
+//                             if((letter == '>')){    qFile.putback(letter);  break;  }
+//                             else if (isprint(letter)) { scores += letter; }
+//                     }
+//                     m->gobble(qFile);
+//                     
+//                     break;
+//             }
+//             
+//             //convert scores string to qScores
+//             istringstream qScoreStringStream(scores);
+//             
+//             int score;
+//             while(!qScoreStringStream.eof()){
+//                     
+//                     if (m->control_pressed) { break; }
+//                     
+//                     qScoreStringStream >> score;
+//                     qScores.push_back(score);
+//             }
+//             
+//             qScores.pop_back();
+
                seqLength = qScores.size();
-               
+               //cout << "seqlenght = " <<     seqLength << '\t' << count << endl;
                
        }
        catch(exception& e) {
@@ -150,6 +154,9 @@ void QualityScores::trimQScores(int start, int end){
        try {
                vector<int> hold;
                
+
+               //cout << seqName << '\t' << start << '\t' << end << '\t' << qScores.size() << endl;
+               //for (int i = 0; i < qScores.size(); i++) { cout << qScores[i] << end; }
                if(end == -1){          
                        hold = vector<int>(qScores.begin()+start, qScores.end());
                        qScores = hold;         
@@ -276,28 +283,34 @@ bool QualityScores::stripQualWindowAverage(Sequence& sequence, int stepSize, int
                
                int end = windowSize;
                int start = 0;
-               
+
                if(seqLength < windowSize) {    return 0;       }
                        
-               while(start < seqLength){
+               while((start+windowSize) < seqLength){
                        double windowSum = 0.0000;
 
                        for(int i=start;i<end;i++){
                                windowSum += qScores[i];
                        }
                        double windowAverage = windowSum / (double)(end-start);
-                       
+                               
                        if(windowAverage < qThreshold){
                                end = end - stepSize;
                                break;
                        }
+                       
                        start += stepSize;
                        end = start + windowSize;
-                       if(end >= seqLength){   end = seqLength - 1;    }
+                               
+                       if(end >= seqLength){   end = seqLength;        }
+                               
                }
-               
+       
                if(end == -1){  end = seqLength;        }
                
+               //failed first window
+               if (end < windowSize) { return 0; }
+                       
                sequence.setUnaligned(rawSequence.substr(0,end));
                trimQScores(-1, end);