some changes while testing 1.9

[mothur.git] / sequencedb.cpp

diff --git a/sequencedb.cpp b/sequencedb.cpp
index ca201d5a211695138540fe585314773fe4020f90..9ddb40f44a7e9ded9ba12a625e647c5abd3bed43 100644 (file)
--- a/sequencedb.cpp
+++ b/sequencedb.cpp
@@ -15,7 +15,7 @@
 
 /***********************************************************************/
 
-SequenceDB::SequenceDB() {}
+SequenceDB::SequenceDB() {  m = MothurOut::getInstance();  }
 /***********************************************************************/
 //the clear function free's the memory
 SequenceDB::~SequenceDB() { clear(); }
@@ -30,24 +30,13 @@ SequenceDB::SequenceDB(int newSize) {
 
 SequenceDB::SequenceDB(ifstream& filehandle) {
        try{
-               string name, sequence, line;
-               sequence = "";
-               int c;
-               string temp;
-               
-               
+                               
                //read through file
-               while ((c = filehandle.get()) != EOF) {
-                       name = ""; sequence = ""; 
-                       //is this a name
-                       if (c == '>') { 
-                               name = readName(filehandle); 
-                               sequence = readSequence(filehandle); 
-                       }else {  mothurOut("Error fasta in your file. Please correct."); mothurOutEndLine(); }
-
+               while (!filehandle.eof()) {
                        //input sequence info into sequencedb
-                       Sequence newSequence(name, sequence);
-                       data.push_back(newSequence);
+                       Sequence newSequence(filehandle);
+                       
+                       if (newSequence.getName() != "") {   data.push_back(newSequence);  }
                        
                        //takes care of white space
                        gobble(filehandle);
@@ -57,7 +46,7 @@ SequenceDB::SequenceDB(ifstream& filehandle) {
                
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "SequenceDB");
+               m->errorOut(e, "SequenceDB", "SequenceDB");
                exit(1);
        }
 }
@@ -78,7 +67,7 @@ string SequenceDB::readName(ifstream& in) {
                return name;
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "readName");
+               m->errorOut(e, "SequenceDB", "readName");
                exit(1);
        }
 }
@@ -107,7 +96,7 @@ string SequenceDB::readSequence(ifstream& in) {
                return sequence;
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "readSequence");
+               m->errorOut(e, "SequenceDB", "readSequence");
                exit(1);
        }
 }
@@ -125,7 +114,7 @@ void SequenceDB::set(int index, string newUnaligned) {
                data[index] = Sequence(data[index].getName(), newUnaligned);
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "set");
+               m->errorOut(e, "SequenceDB", "set");
                exit(1);
        }
 }
@@ -137,7 +126,7 @@ void SequenceDB::set(int index, Sequence newSeq) {
                data[index] = newSeq;
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "set");
+               m->errorOut(e, "SequenceDB", "set");
                exit(1);
        }
 }
@@ -155,7 +144,7 @@ void SequenceDB::resize(int newSize) {
                data.resize(newSize);
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "resize");
+               m->errorOut(e, "SequenceDB", "resize");
                exit(1);
        }
 }
@@ -167,7 +156,7 @@ void SequenceDB::clear() {
                data.clear();
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "clear");
+               m->errorOut(e, "SequenceDB", "clear");
                exit(1);
        }
 }
@@ -187,7 +176,7 @@ void SequenceDB::print(ostream& out) {
                }
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "print");
+               m->errorOut(e, "SequenceDB", "print");
                exit(1);
        }
 }
@@ -199,7 +188,7 @@ void SequenceDB::push_back(Sequence newSequence) {
                data.push_back(newSequence);
        }
        catch(exception& e) {
-               errorOut(e, "SequenceDB", "push_back");
+               m->errorOut(e, "SequenceDB", "push_back");
                exit(1);
        }
 }