added stricter compilation requirements and fixed resulting errors

[mothur.git] / database.cpp

diff --git a/database.cpp b/database.cpp
index 5b93321a4c8b0f25915d479407f5152918d12f6a..5fc9b676f128dd0a1d6999918b4fcb42357c407e 100644 (file)
--- a/database.cpp
+++ b/database.cpp
@@ -7,9 +7,7 @@
  *
  */
 
-using namespace std;
-
-
+#include "mothur.h"
 #include "sequence.hpp"
 #include "database.hpp"
 
@@ -20,9 +18,11 @@ Database::Database(string fastaFileName){            //      This assumes that the template dat
 
        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();
-
+       //all of this is elsewhere already!
        numSeqs=count(istreambuf_iterator<char>(fastaFile),istreambuf_iterator<char>(), '>');   //      count the number of
        fastaFile.seekg(0);                                                                                                                                             //      sequences
        
@@ -30,11 +30,8 @@ Database::Database(string fastaFileName){            //      This assumes that the template dat
        
        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,15 +42,22 @@ Database::Database(string fastaFileName){           //      This assumes that the template dat
                                aligned += letter;
                        }
                }
-               templateSequences[i] = new Sequence(seqName, aligned);
-//             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);
+               fastaFile.putback(letter);
        }
        
        fastaFile.close();
-       cout << "DONE." << endl;        cout.flush();
+       //all of this is elsewhere already!
+       
+       mothurOut("DONE.");
+       mothurOutEndLine();     cout.flush();
+
+}
+/**************************************************************************************************/
+
+Database::~Database(){                                                                                                         
 
+               templateSequences.clear();
 }
 
 /**************************************************************************************************/