X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=readphylipvector.cpp;h=85f4777dde02bd4980411d8d48015d2cf06b0e50;hp=f8907ccb0c88b15a3f8a943d4895b75b18bf8323;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=d04f948b1a2a1a2984fc4a45d04403b8c121c5bc

diff --git a/readphylipvector.cpp b/readphylipvector.cpp
index f8907cc..85f4777 100644
--- a/readphylipvector.cpp
+++ b/readphylipvector.cpp
@@ -34,7 +34,11 @@ vector<string> ReadPhylipVector::read(vector< vector<double> >& matrix) {
 		int numSeqs;
 		string name;
 		
-		in >> numSeqs >> name; 
+		string numTest;
+		in >> numTest >> name;
+		
+		if (!m->isContainingOnlyDigits(numTest)) { m->mothurOut("[ERROR]: expected a number and got " + numTest + ". I suspect you entered a column formatted file as a phylip file, quitting."); m->mothurOutEndLine(); exit(1); }
+		else { convert(numTest, numSeqs); }
 		
 		while((d=in.get()) != EOF){
 			
@@ -94,6 +98,7 @@ vector<string> ReadPhylipVector::read(vector< vector<double> >& matrix) {
 				}
 			}
 		}
+		f.close();
 		
 		return names;
 	}
@@ -171,6 +176,7 @@ vector<string> ReadPhylipVector::read(vector<seqDist>& matrix) {
 				}
 			}
 		}
+		f.close();
 		
 		return names;
 	}