X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sequencedb.cpp;h=e798ee14ac70837e795a7be3191a14f68788c234;hb=1a968f34ae2d2680eaf189a197d1a21b8dfd6c03;hp=ca201d5a211695138540fe585314773fe4020f90;hpb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2;p=mothur.git

diff --git a/sequencedb.cpp b/sequencedb.cpp
index ca201d5..e798ee1 100644
--- a/sequencedb.cpp
+++ b/sequencedb.cpp
@@ -15,7 +15,7 @@
 
 /***********************************************************************/
 
-SequenceDB::SequenceDB() {}
+SequenceDB::SequenceDB() {  m = MothurOut::getInstance();  length = 0; samelength = true; }
 /***********************************************************************/
 //the clear function free's the memory
 SequenceDB::~SequenceDB() { clear(); }
@@ -24,40 +24,35 @@ SequenceDB::~SequenceDB() { clear(); }
 
 SequenceDB::SequenceDB(int newSize) {
 	data.resize(newSize, Sequence());
+	length = 0; samelength = true;
 }
 
 /***********************************************************************/
 
 SequenceDB::SequenceDB(ifstream& filehandle) {
 	try{
-		string name, sequence, line;
-		sequence = "";
-		int c;
-		string temp;
-		
-		
+		length = 0; samelength = true;
+				
 		//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() != "") {   
+				if (length == 0) { length = newSequence.getAligned().length(); }
+				if (length != newSequence.getAligned().length()) { samelength = false; }
+				data.push_back(newSequence);  
+			}
 			
 			//takes care of white space
-			gobble(filehandle);
+			m->gobble(filehandle);
 		}
 
 		filehandle.close();
 		
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "SequenceDB");
+		m->errorOut(e, "SequenceDB", "SequenceDB");
 		exit(1);
 	}
 }
@@ -78,7 +73,7 @@ string SequenceDB::readName(ifstream& in) {
 		return name;
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "readName");
+		m->errorOut(e, "SequenceDB", "readName");
 		exit(1);
 	}
 }
@@ -103,11 +98,14 @@ string SequenceDB::readSequence(ifstream& in) {
 				break;
 			}else {  sequence += line;	}
 		}
-			
+		
+		if (length == 0) { length = sequence.length(); }
+		if (length != sequence.length()) { samelength = false; }
+		
 		return sequence;
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "readSequence");
+		m->errorOut(e, "SequenceDB", "readSequence");
 		exit(1);
 	}
 }
@@ -122,10 +120,13 @@ int SequenceDB::getNumSeqs() {
 
 void SequenceDB::set(int index, string newUnaligned) {
 	try {
+		if (length == 0) { length = newUnaligned.length(); }
+		if (length != newUnaligned.length()) { samelength = false; }
+		
 		data[index] = Sequence(data[index].getName(), newUnaligned);
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "set");
+		m->errorOut(e, "SequenceDB", "set");
 		exit(1);
 	}
 }
@@ -134,10 +135,13 @@ void SequenceDB::set(int index, string newUnaligned) {
 
 void SequenceDB::set(int index, Sequence newSeq) {
 	try {
+		if (length == 0) { length = newSeq.getAligned().length(); }
+		if (length != newSeq.getAligned().length()) { samelength = false; }
+
 		data[index] = newSeq;
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "set");
+		m->errorOut(e, "SequenceDB", "set");
 		exit(1);
 	}
 }
@@ -155,7 +159,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 +171,7 @@ void SequenceDB::clear() {
 		data.clear();
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "clear");
+		m->errorOut(e, "SequenceDB", "clear");
 		exit(1);
 	}
 }
@@ -187,7 +191,7 @@ void SequenceDB::print(ostream& out) {
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "print");
+		m->errorOut(e, "SequenceDB", "print");
 		exit(1);
 	}
 }
@@ -196,10 +200,13 @@ void SequenceDB::print(ostream& out) {
 
 void SequenceDB::push_back(Sequence newSequence) {
 	try {
+		if (length == 0) { length = newSequence.getAligned().length(); }
+		if (length != newSequence.getAligned().length()) { samelength = false; }
+
 		data.push_back(newSequence);
 	}
 	catch(exception& e) {
-		errorOut(e, "SequenceDB", "push_back");
+		m->errorOut(e, "SequenceDB", "push_back");
 		exit(1);
 	}
 }