+ }
+ }
+ index++;
+ reading->update(index);
+ }
+ }
+ }
+ }
+ else{
+
+ reading = new Progress("Reading matrix: ", nseqs * nseqs);
+
+ int index = nseqs;
+
+ for(int i=1;i<nseqs;i++){
+ fileHandle >> name;
+ matrixNames.push_back(name);
+
+
+
+ if(countTable == NULL){
+ list->set(i, name);
+ for(int j=0;j<nseqs;j++){
+ fileHandle >> distance;
+
+ if (m->control_pressed) { fileHandle.close(); delete reading; return 0; }
+
+ if (distance == -1) { distance = 1000000; }
+ else if (sim) { distance = 1.0 - distance; } //user has entered a sim matrix that we need to convert.
+
+ if(distance < cutoff && j < i){
+ PDistCell value(i, distance);
+ DMatrix->addCell(j, value);
+ }
+ index++;
+ reading->update(index);
+ }
+
+ }
+ else{
+ for(int j=0;j<nseqs;j++){
+ fileHandle >> distance;
+
+ if (m->control_pressed) { fileHandle.close(); delete reading; return 0; }
+
+ if (distance == -1) { distance = 1000000; }
+ else if (sim) { distance = 1.0 - distance; } //user has entered a sim matrix that we need to convert.
+
+ if(distance < cutoff && j < i){
+ int iIndex = countTable->get(matrixNames[i]);
+ int jIndex = countTable->get(matrixNames[j]);
+
+ if (m->control_pressed) { delete reading; fileHandle.close(); return 0; }
+ if (iIndex < jIndex) {
+ PDistCell value(jIndex, distance);
+ DMatrix->addCell(iIndex, value);
+ }else {
+ PDistCell value(iIndex, distance);
+ DMatrix->addCell(jIndex, value);
+
+ }
+ }
+ index++;
+ reading->update(index);
+ }
+ }
+ }
+ }
+
+ if (m->control_pressed) { fileHandle.close(); delete reading; return 0; }
+
+ reading->finish();
+ delete reading;
+
+ list->setLabel("0");
+ fileHandle.close();
+
+
+ return 1;
+
+ }
+ catch(exception& e) {
+ m->errorOut(e, "ReadPhylipMatrix", "read");
+ exit(1);
+ }
+}
+/***********************************************************************/
+ReadPhylipMatrix::~ReadPhylipMatrix(){}