added sets to amova and homova commands. added oligos to make.contigs. added metadat...

[mothur.git] / getoturepcommand.cpp

diff --git a/getoturepcommand.cpp b/getoturepcommand.cpp
index 9f4dd54491bab042ae243998de20559b03285dfb..1d26b47b39c3ee998fb018bad12fb4e904b1e333 100644 (file)
--- a/getoturepcommand.cpp
+++ b/getoturepcommand.cpp
@@ -574,6 +574,8 @@ int GetOTURepCommand::readDist() {
                 readMatrix->read(nameMap);
             }else if (countfile != "") {
                 readMatrix->read(&ct);
+            }else {
+               readMatrix->read(nameMap); 
             }
                        
                        if (m->control_pressed) { delete readMatrix; return 0; }
@@ -614,9 +616,11 @@ int GetOTURepCommand::readDist() {
             if(namefile != ""){        
                 nameMap = new NameAssignment(namefile);
                 nameMap->readMap();
-                readMatrix->read(nameMap);
+                formatMatrix->read(nameMap);
             }else if (countfile != "") {
-                readMatrix->read(&ct);
+                formatMatrix->read(&ct);
+            }else {
+                formatMatrix->read(nameMap); 
             }
                        
                        if (m->control_pressed) { delete formatMatrix;  return 0; }