fixed bug with aligner in database class, worked on chimeras

[mothur.git] / database.cpp

diff --git a/database.cpp b/database.cpp
index 8c080dbf95e79d6dc574e52d5679747018df00fa..9784ef93035bbf896eb3ec2c7090cbda7a426227 100644 (file)
--- a/database.cpp
+++ b/database.cpp
@@ -7,9 +7,7 @@
  *
  */
 
-using namespace std;
-
-
+#include "mothur.h"
 #include "sequence.hpp"
 #include "database.hpp"
 
@@ -17,24 +15,24 @@ using namespace std;
 
 Database::Database(string fastaFileName){              //      This assumes that the template database is in fasta format, may 
                                                                                                //      need to alter this in the future?
-
+       longest = 0;
+       
        ifstream fastaFile;
        openInputFile(fastaFileName, fastaFile);
+       
+       mothurOutEndLine();
+       mothurOut("Reading in the " + fastaFileName + " template sequences...\t");      cout.flush();
 
-       cout << endl << "Reading in the " << fastaFileName << " template sequences...\t";       cout.flush();
-
-       numSeqs=count(istreambuf_iterator<char>(fastaFile),istreambuf_iterator<char>(), '>');   //      count the number of
-       fastaFile.seekg(0);                                                                                                                                             //      sequences
+       //all of this is elsewhere already!
+       //numSeqs=count(istreambuf_iterator<char>(fastaFile),istreambuf_iterator<char>(), '>'); //      count the number of
+       //fastaFile.seekg(0);                                                                                                                                           //      sequences
        
-       templateSequences.resize(numSeqs);
+       //templateSequences.resize(numSeqs);
        
-       string seqName, sequence;
+       /*string seqName, sequence;
        for(int i=0;i<numSeqs;i++){
-               templateSequences[i] = new Sequence();          //      We're storing the aligned template sequences as a vector of
-                                                                                                       //      pointers to Sequence objects
                fastaFile >> seqName;
-               templateSequences[i]->setName(seqName);
-               
+               seqName = seqName.substr(1);
                char letter;
                string aligned;
                
@@ -45,18 +43,52 @@ Database::Database(string fastaFileName){           //      This assumes that the template dat
                                aligned += letter;
                        }
                }
-               templateSequences[i]->setAligned(aligned);      //      Obviously, we need the fully aligned template sequence
-               templateSequences[i]->setUnaligned(aligned);//  We will also need the unaligned sequence for pairwise alignments
-               fastaFile.putback(letter);                                      //      and database searches
+               templateSequences[i] = Sequence(seqName, aligned);
+               
+               //necessary because Sequence constructor by default sets whatever it reads to unaligned
+               //the setUnaligned function remove gap char.
+               templateSequences[i].setUnaligned(templateSequences[i].getUnaligned());
+               
+               if (templateSequences[i].getUnaligned().length() > longest)  { longest = templateSequences[i].getUnaligned().length(); }
+               
+               fastaFile.putback(letter);
+       }*/
+       
+       while (!fastaFile.eof()) {
+               Sequence temp(fastaFile);
+               
+               templateSequences.push_back(temp);
+               
+               //save longest base
+               if (temp.getUnaligned().length() > longest)  { longest = temp.getUnaligned().length(); }
+               
+               gobble(fastaFile);
        }
        
+       numSeqs = templateSequences.size();
+       
        fastaFile.close();
-       cout << "DONE." << endl;        cout.flush();
+       //all of this is elsewhere already!
+       
+       mothurOut("DONE.");
+       mothurOutEndLine();     cout.flush();
+
+}
+/**************************************************************************************************/
 
+Database::~Database(){                                                                                                         
+
+               templateSequences.clear();
 }
 
 /**************************************************************************************************/
 
 float Database::getSearchScore()       {       return searchScore;             }       //      we're assuming that the search is already done
 
+
+/**************************************************************************************************/
+
+int Database::getLongestBase() {       return longest+1;               }       
+
 /**************************************************************************************************/
+