added warning about merging with something above cutoff to cluster. working on chimeras

[mothur.git] / distancecommand.h

diff --git a/distancecommand.h b/distancecommand.h
index c7aaf46137a97715baee381d56824482a0e08e80..7521ac70bdf6cf323b6442577ec7b1e609d6ccd8 100644 (file)
--- a/distancecommand.h
+++ b/distancecommand.h
@@ -34,7 +34,7 @@ private:
        Dist* distCalculator;
        SequenceDB alignDB;
 
-       string countends, phylip, fastafile, calc, outputDir;
+       string countends, output, fastafile, calc, outputDir;
        int processors;
        float cutoff;
        map<int, int> processIDS;   //end line, processid
@@ -46,6 +46,7 @@ private:
        //void appendFiles(string, string);
        void createProcesses(string);
        int driver(/*Dist*, SequenceDB, */int, int, string, float);
+       void convertMatrix(string);
 
 };