Backing out of bad change

mothur · 1d474928567c36f11f46c1ef04ebbad94d863f71 · mothur-westcott committed Nov 30, 2016 · Nov 30, 2016 · 1d47492
1 parent a36a235
commit 1d474928567c36f11f46c1ef04ebbad94d863f71
Unified Split

Showing with 2 additions and 4 deletions.

+2 −4 source/datastructures/optimatrix.cpp
diff --git a/source/datastructures/optimatrix.cpp b/source/datastructures/optimatrix.cpp
@@ -231,13 +231,11 @@ int OptiMatrix::readPhylip(){
             for(int i=1;i<nseqs;i++){
                 if (m->control_pressed) {  in.close();  delete reading; return 0; }
                 
-                in >> name; line = m->getline(in); m->gobble(in);
-                vector<float> dists; m->splitWhiteSpace(line, dists, i);
+                in >> name;
                 
                 for(int j=0;j<i;j++){
                     
-                    //in >> distance;
-                    distance = dists[j];
+                    in >> distance;
                     
                     if (distance == -1) { distance = 1000000; } else if (sim) { distance = 1.0 - distance;  }  //user has entered a sim matrix that we need to convert.