X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readphylip.cpp;h=1c529b26f15fdfa172c8a0f7ebcf20187e87b03b;hb=f06b339c5fc4b6d1b9d2a08fe16bf7670bf7aeb4;hp=f1554565bf9ac58a3e41afa6578742293bd0ea2c;hpb=fdc1f6eaf544f695fc1511f24bddd7e6069c33ba;p=mothur.git

diff --git a/readphylip.cpp b/readphylip.cpp
index f155456..1c529b2 100644
--- a/readphylip.cpp
+++ b/readphylip.cpp
@@ -14,9 +14,18 @@
 
 ReadPhylipMatrix::ReadPhylipMatrix(string distFile){
         
-        successOpen = openInputFile(distFile, fileHandle);
+        successOpen = m->openInputFile(distFile, fileHandle);
+		sim=false;
         
 }
+/***********************************************************************/
+
+ReadPhylipMatrix::ReadPhylipMatrix(string distFile, bool s){
+	
+	successOpen = m->openInputFile(distFile, fileHandle);
+	sim=s;
+}
+
 
 /***********************************************************************/
 
@@ -27,9 +36,13 @@ int ReadPhylipMatrix::read(NameAssignment* nameMap){
                         int square, nseqs;
                         string name;
                         vector<string> matrixNames;
-        
-                        fileHandle >> nseqs >> name;
-
+						
+						string numTest;
+						fileHandle >> numTest >> name;
+			
+						if (!m->isContainingOnlyDigits(numTest)) { m->mothurOut("[ERROR]: expected a number and got " + numTest + ", quitting."); m->mothurOutEndLine(); exit(1); }
+						else { convert(numTest, nseqs); }
+			
                         matrixNames.push_back(name);
 
                         if(nameMap == NULL){
@@ -85,7 +98,7 @@ int ReadPhylipMatrix::read(NameAssignment* nameMap){
 											
                                                 
                                                         if (distance == -1) { distance = 1000000; }
-														else if (globaldata->sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.
+														else if (sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.
                                                 
                                                         if(distance < cutoff){
                                                                 PCell value(i, j, distance);
@@ -105,7 +118,7 @@ int ReadPhylipMatrix::read(NameAssignment* nameMap){
 														if (m->control_pressed) { delete reading; fileHandle.close(); return 0;  }
                                 
                                                         if (distance == -1) { distance = 1000000; }
-														else if (globaldata->sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.
+														else if (sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.
                                                         
                                                         if(distance < cutoff){
                                                                 PCell value(nameMap->get(matrixNames[i]), nameMap->get(matrixNames[j]), distance);
@@ -137,7 +150,7 @@ int ReadPhylipMatrix::read(NameAssignment* nameMap){
 														if (m->control_pressed) {  fileHandle.close();  delete reading; return 0; }
 														
                                                         if (distance == -1) { distance = 1000000; }
-														else if (globaldata->sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.
+														else if (sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.
                                                         
                                                         if(distance < cutoff && j < i){
                                                                 PCell value(i, j, distance);
@@ -157,7 +170,7 @@ int ReadPhylipMatrix::read(NameAssignment* nameMap){
 														if (m->control_pressed) {  fileHandle.close();  delete reading; return 0; }
 														
                                                        if (distance == -1) { distance = 1000000; }
-														else if (globaldata->sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.                                                        
+														else if (sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.                                                        
                                                         
 														if(distance < cutoff && j < i){
                                                                 PCell value(nameMap->get(matrixNames[i]), nameMap->get(matrixNames[j]), distance);