added template=self capability to chimers.slayer, worked on corr.axes and added accno...

[mothur.git] / sequence.cpp

diff --git a/sequence.cpp b/sequence.cpp
index 38e9b6230838424dd136562111f25967f6822099..872a0f091d49fddac359d528c53c799a50ef3c66 100644 (file)
--- a/sequence.cpp
+++ b/sequence.cpp
@@ -74,14 +74,14 @@ Sequence::Sequence(istringstream& fastaString){
                                }
                        }
                        
-                       while (!fastaString.eof())      {       char c = fastaString.get();  if (c == 10 || c == 13){   break;  }       } // get rest of line if there's any crap there
+                       while (!fastaString.eof())      {       char c = fastaString.get();  if (c == 10 || c == 13){ break;    }       } // get rest of line if there's any crap there
                        
                        sequence = getSequenceString(fastaString);              
                        setAligned(sequence);   
                        //setUnaligned removes any gap characters for us                                                
                        setUnaligned(sequence);         
                }else{ m->mothurOut("Error in reading your fastafile, at position " + toString(fastaString.tellg()) + ". Blank name."); m->mothurOutEndLine(); }
-
+               
        }
        catch(exception& e) {
                m->errorOut(e, "Sequence", "Sequence");
@@ -116,13 +116,14 @@ Sequence::Sequence(istringstream& fastaString, string JustUnaligned){
                                }
                        }
                        
-                       while (!fastaString.eof())      {       char c = fastaString.get();  if (c == 10 || c == 13){   break;  }       } // get rest of line if there's any crap there
+                       while (!fastaString.eof())      {       char c = fastaString.get();  if (c == 10 || c == 13){ break;    }       } // get rest of line if there's any crap there
                        
                        sequence = getSequenceString(fastaString);              
                        
                        //setUnaligned removes any gap characters for us                                                
                        setUnaligned(sequence);         
                }else{ m->mothurOut("Error in reading your fastafile, at position " + toString(fastaString.tellg()) + ". Blank name."); m->mothurOutEndLine(); }
+               
        }
        catch(exception& e) {
                m->errorOut(e, "Sequence", "Sequence");
@@ -138,7 +139,7 @@ Sequence::Sequence(ifstream& fastaFile){
                m = MothurOut::getInstance();
                initialize();
                fastaFile >> name;
-
+               
                if (name.length() != 0) { 
                
                        name = name.substr(1); 
@@ -160,15 +161,15 @@ Sequence::Sequence(ifstream& fastaFile){
                        }
                        
                        //read real sequence
-                       while (!fastaFile.eof())        {       char c = fastaFile.get(); if (c == 10 || c == 13){      break;  }       } // get rest of line if there's any crap there
+                       while (!fastaFile.eof())        {       char c = fastaFile.get(); if (c == 10 || c == 13){  break;      }       } // get rest of line if there's any crap there
                        
                        sequence = getSequenceString(fastaFile);                
-               
+       
                        setAligned(sequence);   
                        //setUnaligned removes any gap characters for us                                                
                        setUnaligned(sequence); 
                }else{ m->mothurOut("Error in reading your fastafile, at position " + toString(fastaFile.tellg()) + ". Blank name."); m->mothurOutEndLine(); }
-               
+
        }
        catch(exception& e) {
                m->errorOut(e, "Sequence", "Sequence");
@@ -202,14 +203,14 @@ Sequence::Sequence(ifstream& fastaFile, string JustUnaligned){
                        }
                        
                        //read real sequence
-                       while (!fastaFile.eof())        {       char c = fastaFile.get(); if (c == 10 || c == 13){      break;  }       } // get rest of line if there's any crap there
+                       while (!fastaFile.eof())        {       char c = fastaFile.get(); if (c == 10 || c == 13){       break; }       } // get rest of line if there's any crap there
                        
                        sequence = getSequenceString(fastaFile);                
                        
                        //setUnaligned removes any gap characters for us                                                
                        setUnaligned(sequence); 
                }else{ m->mothurOut("Error in reading your fastafile, at position " + toString(fastaFile.tellg()) + ". Blank name."); m->mothurOutEndLine(); }
-
+               
        }
        catch(exception& e) {
                m->errorOut(e, "Sequence", "Sequence");
@@ -253,7 +254,7 @@ string Sequence::getCommentString(ifstream& fastaFile) {
                while(fastaFile){
                        letter=fastaFile.get();
                        if((letter == '\r') || (letter == '\n')){  
-                               gobble(fastaFile);  //in case its a \r\n situation
+                               m->gobble(fastaFile);  //in case its a \r\n situation
                                break;
                        }
                }
@@ -302,7 +303,7 @@ string Sequence::getCommentString(istringstream& fastaFile) {
                while(fastaFile){
                        letter=fastaFile.get();
                        if((letter == '\r') || (letter == '\n')){  
-                               gobble(fastaFile);  //in case its a \r\n situation
+                               m->gobble(fastaFile);  //in case its a \r\n situation
                                break;
                        }
                }
@@ -564,4 +565,16 @@ void Sequence::reverseComplement(){
        aligned = temp;
        
 }
-/**************************************************************************************************/
+
+//********************************************************************************************************************
+
+void Sequence::trim(int length){
+       
+       if(numBases > length){
+               unaligned = unaligned.substr(0,length);
+               numBases = length;
+       }
+       
+}
+
+///**************************************************************************************************/